From 11d798ffa344e3e6b461f4bbced56dc2c1f6771c Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Wed, 10 Jul 2019 17:19:19 +0800
Subject: [PATCH] Perfect codes.

---
 .../java/run/halo/app/cache/InMemoryCacheStore.java    | 10 +++++-----
 .../halo/app/handler/theme/config/support/Item.java    |  8 ++++++--
 .../handler/theme/config/support/ThemeProperty.java    |  8 ++++++--
 .../java/run/halo/app/listener/StartedListener.java    |  2 +-
 .../java/run/halo/app/model/entity/PostCategory.java   |  8 ++++++--
 src/main/java/run/halo/app/model/entity/PostTag.java   |  8 ++++++--
 src/main/java/run/halo/app/model/enums/Mode.java       |  6 +++---
 .../run/halo/app/model/properties/ApiProperties.java   |  6 ++++++
 .../app/model/properties/AttachmentProperties.java     |  3 +++
 .../run/halo/app/model/vo/BaseCommentWithParentVO.java |  1 +
 .../run/halo/app/repository/PostCommentRepository.java |  1 +
 .../halo/app/repository/SheetCommentRepository.java    |  1 +
 .../java/run/halo/app/repository/SheetRepository.java  |  1 +
 .../run/halo/app/service/impl/AdminServiceImpl.java    |  2 +-
 .../halo/app/service/impl/BaseCommentServiceImpl.java  |  3 ++-
 .../run/halo/app/service/impl/RecoveryServiceImpl.java |  2 +-
 16 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/src/main/java/run/halo/app/cache/InMemoryCacheStore.java b/src/main/java/run/halo/app/cache/InMemoryCacheStore.java
index 4ef7789a1..b492c2215 100644
--- a/src/main/java/run/halo/app/cache/InMemoryCacheStore.java
+++ b/src/main/java/run/halo/app/cache/InMemoryCacheStore.java
@@ -27,7 +27,7 @@ public class InMemoryCacheStore extends StringCacheStore {
     /**
      * Cache container.
      */
-    private final static ConcurrentHashMap<String, CacheWrapper<String>> cacheContainer = new ConcurrentHashMap<>();
+    private final static ConcurrentHashMap<String, CacheWrapper<String>> CACHE_CONTAINER = new ConcurrentHashMap<>();
 
     private final Timer timer;
 
@@ -46,7 +46,7 @@ public class InMemoryCacheStore extends StringCacheStore {
     Optional<CacheWrapper<String>> getInternal(String key) {
         Assert.hasText(key, "Cache key must not be blank");
 
-        return Optional.ofNullable(cacheContainer.get(key));
+        return Optional.ofNullable(CACHE_CONTAINER.get(key));
     }
 
     @Override
@@ -55,7 +55,7 @@ public class InMemoryCacheStore extends StringCacheStore {
         Assert.notNull(cacheWrapper, "Cache wrapper must not be null");
 
         // Put the cache wrapper
-        CacheWrapper<String> putCacheWrapper = cacheContainer.put(key, cacheWrapper);
+        CacheWrapper<String> putCacheWrapper = CACHE_CONTAINER.put(key, cacheWrapper);
 
         log.debug("Put [{}] cache result: [{}], original cache wrapper: [{}]", key, putCacheWrapper, cacheWrapper);
     }
@@ -90,7 +90,7 @@ public class InMemoryCacheStore extends StringCacheStore {
     public void delete(String key) {
         Assert.hasText(key, "Cache key must not be blank");
 
-        cacheContainer.remove(key);
+        CACHE_CONTAINER.remove(key);
         log.debug("Removed key: [{}]", key);
     }
 
@@ -110,7 +110,7 @@ public class InMemoryCacheStore extends StringCacheStore {
 
         @Override
         public void run() {
-            cacheContainer.keySet().forEach(key -> {
+            CACHE_CONTAINER.keySet().forEach(key -> {
                 if (!InMemoryCacheStore.this.get(key).isPresent()) {
                     log.debug("Deleted the cache: [{}] for expiration", key);
                 }
diff --git a/src/main/java/run/halo/app/handler/theme/config/support/Item.java b/src/main/java/run/halo/app/handler/theme/config/support/Item.java
index fa83d74d6..01e3675af 100644
--- a/src/main/java/run/halo/app/handler/theme/config/support/Item.java
+++ b/src/main/java/run/halo/app/handler/theme/config/support/Item.java
@@ -53,8 +53,12 @@ public class Item {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         Item item = (Item) o;
         return name.equals(item.name);
     }
diff --git a/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java b/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java
index dcae2ae0c..90fcd5016 100644
--- a/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java
+++ b/src/main/java/run/halo/app/handler/theme/config/support/ThemeProperty.java
@@ -85,8 +85,12 @@ public class ThemeProperty {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         ThemeProperty that = (ThemeProperty) o;
         return id.equals(that.id);
     }
diff --git a/src/main/java/run/halo/app/listener/StartedListener.java b/src/main/java/run/halo/app/listener/StartedListener.java
index 1b81d501b..94af66d4d 100644
--- a/src/main/java/run/halo/app/listener/StartedListener.java
+++ b/src/main/java/run/halo/app/listener/StartedListener.java
@@ -80,7 +80,7 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
 
             Path source;
 
-            if (themeUri.getScheme().equalsIgnoreCase("jar")) {
+            if ("jar".equalsIgnoreCase(themeUri.getScheme())) {
                 // Create new file system for jar
                 FileSystem fileSystem = FileSystems.newFileSystem(themeUri, Collections.emptyMap());
                 source = fileSystem.getPath("/BOOT-INF/classes/" + ThemeService.THEME_FOLDER);
diff --git a/src/main/java/run/halo/app/model/entity/PostCategory.java b/src/main/java/run/halo/app/model/entity/PostCategory.java
index 764f11aec..ba1eea512 100644
--- a/src/main/java/run/halo/app/model/entity/PostCategory.java
+++ b/src/main/java/run/halo/app/model/entity/PostCategory.java
@@ -43,8 +43,12 @@ public class PostCategory extends BaseEntity {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         PostCategory that = (PostCategory) o;
         return categoryId.equals(that.categoryId) &&
                 postId.equals(that.postId);
diff --git a/src/main/java/run/halo/app/model/entity/PostTag.java b/src/main/java/run/halo/app/model/entity/PostTag.java
index 18cffdf48..2e2ac37fb 100644
--- a/src/main/java/run/halo/app/model/entity/PostTag.java
+++ b/src/main/java/run/halo/app/model/entity/PostTag.java
@@ -44,8 +44,12 @@ public class PostTag extends BaseEntity {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         PostTag postTag = (PostTag) o;
         return Objects.equals(postId, postTag.postId) &&
                 Objects.equals(tagId, postTag.tagId);
diff --git a/src/main/java/run/halo/app/model/enums/Mode.java b/src/main/java/run/halo/app/model/enums/Mode.java
index 1dd4a7374..fb1c457ca 100644
--- a/src/main/java/run/halo/app/model/enums/Mode.java
+++ b/src/main/java/run/halo/app/model/enums/Mode.java
@@ -30,15 +30,15 @@ public enum Mode {
     @Nullable
     @JsonCreator
     public static Mode valueFrom(@Nullable String value) {
-        if (StringUtils.isBlank(value) || value.equalsIgnoreCase("prod")) {
+        if (StringUtils.isBlank(value) || "prod".equalsIgnoreCase(value)) {
             return Mode.PRODUCTION;
         }
 
-        if (value.equalsIgnoreCase("dev")) {
+        if ("dev".equalsIgnoreCase(value)) {
             return Mode.DEVELOPMENT;
         }
 
-        if (value.equalsIgnoreCase("test")) {
+        if ("test".equalsIgnoreCase(value)) {
             return Mode.TEST;
         }
 
diff --git a/src/main/java/run/halo/app/model/properties/ApiProperties.java b/src/main/java/run/halo/app/model/properties/ApiProperties.java
index 17d67006c..f4d42c995 100644
--- a/src/main/java/run/halo/app/model/properties/ApiProperties.java
+++ b/src/main/java/run/halo/app/model/properties/ApiProperties.java
@@ -8,8 +8,14 @@ package run.halo.app.model.properties;
  */
 public enum ApiProperties implements PropertyEnum {
 
+    /**
+     * api_enabled
+     */
     API_ENABLED("api_enabled", Boolean.class, "false"),
 
+    /**
+     * api_access_key
+     */
     API_ACCESS_KEY("api_access_key", String.class, "");
 
     private final String value;
diff --git a/src/main/java/run/halo/app/model/properties/AttachmentProperties.java b/src/main/java/run/halo/app/model/properties/AttachmentProperties.java
index 8ff4d9aaa..b73d3485d 100644
--- a/src/main/java/run/halo/app/model/properties/AttachmentProperties.java
+++ b/src/main/java/run/halo/app/model/properties/AttachmentProperties.java
@@ -10,6 +10,9 @@ import run.halo.app.model.enums.AttachmentType;
  */
 public enum AttachmentProperties implements PropertyEnum {
 
+    /**
+     * attachment_type
+     */
     ATTACHMENT_TYPE("attachment_type", AttachmentType.class, AttachmentType.LOCAL.name());
 
     private final String value;
diff --git a/src/main/java/run/halo/app/model/vo/BaseCommentWithParentVO.java b/src/main/java/run/halo/app/model/vo/BaseCommentWithParentVO.java
index 71bc08bd1..b7b9e5eb1 100644
--- a/src/main/java/run/halo/app/model/vo/BaseCommentWithParentVO.java
+++ b/src/main/java/run/halo/app/model/vo/BaseCommentWithParentVO.java
@@ -23,6 +23,7 @@ public class BaseCommentWithParentVO extends BaseCommentDTO implements Cloneable
      */
     private BaseCommentWithParentVO parent;
 
+    @Override
     public BaseCommentWithParentVO clone() {
         try {
             return (BaseCommentWithParentVO) super.clone();
diff --git a/src/main/java/run/halo/app/repository/PostCommentRepository.java b/src/main/java/run/halo/app/repository/PostCommentRepository.java
index 974178d46..22c2500af 100644
--- a/src/main/java/run/halo/app/repository/PostCommentRepository.java
+++ b/src/main/java/run/halo/app/repository/PostCommentRepository.java
@@ -29,5 +29,6 @@ public interface PostCommentRepository extends BaseCommentRepository<PostComment
             "where comment.parentId in ?1 " +
             "group by comment.parentId")
     @NonNull
+    @Override
     List<CommentChildrenCountProjection> findDirectChildrenCount(@NonNull Iterable<Long> commentIds);
 }
diff --git a/src/main/java/run/halo/app/repository/SheetCommentRepository.java b/src/main/java/run/halo/app/repository/SheetCommentRepository.java
index e121952b5..4a858c768 100644
--- a/src/main/java/run/halo/app/repository/SheetCommentRepository.java
+++ b/src/main/java/run/halo/app/repository/SheetCommentRepository.java
@@ -29,5 +29,6 @@ public interface SheetCommentRepository extends BaseCommentRepository<SheetComme
             "where comment.parentId in ?1 " +
             "group by comment.parentId")
     @NonNull
+    @Override
     List<CommentChildrenCountProjection> findDirectChildrenCount(@NonNull Iterable<Long> commentIds);
 }
diff --git a/src/main/java/run/halo/app/repository/SheetRepository.java b/src/main/java/run/halo/app/repository/SheetRepository.java
index 5846ef803..557300ffc 100644
--- a/src/main/java/run/halo/app/repository/SheetRepository.java
+++ b/src/main/java/run/halo/app/repository/SheetRepository.java
@@ -25,5 +25,6 @@ public interface SheetRepository extends BasePostRepository<Sheet> {
     Long countLike();
 
     @NonNull
+    @Override
     Optional<Sheet> getByUrlAndStatus(@NonNull String url, @NonNull PostStatus status);
 }
diff --git a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java
index 801150360..4c08c7f7a 100644
--- a/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/AdminServiceImpl.java
@@ -323,7 +323,7 @@ public class AdminServiceImpl implements AdminService {
             String contentType = aAssetMap.getOrDefault("content_type", "").toString();
 
             Object name = aAssetMap.getOrDefault("name", "");
-            return name.toString().matches(HALO_ADMIN_VERSION_REGEX) && contentType.equalsIgnoreCase("application/zip");
+            return name.toString().matches(HALO_ADMIN_VERSION_REGEX) && "application/zip".equalsIgnoreCase(contentType);
         };
     }
 
diff --git a/src/main/java/run/halo/app/service/impl/BaseCommentServiceImpl.java b/src/main/java/run/halo/app/service/impl/BaseCommentServiceImpl.java
index 14c030324..5852b7ee5 100644
--- a/src/main/java/run/halo/app/service/impl/BaseCommentServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/BaseCommentServiceImpl.java
@@ -390,7 +390,7 @@ public abstract class BaseCommentServiceImpl<COMMENT extends BaseComment> extend
             Assert.notNull(toCompareComment, "Comment to compare must not be null");
 
             // Get sort order
-            Sort.Order order = sort.filter(anOrder -> anOrder.getProperty().equals("id"))
+            Sort.Order order = sort.filter(anOrder -> "id".equals(anOrder.getProperty()))
                     .get()
                     .findFirst()
                     .orElseGet(() -> Sort.Order.desc("id"));
@@ -404,6 +404,7 @@ public abstract class BaseCommentServiceImpl<COMMENT extends BaseComment> extend
     }
 
     @NonNull
+    @Override
     public List<BaseCommentVO> convertToVo(@Nullable List<COMMENT> comments, @Nullable Comparator<BaseCommentVO> comparator) {
         if (CollectionUtils.isEmpty(comments)) {
             return Collections.emptyList();
diff --git a/src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java b/src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java
index ed63bb396..062c37d52 100644
--- a/src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java
+++ b/src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java
@@ -200,7 +200,7 @@ public class RecoveryServiceImpl implements RecoveryService {
             String postType = postMap.getOrDefault("postType", "post").toString();
 
             try {
-                if (postType.equalsIgnoreCase("post")) {
+                if ("post".equalsIgnoreCase(postType)) {
                     // Handle post
                     result.add(handlePost(post, postMap));
                 } else {