Merge branch 'master' of https://github.com/hiroxpepe/blog-examproject

hiroxpepe · Jun 5, 2020 · 842ed1f · 842ed1f
2 parents 9c35e13 + 55e2dee
commit 842ed1f
Show file tree

Hide file tree

Showing 50 changed files with 4,356 additions and 286 deletions.
diff --git a/model/pom.xml b/model/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.examproject</groupId>
     <artifactId>exmp-blog-model</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <name>exmp-blog-model</name>
 
     <properties>
@@ -28,13 +28,6 @@
         <!--///////////////////////////////////////////////////////////////////////////-->
         <!-- OSS LIB -->
 
-        <!--Javax Inject-->
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-        </dependency>
-
         <!-- Commons -->
         <dependency>
             <groupId>commons-collections</groupId>

diff --git a/mvc/pom.xml b/mvc/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.examproject</groupId>
     <artifactId>exmp-blog-mvc</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <name>exmp-blog-mvc</name>
 
     <properties>
@@ -34,13 +34,6 @@
         <!--//////////////////////////////////////////////////////////////////////////-->
         <!-- OSS LIB -->
 
-        <!-- Inject -->
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-        </dependency>
-
         <!-- Dozer -->
         <dependency>
             <groupId>net.sf.dozer</groupId>

diff --git a/mvc/src/main/java/org/examproject/blog/controller/EntryController.java b/mvc/src/main/java/org/examproject/blog/controller/EntryController.java
@@ -16,9 +16,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.apache.commons.lang.exception.ExceptionUtils;
@@ -46,20 +47,21 @@
  * @author h.adachi
  */
 @Slf4j
+@RequiredArgsConstructor
 @Controller
 public class EntryController {
 
-    @Inject
-    private final ApplicationContext context = null;
+    @NonNull
+    private final ApplicationContext context;
 
-    @Inject
-    private final HttpServletRequest request = null;
+    @NonNull
+    private final HttpServletRequest request;
 
-    @Inject
-    private final Mapper mapper = null;
+    @NonNull
+    private final Mapper mapper;
 
-    @Inject
-    private final EntryService entryService = null;
+    @NonNull
+    private final EntryService entryService;
 
     ///////////////////////////////////////////////////////////////////////////
     // public methods
@@ -73,11 +75,11 @@ public class EntryController {
         method=RequestMethod.GET
     )
     public void doForm(
-        @CookieValue(value="__exmp_blog_username", defaultValue="")
+        @CookieValue(value="__exmp_blog_username", defaultValue="anonymous")
         String username,
-        @CookieValue(value="__exmp_blog_password", defaultValue="")
+        @CookieValue(value="__exmp_blog_password", defaultValue="password")
         String password,
-        @CookieValue(value="__exmp_blog_email", defaultValue="")
+        @CookieValue(value="__exmp_blog_email", defaultValue="[email protected]")
         String email,
         Model model
     ) {

diff --git a/mvc/src/main/java/org/examproject/blog/controller/FeedController.java b/mvc/src/main/java/org/examproject/blog/controller/FeedController.java
@@ -16,9 +16,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.springframework.context.ApplicationContext;
@@ -37,17 +38,18 @@
  * @author h.adachi
  */
 @Slf4j
+@RequiredArgsConstructor
 @Controller
 public class FeedController {
 
-    @Inject
-    private final ApplicationContext context = null;
+    @NonNull
+    private final ApplicationContext context;
 
-    @Inject
-    private final HttpServletRequest request = null;
+    @NonNull
+    private final HttpServletRequest request;
 
-    @Inject
-    private final FeedService feedService = null;
+    @NonNull
+    private final FeedService feedService;
 
     ///////////////////////////////////////////////////////////////////////////
     // public methods

diff --git a/mvc/src/main/java/org/examproject/blog/controller/PermalinkController.java b/mvc/src/main/java/org/examproject/blog/controller/PermalinkController.java
@@ -14,8 +14,8 @@
 
 package org.examproject.blog.controller;
 
-import javax.inject.Inject;
-
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.dozer.Mapper;
@@ -36,17 +36,18 @@
  * @author h.adachi
  */
 @Slf4j
+@RequiredArgsConstructor
 @Controller
 public class PermalinkController {
 
-    @Inject
-    private final ApplicationContext context = null;
+    @NonNull
+    private final ApplicationContext context;
 
-    @Inject
-    private final Mapper mapper = null;
+    @NonNull
+    private final Mapper mapper;
 
-    @Inject
-    private final EntryService entryService = null;
+    @NonNull
+    private final EntryService entryService;
 
     ///////////////////////////////////////////////////////////////////////////
     // public methods

diff --git a/mvc/src/main/java/org/examproject/blog/controller/SettingController.java b/mvc/src/main/java/org/examproject/blog/controller/SettingController.java
@@ -14,10 +14,11 @@
 
 package org.examproject.blog.controller;
 
-import javax.inject.Inject;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.springframework.context.ApplicationContext;
@@ -37,11 +38,12 @@
  * @author h.adachi
  */
 @Slf4j
+@RequiredArgsConstructor
 @Controller
 public class SettingController {
 
-    @Inject
-    private final ApplicationContext context = null;
+    @NonNull
+    private final ApplicationContext context;
 
     ///////////////////////////////////////////////////////////////////////////
     // public methods

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.examproject</groupId>
     <artifactId>exmp-blog</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <name>exmp-blog</name>
 
     <properties>

diff --git a/service/pom.xml b/service/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.examproject</groupId>
     <artifactId>exmp-blog-service</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <name>exmp-blog-service</name>
 
     <properties>
@@ -33,13 +33,6 @@
         <!--///////////////////////////////////////////////////////////////////////////-->
         <!-- OSS LIB-->
 
-        <!--Javax Inject-->
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-        </dependency>
-
         <!-- Commons -->
         <dependency>
             <groupId>commons-collections</groupId>

diff --git a/service/src/main/java/org/examproject/blog/functor/AllEntryFactory.java b/service/src/main/java/org/examproject/blog/functor/AllEntryFactory.java
@@ -16,8 +16,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
 
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.Factory;
 import org.springframework.context.ApplicationContext;
@@ -32,16 +33,17 @@
  * @author h.adachi
  */
 @Slf4j
+@RequiredArgsConstructor
 public class AllEntryFactory implements Factory {
 
-    @Inject
-    private final ApplicationContext context = null;
+    @NonNull
+    private final ApplicationContext context;
 
-    @Inject
-    private final EntryRepository entryRepository = null;
+    @NonNull
+    private final EntryRepository entryRepository;
 
-    @Inject
-    private final EntryUtils entryUtils = null;
+    @NonNull
+    private final EntryUtils entryUtils;
 
     ///////////////////////////////////////////////////////////////////////////
     // public methods

diff --git a/service/src/main/java/org/examproject/blog/functor/CodeToEntryTransformer.java b/service/src/main/java/org/examproject/blog/functor/CodeToEntryTransformer.java
@@ -15,8 +15,9 @@
 package org.examproject.blog.functor;
 
 import java.util.List;
-import javax.inject.Inject;
 
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.Transformer;
 import org.springframework.context.ApplicationContext;
@@ -31,16 +32,17 @@
  * @author h.adachi
  */
 @Slf4j
+@RequiredArgsConstructor
 public class CodeToEntryTransformer implements Transformer {
 
-    @Inject
-    private final ApplicationContext context = null;
+    @NonNull
+    private final ApplicationContext context;
 
-    @Inject
-    private final EntryRepository entryRepository = null;
+    @NonNull
+    private final EntryRepository entryRepository;
 
-    @Inject
-    private final EntryUtils entryUtils = null;
+    @NonNull
+    private final EntryUtils entryUtils;
 
     ///////////////////////////////////////////////////////////////////////////
     // public methods

diff --git a/service/src/main/java/org/examproject/blog/functor/DeleteEntryClosure.java b/service/src/main/java/org/examproject/blog/functor/DeleteEntryClosure.java
@@ -14,8 +14,8 @@
 
 package org.examproject.blog.functor;
 
-import javax.inject.Inject;
-
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.Closure;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,10 +27,11 @@
  * @author h.adachi
  */
 @Slf4j
+@RequiredArgsConstructor
 public class DeleteEntryClosure implements Closure {
 
-    @Inject
-    private final EntryUtils entryUtils = null;
+    @NonNull
+    private final EntryUtils entryUtils;
 
     ///////////////////////////////////////////////////////////////////////////
     // public methods

diff --git a/service/src/main/java/org/examproject/blog/functor/IdToEntryTransformer.java b/service/src/main/java/org/examproject/blog/functor/IdToEntryTransformer.java
@@ -14,9 +14,8 @@
 
 package org.examproject.blog.functor;
 
-import java.lang.Long;
-import javax.inject.Inject;
-
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.Transformer;
 import org.springframework.context.ApplicationContext;
@@ -31,16 +30,17 @@
  * @author h.adachi
  */
 @Slf4j
+@RequiredArgsConstructor
 public class IdToEntryTransformer implements Transformer {
 
-    @Inject
-    private final ApplicationContext context = null;
+    @NonNull
+    private final ApplicationContext context;
 
-    @Inject
-    private final EntryRepository entryRepository = null;
+    @NonNull
+    private final EntryRepository entryRepository;
 
-    @Inject
-    private final EntryUtils entryUtils = null;
+    @NonNull
+    private final EntryUtils entryUtils;
 
     ///////////////////////////////////////////////////////////////////////////
     // public methods

diff --git a/service/src/main/java/org/examproject/blog/functor/SaveEntryClosure.java b/service/src/main/java/org/examproject/blog/functor/SaveEntryClosure.java
@@ -15,8 +15,9 @@
 package org.examproject.blog.functor;
 
 import java.util.Date;
-import javax.inject.Inject;
 
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.Closure;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,10 +31,11 @@
  * @author h.adachi
  */
 @Slf4j
+@RequiredArgsConstructor
 public class SaveEntryClosure implements Closure {
 
-    @Inject
-    private final EntryUtils entryUtils = null;
+    @NonNull
+    private final EntryUtils entryUtils;
 
     ///////////////////////////////////////////////////////////////////////////
     // public methods