U

Raysmond · Raysmond · commit 478bb5fdc9e1 · 2015-10-01T20:57:16.000+08:00
diff --git a/src/main/java/com/raysmond/blog/Application.java b/src/main/java/com/raysmond/blog/Application.java
@@ -3,7 +3,6 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.ComponentScan;
 
 /**
  * @author Raysmond<jiankunlei@gmail.com>
diff --git a/src/main/java/com/raysmond/blog/Constants.java b/src/main/java/com/raysmond/blog/Constants.java
@@ -9,7 +9,7 @@ public final class Constants {
 
     public static final String ENV_DEVELOPMENT = "development";
 
-    public static final String DEFAULT_ADMIN__EMAIL = "admin@admin.com";
+    public static final String DEFAULT_ADMIN_EMAIL = "admin@admin.com";
 
     public static final String DEFAULT_ADMIN_PASSWORD = "admin";
 
diff --git a/src/main/java/com/raysmond/blog/WebConfig.java b/src/main/java/com/raysmond/blog/WebConfig.java
@@ -1,10 +1,6 @@
 package com.raysmond.blog;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
 import com.raysmond.blog.support.web.ViewHelper;
-import de.neuland.jade4j.spring.view.JadeViewResolver;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/com/raysmond/blog/admin/controllers/AdminController.java b/src/main/java/com/raysmond/blog/admin/controllers/AdminController.java
@@ -19,7 +19,6 @@
  */
 @Controller
 @RequestMapping("admin")
-//@Secured("ROLE_ADMIN")
 public class AdminController {
 
     private AppSetting appSetting;
diff --git a/src/main/java/com/raysmond/blog/services/PostService.java b/src/main/java/com/raysmond/blog/services/PostService.java
@@ -110,18 +110,21 @@ public List<Post> getArchivePosts() {
                 new PageRequest(0, Integer.MAX_VALUE, Sort.Direction.DESC, "createdAt"));
 
         List<Post> cachedPosts = new ArrayList<>();
-        for (Post post : archivePosts) {
-            Post cachedPost = new Post();
-            cachedPost.setId(post.getId());
-            cachedPost.setTitle(post.getTitle());
-            cachedPost.setPermalink(post.getPermalink());
-            cachedPost.setCreatedAt(post.getCreatedAt());
-            cachedPosts.add(cachedPost);
-        }
+        cachedPosts.forEach(post -> cachedPosts.add(extractPostMeta(post)));
 
         return cachedPosts;
     }
 
+    private Post extractPostMeta(Post post){
+        Post archivePost = new Post();
+        archivePost.setId(post.getId());
+        archivePost.setTitle(post.getTitle());
+        archivePost.setPermalink(post.getPermalink());
+        archivePost.setCreatedAt(post.getCreatedAt());
+
+        return archivePost;
+    }
+
     @Cacheable(value = CACHE_NAME_PAGE, key = "T(java.lang.String).valueOf(#page).concat('-').concat(#pageSize)")
     public Page<Post> getAllPublishedPostsByPage(int page, int pageSize) {
         logger.debug("Get posts by page " + page);
diff --git a/src/main/java/com/raysmond/blog/services/UserService.java b/src/main/java/com/raysmond/blog/services/UserService.java
@@ -40,10 +40,10 @@ public User createUser(User user){
     }
 
     public User getSuperUser(){
-        User user = userRepository.findByEmail(Constants.DEFAULT_ADMIN__EMAIL);
+        User user = userRepository.findByEmail(Constants.DEFAULT_ADMIN_EMAIL);
 
         if ( user == null) {
-            user = createUser(new User(Constants.DEFAULT_ADMIN__EMAIL, Constants.DEFAULT_ADMIN_PASSWORD, User.ROLE_ADMIN));
+            user = createUser(new User(Constants.DEFAULT_ADMIN_EMAIL, Constants.DEFAULT_ADMIN_PASSWORD, User.ROLE_ADMIN));
         }
 
         return user;

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,10 @@ public User createUser(User user){`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public User getSuperUser(){`
`43`		`- User user = userRepository.findByEmail(Constants.DEFAULT_ADMIN__EMAIL);`
	`43`	`+ User user = userRepository.findByEmail(Constants.DEFAULT_ADMIN_EMAIL);`
`44`	`44`
`45`	`45`	`if ( user == null) {`
`46`		`- user = createUser(new User(Constants.DEFAULT_ADMIN__EMAIL, Constants.DEFAULT_ADMIN_PASSWORD, User.ROLE_ADMIN));`
	`46`	`+ user = createUser(new User(Constants.DEFAULT_ADMIN_EMAIL, Constants.DEFAULT_ADMIN_PASSWORD, User.ROLE_ADMIN));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`return user;`