diff --git a/src/main/java/run/halo/app/Application.java b/src/main/java/run/halo/app/Application.java index 037fe8ff9..4735c15b8 100755 --- a/src/main/java/run/halo/app/Application.java +++ b/src/main/java/run/halo/app/Application.java @@ -13,12 +13,10 @@ import org.springframework.scheduling.annotation.EnableScheduling; import run.halo.app.repository.base.BaseRepositoryImpl; /** - * 
- *     Halo run!
- *
+ * Halo main class. * * @author ryanwang - * @date : 2017/11/14 + * @date 2017-11-14 */ @SpringBootApplication @EnableJpaAuditing diff --git a/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java b/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java index 7035007b0..f9b59fd0c 100644 --- a/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java +++ b/src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java @@ -40,7 +40,7 @@ import static run.halo.app.utils.HaloUtils.*; * Mvc configuration. * * @author ryanwang - * @date : 2018/1/2 + * @date 2018-01-02 */ @Slf4j @Configuration diff --git a/src/main/java/run/halo/app/controller/admin/api/AdminController.java b/src/main/java/run/halo/app/controller/admin/api/AdminController.java index 543f436d4..871aae89d 100644 --- a/src/main/java/run/halo/app/controller/admin/api/AdminController.java +++ b/src/main/java/run/halo/app/controller/admin/api/AdminController.java @@ -86,6 +86,7 @@ public class AdminController { */ @GetMapping("counts") @ApiOperation("Gets count info") + @Deprecated public StatisticDTO getCount() { return adminService.getCount(); } diff --git a/src/main/java/run/halo/app/controller/admin/api/InstallController.java b/src/main/java/run/halo/app/controller/admin/api/InstallController.java index b2aea0d35..54aebc66e 100644 --- a/src/main/java/run/halo/app/controller/admin/api/InstallController.java +++ b/src/main/java/run/halo/app/controller/admin/api/InstallController.java @@ -38,7 +38,7 @@ import java.util.Set; * Installation controller. * * @author ryanwang - * @date : 2019-03-17 + * @date 2019-03-17 */ @Slf4j @Controller diff --git a/src/main/java/run/halo/app/controller/admin/api/LinkController.java b/src/main/java/run/halo/app/controller/admin/api/LinkController.java index 8c6050007..4636b4b1d 100644 --- a/src/main/java/run/halo/app/controller/admin/api/LinkController.java +++ b/src/main/java/run/halo/app/controller/admin/api/LinkController.java @@ -16,7 +16,7 @@ import java.util.List; * Link Controller * * @author ryanwang - * @date : 2019/3/21 + * @date 2019/3/21 */ @RestController @RequestMapping("/api/admin/links") diff --git a/src/main/java/run/halo/app/controller/admin/api/PhotoController.java b/src/main/java/run/halo/app/controller/admin/api/PhotoController.java index 98f5dc2ed..371a8effb 100644 --- a/src/main/java/run/halo/app/controller/admin/api/PhotoController.java +++ b/src/main/java/run/halo/app/controller/admin/api/PhotoController.java @@ -22,7 +22,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Photo controller * * @author ryanwang - * @date : 2019-3-21 + * @date 2019-3-21 */ @RestController @RequestMapping("/api/admin/photos") diff --git a/src/main/java/run/halo/app/controller/admin/api/StatisticController.java b/src/main/java/run/halo/app/controller/admin/api/StatisticController.java index 7da92a497..5bb2e272d 100644 --- a/src/main/java/run/halo/app/controller/admin/api/StatisticController.java +++ b/src/main/java/run/halo/app/controller/admin/api/StatisticController.java @@ -11,7 +11,7 @@ import run.halo.app.service.StatisticService; /** * Statistic controller. * - * @author ryan0up + * @author ryanwang * @date 2019-12-16 */ @RestController diff --git a/src/main/java/run/halo/app/controller/admin/api/ThemeController.java b/src/main/java/run/halo/app/controller/admin/api/ThemeController.java index b4b1a7831..b1b0caed1 100644 --- a/src/main/java/run/halo/app/controller/admin/api/ThemeController.java +++ b/src/main/java/run/halo/app/controller/admin/api/ThemeController.java @@ -20,7 +20,7 @@ import java.util.Set; * Theme controller. * * @author ryanwang - * @date : 2019/3/20 + * @date 2019-03-20 */ @RestController @RequestMapping("/api/admin/themes") diff --git a/src/main/java/run/halo/app/controller/content/ContentArchiveController.java b/src/main/java/run/halo/app/controller/content/ContentArchiveController.java index d599b9b43..ad31ddb0d 100644 --- a/src/main/java/run/halo/app/controller/content/ContentArchiveController.java +++ b/src/main/java/run/halo/app/controller/content/ContentArchiveController.java @@ -36,7 +36,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * * @author ryanwang * @author guqing - * @date : 2019-03-17 + * @date 2019-03-17 */ @Slf4j @Controller diff --git a/src/main/java/run/halo/app/controller/content/ContentCategoryController.java b/src/main/java/run/halo/app/controller/content/ContentCategoryController.java index 97956eebc..dc1fd70d8 100644 --- a/src/main/java/run/halo/app/controller/content/ContentCategoryController.java +++ b/src/main/java/run/halo/app/controller/content/ContentCategoryController.java @@ -23,7 +23,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Category controller. * * @author ryanwang - * @date : 2019/3/20 + * @date 2019-03-20 */ @Controller @RequestMapping(value = "/categories") diff --git a/src/main/java/run/halo/app/controller/content/ContentFeedController.java b/src/main/java/run/halo/app/controller/content/ContentFeedController.java index f11052078..6e1058772 100644 --- a/src/main/java/run/halo/app/controller/content/ContentFeedController.java +++ b/src/main/java/run/halo/app/controller/content/ContentFeedController.java @@ -32,7 +32,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; /** * @author ryanwang - * @date : 2019-03-21 + * @date 2019-03-21 */ @Slf4j @Controller diff --git a/src/main/java/run/halo/app/controller/content/ContentIndexController.java b/src/main/java/run/halo/app/controller/content/ContentIndexController.java index 51e886373..476184d98 100644 --- a/src/main/java/run/halo/app/controller/content/ContentIndexController.java +++ b/src/main/java/run/halo/app/controller/content/ContentIndexController.java @@ -25,7 +25,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Blog index page controller * * @author ryanwang - * @date : 2019-03-17 + * @date 2019-03-17 */ @Slf4j @Controller diff --git a/src/main/java/run/halo/app/controller/content/ContentJournalController.java b/src/main/java/run/halo/app/controller/content/ContentJournalController.java index 8308da3f6..839d3b4ae 100644 --- a/src/main/java/run/halo/app/controller/content/ContentJournalController.java +++ b/src/main/java/run/halo/app/controller/content/ContentJournalController.java @@ -25,7 +25,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Blog journal page controller * * @author ryanwang - * @date : 2019-05-04 + * @date 2019-05-04 */ @Slf4j @Controller diff --git a/src/main/java/run/halo/app/controller/content/ContentSearchController.java b/src/main/java/run/halo/app/controller/content/ContentSearchController.java index 4da44d503..f8d4506d2 100644 --- a/src/main/java/run/halo/app/controller/content/ContentSearchController.java +++ b/src/main/java/run/halo/app/controller/content/ContentSearchController.java @@ -25,7 +25,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Search controller. * * @author ryanwang - * @date : 2019-04-21 + * @date 2019-04-21 */ @Controller @RequestMapping(value = "/search") diff --git a/src/main/java/run/halo/app/controller/content/ContentSheetController.java b/src/main/java/run/halo/app/controller/content/ContentSheetController.java index 1fd7f3ea3..5935dabce 100644 --- a/src/main/java/run/halo/app/controller/content/ContentSheetController.java +++ b/src/main/java/run/halo/app/controller/content/ContentSheetController.java @@ -28,7 +28,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Content sheet controller. * * @author ryanwang - * @date : 2019-03-21 + * @date 2019-03-21 */ @Controller public class ContentSheetController { diff --git a/src/main/java/run/halo/app/controller/content/ContentTagController.java b/src/main/java/run/halo/app/controller/content/ContentTagController.java index ee9a09066..c5b62c03a 100644 --- a/src/main/java/run/halo/app/controller/content/ContentTagController.java +++ b/src/main/java/run/halo/app/controller/content/ContentTagController.java @@ -23,7 +23,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Tag controller. * * @author ryanwang - * @date : 2019-03-21 + * @date 2019-03-21 */ @Controller @RequestMapping(value = "/tags") diff --git a/src/main/java/run/halo/app/controller/content/MainController.java b/src/main/java/run/halo/app/controller/content/MainController.java index 3c6171b20..e237b4ab2 100644 --- a/src/main/java/run/halo/app/controller/content/MainController.java +++ b/src/main/java/run/halo/app/controller/content/MainController.java @@ -20,7 +20,7 @@ import java.io.IOException; * Main controller. * * @author ryanwang - * @date : 2019-04-23 + * @date 2019-04-23 */ @Controller public class MainController { diff --git a/src/main/java/run/halo/app/controller/core/CommonController.java b/src/main/java/run/halo/app/controller/core/CommonController.java index 739096875..4d332a211 100644 --- a/src/main/java/run/halo/app/controller/core/CommonController.java +++ b/src/main/java/run/halo/app/controller/core/CommonController.java @@ -29,7 +29,7 @@ import java.util.Map; * Error page Controller * * @author ryanwang - * @date : 2017/12/26 + * @date 2017-12-26 */ @Slf4j @Controller @@ -44,6 +44,8 @@ public class CommonController extends AbstractErrorController { private static final String DEFAULT_ERROR_PATH = "common/error/error"; + private static final String COULD_NOT_RESOLVE_VIEW_WITH_NAME_PREFIX = "Could not resolve view with name '"; + private final ThemeService themeService; private final ErrorProperties errorProperties; @@ -167,7 +169,7 @@ public class CommonController extends AbstractErrorController { request.setAttribute("javax.servlet.error.exception", rootCause); request.setAttribute("javax.servlet.error.message", haloException.getMessage()); } - } else if (StringUtils.startsWithIgnoreCase(throwable.getMessage(), "Could not resolve view with name '")) { + } else if (StringUtils.startsWithIgnoreCase(throwable.getMessage(), COULD_NOT_RESOLVE_VIEW_WITH_NAME_PREFIX)) { request.setAttribute("javax.servlet.error.status_code", HttpStatus.NOT_FOUND.value()); NotFoundException viewNotFound = new NotFoundException("该路径没有对应的模板"); @@ -193,7 +195,7 @@ public class CommonController extends AbstractErrorController { * @param request the source request * @return if the stacktrace attribute should be included */ - protected boolean isIncludeStackTrace(HttpServletRequest request) { + private boolean isIncludeStackTrace(HttpServletRequest request) { ErrorProperties.IncludeStacktrace include = errorProperties.getIncludeStacktrace(); if (include == ErrorProperties.IncludeStacktrace.ALWAYS) { return true; diff --git a/src/main/java/run/halo/app/core/ControllerLogAop.java b/src/main/java/run/halo/app/core/ControllerLogAop.java index db64b8534..c3df45de3 100644 --- a/src/main/java/run/halo/app/core/ControllerLogAop.java +++ b/src/main/java/run/halo/app/core/ControllerLogAop.java @@ -21,6 +21,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Objects; +/** + * @author johnniang + */ @Aspect @Component @Slf4j diff --git a/src/main/java/run/halo/app/core/freemarker/method/RandomMethod.java b/src/main/java/run/halo/app/core/freemarker/method/RandomMethod.java index ef68f9e07..b11e4f7ce 100644 --- a/src/main/java/run/halo/app/core/freemarker/method/RandomMethod.java +++ b/src/main/java/run/halo/app/core/freemarker/method/RandomMethod.java @@ -10,8 +10,10 @@ import org.springframework.stereotype.Component; import java.util.List; /** + * Freemarker template random method. + * * @author ryanwang - * @date : 2018/12/21 + * @date 2018-12-21 */ @Component public class RandomMethod implements TemplateMethodModelEx { diff --git a/src/main/java/run/halo/app/core/freemarker/tag/CategoryTagDirective.java b/src/main/java/run/halo/app/core/freemarker/tag/CategoryTagDirective.java index 2a38c017c..e23bf7236 100644 --- a/src/main/java/run/halo/app/core/freemarker/tag/CategoryTagDirective.java +++ b/src/main/java/run/halo/app/core/freemarker/tag/CategoryTagDirective.java @@ -17,7 +17,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Freemarker custom tag of category. * * @author ryanwang - * @date : 2019/3/22 + * @date 2019-03-22 */ @Component public class CategoryTagDirective implements TemplateDirectiveModel { diff --git a/src/main/java/run/halo/app/core/freemarker/tag/CommentTagDirective.java b/src/main/java/run/halo/app/core/freemarker/tag/CommentTagDirective.java index c1185cf35..709cb7350 100644 --- a/src/main/java/run/halo/app/core/freemarker/tag/CommentTagDirective.java +++ b/src/main/java/run/halo/app/core/freemarker/tag/CommentTagDirective.java @@ -16,7 +16,7 @@ import java.util.Map; * Freemarker custom tag of comment. * * @author ryanwang - * @date : 2019/3/22 + * @date 2019-03-22 */ @Component public class CommentTagDirective implements TemplateDirectiveModel { diff --git a/src/main/java/run/halo/app/core/freemarker/tag/LinkTagDirective.java b/src/main/java/run/halo/app/core/freemarker/tag/LinkTagDirective.java index f6d240691..ed3aa935f 100644 --- a/src/main/java/run/halo/app/core/freemarker/tag/LinkTagDirective.java +++ b/src/main/java/run/halo/app/core/freemarker/tag/LinkTagDirective.java @@ -16,7 +16,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Freemarker custom tag of link. * * @author ryanwang - * @date : 2019/3/22 + * @date 2019-03-22 */ @Component public class LinkTagDirective implements TemplateDirectiveModel { diff --git a/src/main/java/run/halo/app/core/freemarker/tag/MenuTagDirective.java b/src/main/java/run/halo/app/core/freemarker/tag/MenuTagDirective.java index 806c53471..ac7355955 100644 --- a/src/main/java/run/halo/app/core/freemarker/tag/MenuTagDirective.java +++ b/src/main/java/run/halo/app/core/freemarker/tag/MenuTagDirective.java @@ -16,7 +16,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Freemarker custom tag of menu. * * @author ryanwang - * @date : 2019/3/22 + * @date 2019-03-22 */ @Component public class MenuTagDirective implements TemplateDirectiveModel { diff --git a/src/main/java/run/halo/app/core/freemarker/tag/PhotoTagDirective.java b/src/main/java/run/halo/app/core/freemarker/tag/PhotoTagDirective.java index 75e35fc3a..0280e90e2 100644 --- a/src/main/java/run/halo/app/core/freemarker/tag/PhotoTagDirective.java +++ b/src/main/java/run/halo/app/core/freemarker/tag/PhotoTagDirective.java @@ -16,7 +16,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Freemarker custom tag of photo. * * @author ryanwang - * @date : 2019/4/21 + * @date 2019-04-21 */ @Component public class PhotoTagDirective implements TemplateDirectiveModel { diff --git a/src/main/java/run/halo/app/core/freemarker/tag/PostTagDirective.java b/src/main/java/run/halo/app/core/freemarker/tag/PostTagDirective.java index 98c9a2cfd..aea98d26e 100644 --- a/src/main/java/run/halo/app/core/freemarker/tag/PostTagDirective.java +++ b/src/main/java/run/halo/app/core/freemarker/tag/PostTagDirective.java @@ -16,7 +16,7 @@ import java.util.Map; * Freemarker custom tag of post. * * @author ryanwang - * @date : 2018/4/26 + * @date 2018-04-26 */ @Component public class PostTagDirective implements TemplateDirectiveModel { diff --git a/src/main/java/run/halo/app/core/freemarker/tag/TagTagDirective.java b/src/main/java/run/halo/app/core/freemarker/tag/TagTagDirective.java index 8f00360ba..132e92022 100644 --- a/src/main/java/run/halo/app/core/freemarker/tag/TagTagDirective.java +++ b/src/main/java/run/halo/app/core/freemarker/tag/TagTagDirective.java @@ -17,7 +17,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC; * Freemarker custom tag of tag. * * @author ryanwang - * @date : 2019/3/22 + * @date 2019-03-22 */ @Component public class TagTagDirective implements TemplateDirectiveModel { diff --git a/src/main/java/run/halo/app/event/comment/CommentEventListener.java b/src/main/java/run/halo/app/event/comment/CommentEventListener.java index c6fb20d2d..d4323d9ac 100644 --- a/src/main/java/run/halo/app/event/comment/CommentEventListener.java +++ b/src/main/java/run/halo/app/event/comment/CommentEventListener.java @@ -56,6 +56,11 @@ public class CommentEventListener { this.userService = userService; } + /** + * Received a new new comment event. + * + * @param newEvent new comment event. + */ @Async @EventListener public void handleCommentNewEvent(CommentNewEvent newEvent) { @@ -118,12 +123,11 @@ public class CommentEventListener { mailService.sendTemplateMail(user.getEmail(), "您的博客有新的评论", data, "common/mail_template/mail_notice.ftl"); } - @Async - @EventListener - public void handleCommentPassEvent(CommentPassEvent passEvent) { - - } - + /** + * Received a new reply comment event. + * + * @param newEvent reply comment event. + */ @Async @EventListener public void handleCommentReplyEvent(CommentReplyEvent replyEvent) { diff --git a/src/main/java/run/halo/app/event/comment/CommentPassEvent.java b/src/main/java/run/halo/app/event/comment/CommentPassEvent.java deleted file mode 100644 index c29865273..000000000 --- a/src/main/java/run/halo/app/event/comment/CommentPassEvent.java +++ /dev/null @@ -1,22 +0,0 @@ -package run.halo.app.event.comment; - -import org.springframework.lang.NonNull; - -/** - * PostComment pass event. - * - * @author johnniang - * @date 19-4-23 - */ -public class CommentPassEvent extends CommentBaseEvent { - - /** - * Create a new ApplicationEvent. - * - * @param source the object on which the event initially occurred (never {@code null}) - * @param commentId comment id - */ - public CommentPassEvent(Object source, @NonNull Long commentId) { - super(source, commentId); - } -} diff --git a/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java b/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java index 6b68e7987..1e1155636 100644 --- a/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java +++ b/src/main/java/run/halo/app/factory/StringToEnumConverterFactory.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; /** * @author ryanwang - * @date : 2019/3/14 + * @date 2019-3-14 */ @Component public class StringToEnumConverterFactory implements ConverterFactory { diff --git a/src/main/java/run/halo/app/handler/file/AliOssFileHandler.java b/src/main/java/run/halo/app/handler/file/AliOssFileHandler.java index a77d7e94d..854e7aba1 100644 --- a/src/main/java/run/halo/app/handler/file/AliOssFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/AliOssFileHandler.java @@ -22,7 +22,7 @@ import java.awt.image.BufferedImage; import java.util.Objects; /** - * AliYun file handler. + * Ali oss file handler. * * @author MyFaith * @author ryanwang diff --git a/src/main/java/run/halo/app/handler/file/BaiduBosFileHandler.java b/src/main/java/run/halo/app/handler/file/BaiduBosFileHandler.java index b681469d1..e57641231 100644 --- a/src/main/java/run/halo/app/handler/file/BaiduBosFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/BaiduBosFileHandler.java @@ -23,7 +23,7 @@ import java.awt.image.BufferedImage; import java.util.Objects; /** - * BaiDuYun file handler. + * Baidu bos file handler. * * @author wangya * @author ryanwang diff --git a/src/main/java/run/halo/app/handler/file/FileHandler.java b/src/main/java/run/halo/app/handler/file/FileHandler.java index 8d7b5da31..5986fbdba 100644 --- a/src/main/java/run/halo/app/handler/file/FileHandler.java +++ b/src/main/java/run/halo/app/handler/file/FileHandler.java @@ -16,7 +16,7 @@ import static run.halo.app.model.support.HaloConst.FILE_SEPARATOR; * File handler interface. * * @author johnniang - * @date 3/27/19 + * @date 2019-03-27 */ public interface FileHandler { diff --git a/src/main/java/run/halo/app/handler/file/FileHandlers.java b/src/main/java/run/halo/app/handler/file/FileHandlers.java index 4df893abe..8a79d215a 100644 --- a/src/main/java/run/halo/app/handler/file/FileHandlers.java +++ b/src/main/java/run/halo/app/handler/file/FileHandlers.java @@ -20,7 +20,7 @@ import java.util.LinkedList; * File handler manager. * * @author johnniang - * @date 3/27/19 + * @date 2019-03-27 */ @Slf4j @Component diff --git a/src/main/java/run/halo/app/handler/file/QiniuOssFileHandler.java b/src/main/java/run/halo/app/handler/file/QiniuOssFileHandler.java index caaf2adf5..35db08d24 100644 --- a/src/main/java/run/halo/app/handler/file/QiniuOssFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/QiniuOssFileHandler.java @@ -33,7 +33,7 @@ import java.util.Objects; import static run.halo.app.handler.file.FileHandler.isImageType; /** - * Qi niu yun file handler. + * Qiniu oss file handler. * * @author johnniang * @author ryanwang diff --git a/src/main/java/run/halo/app/handler/file/TencentCosFileHandler.java b/src/main/java/run/halo/app/handler/file/TencentCosFileHandler.java index 1acd1f231..5f0692b56 100644 --- a/src/main/java/run/halo/app/handler/file/TencentCosFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/TencentCosFileHandler.java @@ -26,7 +26,7 @@ import java.awt.image.BufferedImage; import java.util.Objects; /** - * TencentYun file handler. + * Tencent cos file handler. * * @author wangya * @author ryanwang diff --git a/src/main/java/run/halo/app/handler/file/UpOssFileHandler.java b/src/main/java/run/halo/app/handler/file/UpOssFileHandler.java index 0f36ef599..a335c7f3b 100644 --- a/src/main/java/run/halo/app/handler/file/UpOssFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/UpOssFileHandler.java @@ -20,7 +20,7 @@ import java.awt.image.BufferedImage; import java.util.Objects; /** - * Up Yun file handler. + * Up oss file handler. * * @author johnniang * @author ryanwang diff --git a/src/main/java/run/halo/app/handler/theme/config/ThemeConfigResolver.java b/src/main/java/run/halo/app/handler/theme/config/ThemeConfigResolver.java index 5800e8dcc..6118ae46b 100644 --- a/src/main/java/run/halo/app/handler/theme/config/ThemeConfigResolver.java +++ b/src/main/java/run/halo/app/handler/theme/config/ThemeConfigResolver.java @@ -10,7 +10,7 @@ import java.util.List; * Theme config resolver interface. * * @author johnniang - * @date 4/10/19 + * @date 2019-04-10 */ public interface ThemeConfigResolver { diff --git a/src/main/java/run/halo/app/handler/theme/config/ThemePropertyResolver.java b/src/main/java/run/halo/app/handler/theme/config/ThemePropertyResolver.java index bfdf261fc..8c3c8db02 100644 --- a/src/main/java/run/halo/app/handler/theme/config/ThemePropertyResolver.java +++ b/src/main/java/run/halo/app/handler/theme/config/ThemePropertyResolver.java @@ -9,7 +9,7 @@ import java.io.IOException; * Theme file resolver. * * @author johnniang - * @date 4/11/19 + * @date 2019-04-11 */ public interface ThemePropertyResolver { diff --git a/src/main/java/run/halo/app/handler/theme/config/impl/YamlThemePropertyResolver.java b/src/main/java/run/halo/app/handler/theme/config/impl/YamlThemePropertyResolver.java index 5f055ce0b..a1af62bb1 100644 --- a/src/main/java/run/halo/app/handler/theme/config/impl/YamlThemePropertyResolver.java +++ b/src/main/java/run/halo/app/handler/theme/config/impl/YamlThemePropertyResolver.java @@ -14,7 +14,7 @@ import java.io.IOException; * Yaml theme file resolver. * * @author johnniang - * @date 4/11/19 + * @date 2019-04-11 */ @Service public class YamlThemePropertyResolver implements ThemePropertyResolver { diff --git a/src/main/java/run/halo/app/listener/StartedListener.java b/src/main/java/run/halo/app/listener/StartedListener.java index 613b09b5f..882463485 100644 --- a/src/main/java/run/halo/app/listener/StartedListener.java +++ b/src/main/java/run/halo/app/listener/StartedListener.java @@ -28,7 +28,7 @@ import java.util.Collections; * * @author ryanwang * @author guqing - * @date : 2018-12-05 + * @date 2018-12-05 */ @Slf4j @Configuration diff --git a/src/main/java/run/halo/app/model/dto/EnvironmentDTO.java b/src/main/java/run/halo/app/model/dto/EnvironmentDTO.java index 3b66bc064..1289a1ab4 100644 --- a/src/main/java/run/halo/app/model/dto/EnvironmentDTO.java +++ b/src/main/java/run/halo/app/model/dto/EnvironmentDTO.java @@ -7,7 +7,7 @@ import run.halo.app.model.enums.Mode; * Theme controller. * * @author ryanwang - * @date : 2019/5/4 + * @date 2019/5/4 */ @Data public class EnvironmentDTO { diff --git a/src/main/java/run/halo/app/model/dto/InternalSheetDTO.java b/src/main/java/run/halo/app/model/dto/InternalSheetDTO.java index 377027e5d..7b2142526 100644 --- a/src/main/java/run/halo/app/model/dto/InternalSheetDTO.java +++ b/src/main/java/run/halo/app/model/dto/InternalSheetDTO.java @@ -6,7 +6,7 @@ import lombok.Data; * Theme controller. * * @author ryanwang - * @date : 2019/5/4 + * @date 2019/5/4 */ @Data public class InternalSheetDTO { diff --git a/src/main/java/run/halo/app/model/dto/LinkDTO.java b/src/main/java/run/halo/app/model/dto/LinkDTO.java index 2c95ca0d8..add220791 100644 --- a/src/main/java/run/halo/app/model/dto/LinkDTO.java +++ b/src/main/java/run/halo/app/model/dto/LinkDTO.java @@ -8,7 +8,7 @@ import run.halo.app.model.entity.Link; * Link output dto. * * @author ryanwang - * @date : 2019/3/21 + * @date 2019/3/21 */ @Data public class LinkDTO implements OutputConverter { diff --git a/src/main/java/run/halo/app/model/dto/PhotoDTO.java b/src/main/java/run/halo/app/model/dto/PhotoDTO.java index 38d09fb62..3d6be15ad 100644 --- a/src/main/java/run/halo/app/model/dto/PhotoDTO.java +++ b/src/main/java/run/halo/app/model/dto/PhotoDTO.java @@ -8,7 +8,7 @@ import java.util.Date; /** * @author ryanwang - * @date : 2019/3/21 + * @date 2019-03-21 */ @Data public class PhotoDTO implements OutputConverter { diff --git a/src/main/java/run/halo/app/model/entity/Attachment.java b/src/main/java/run/halo/app/model/entity/Attachment.java index ded0f309d..9ab687e97 100644 --- a/src/main/java/run/halo/app/model/entity/Attachment.java +++ b/src/main/java/run/halo/app/model/entity/Attachment.java @@ -11,7 +11,7 @@ import javax.persistence.*; * Attachment entity * * @author ryanwang - * @date : 2019-03-12 + * @date 2019-03-12 */ @Data @Entity diff --git a/src/main/java/run/halo/app/model/entity/JournalComment.java b/src/main/java/run/halo/app/model/entity/JournalComment.java index f36647a4b..5c1d487d7 100644 --- a/src/main/java/run/halo/app/model/entity/JournalComment.java +++ b/src/main/java/run/halo/app/model/entity/JournalComment.java @@ -7,7 +7,7 @@ import javax.persistence.Entity; * Journal comment. * * @author johnniang - * @date 19-4-25 + * @date 2019-04-25 */ @Entity(name = "JournalComment") @DiscriminatorValue("2") diff --git a/src/main/java/run/halo/app/model/entity/Link.java b/src/main/java/run/halo/app/model/entity/Link.java index 3b64992e7..c95ab6c2d 100644 --- a/src/main/java/run/halo/app/model/entity/Link.java +++ b/src/main/java/run/halo/app/model/entity/Link.java @@ -10,7 +10,7 @@ import javax.persistence.*; * Link entity * * @author ryanwang - * @date : 2019-03-12 + * @date 2019-03-12 */ @Data @Entity diff --git a/src/main/java/run/halo/app/model/entity/Menu.java b/src/main/java/run/halo/app/model/entity/Menu.java index 57ea6b39c..cf2a9ed39 100644 --- a/src/main/java/run/halo/app/model/entity/Menu.java +++ b/src/main/java/run/halo/app/model/entity/Menu.java @@ -10,7 +10,7 @@ import javax.persistence.*; * Menu entity * * @author ryanwang - * @date : 2019-03-12 + * @date 2019-03-12 */ @Data @Entity diff --git a/src/main/java/run/halo/app/model/entity/Photo.java b/src/main/java/run/halo/app/model/entity/Photo.java index 96b42607a..ca874deae 100644 --- a/src/main/java/run/halo/app/model/entity/Photo.java +++ b/src/main/java/run/halo/app/model/entity/Photo.java @@ -11,7 +11,7 @@ import java.util.Date; * Photo entity * * @author ryanwang - * @date : 2019-03-12 + * @date 2019-03-12 */ @Data @Entity 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 c0a51c78d..dbc49ff12 100644 --- a/src/main/java/run/halo/app/model/entity/PostTag.java +++ b/src/main/java/run/halo/app/model/entity/PostTag.java @@ -10,7 +10,7 @@ import java.util.Objects; * Post tag entity. * * @author ryanwang - * @date : 2019-03-12 + * @date 2019-03-12 */ @Data @Entity diff --git a/src/main/java/run/halo/app/model/entity/SheetMeta.java b/src/main/java/run/halo/app/model/entity/SheetMeta.java index 5f3009bb3..fcbad2d69 100644 --- a/src/main/java/run/halo/app/model/entity/SheetMeta.java +++ b/src/main/java/run/halo/app/model/entity/SheetMeta.java @@ -1,5 +1,7 @@ package run.halo.app.model.entity; +import lombok.EqualsAndHashCode; + import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; @@ -12,5 +14,6 @@ import javax.persistence.Entity; */ @Entity(name = "SheetMeta") @DiscriminatorValue("1") +@EqualsAndHashCode(callSuper = true) public class SheetMeta extends BaseMeta { } diff --git a/src/main/java/run/halo/app/model/entity/Tag.java b/src/main/java/run/halo/app/model/entity/Tag.java index 61dd1d5a5..319a32ae2 100644 --- a/src/main/java/run/halo/app/model/entity/Tag.java +++ b/src/main/java/run/halo/app/model/entity/Tag.java @@ -10,7 +10,7 @@ import javax.persistence.*; * Tag entity * * @author ryanwang - * @date : 2019-03-12 + * @date 2019-03-12 */ @Data @Entity diff --git a/src/main/java/run/halo/app/model/entity/User.java b/src/main/java/run/halo/app/model/entity/User.java index 490e6e667..1048dce9f 100644 --- a/src/main/java/run/halo/app/model/entity/User.java +++ b/src/main/java/run/halo/app/model/entity/User.java @@ -12,7 +12,7 @@ import java.util.Date; * User entity * * @author ryanwang - * @date : 2019-03-12 + * @date 2019-03-12 */ @Data @Entity diff --git a/src/main/java/run/halo/app/model/enums/AttachmentType.java b/src/main/java/run/halo/app/model/enums/AttachmentType.java index 0a8143805..d1ac24060 100644 --- a/src/main/java/run/halo/app/model/enums/AttachmentType.java +++ b/src/main/java/run/halo/app/model/enums/AttachmentType.java @@ -4,7 +4,7 @@ package run.halo.app.model.enums; * Attach origin. * * @author ryanwang - * @date : 2019-03-12 + * @date 2019-03-12 */ public enum AttachmentType implements ValueEnum { diff --git a/src/main/java/run/halo/app/model/enums/MigrateType.java b/src/main/java/run/halo/app/model/enums/MigrateType.java index 975e55c51..74a952cc8 100644 --- a/src/main/java/run/halo/app/model/enums/MigrateType.java +++ b/src/main/java/run/halo/app/model/enums/MigrateType.java @@ -4,7 +4,7 @@ package run.halo.app.model.enums; * Migrate type. * * @author ryanwang - * @date : 2019-03-12 + * @date 2019-03-12 */ public enum MigrateType implements ValueEnum { diff --git a/src/main/java/run/halo/app/model/enums/OptionType.java b/src/main/java/run/halo/app/model/enums/OptionType.java index 77cb4a325..5c9872c58 100644 --- a/src/main/java/run/halo/app/model/enums/OptionType.java +++ b/src/main/java/run/halo/app/model/enums/OptionType.java @@ -4,7 +4,7 @@ package run.halo.app.model.enums; * Option Type. * * @author ryanwang - * @date : 2019-12-02 + * @date 2019-12-02 */ public enum OptionType implements ValueEnum { diff --git a/src/main/java/run/halo/app/model/params/AttachmentParam.java b/src/main/java/run/halo/app/model/params/AttachmentParam.java index abc97a2d2..95e4f29da 100644 --- a/src/main/java/run/halo/app/model/params/AttachmentParam.java +++ b/src/main/java/run/halo/app/model/params/AttachmentParam.java @@ -11,7 +11,7 @@ import javax.validation.constraints.Size; * Attachment params. * * @author ryanwang - * @date : 2019/04/20 + * @date 2019/04/20 */ @Data public class AttachmentParam implements InputConverter { diff --git a/src/main/java/run/halo/app/model/params/AttachmentQuery.java b/src/main/java/run/halo/app/model/params/AttachmentQuery.java index e8c71a306..3f96a049b 100644 --- a/src/main/java/run/halo/app/model/params/AttachmentQuery.java +++ b/src/main/java/run/halo/app/model/params/AttachmentQuery.java @@ -7,7 +7,7 @@ import run.halo.app.model.enums.AttachmentType; * Attachment query params. * * @author ryanwang - * @date : 2019/04/18 + * @date 2019/04/18 */ @Data public class AttachmentQuery { diff --git a/src/main/java/run/halo/app/model/params/CommentQuery.java b/src/main/java/run/halo/app/model/params/CommentQuery.java index 159e7d945..4a179f016 100644 --- a/src/main/java/run/halo/app/model/params/CommentQuery.java +++ b/src/main/java/run/halo/app/model/params/CommentQuery.java @@ -7,7 +7,7 @@ import run.halo.app.model.enums.CommentStatus; * Comment query params. * * @author ryanwang - * @date : 2019/04/18 + * @date 2019/04/18 */ @Data public class CommentQuery { diff --git a/src/main/java/run/halo/app/model/params/JournalQuery.java b/src/main/java/run/halo/app/model/params/JournalQuery.java index 0f2dc6ca7..dddbc6f7b 100644 --- a/src/main/java/run/halo/app/model/params/JournalQuery.java +++ b/src/main/java/run/halo/app/model/params/JournalQuery.java @@ -7,7 +7,7 @@ import run.halo.app.model.enums.JournalType; * Journal query params. * * @author ryanwang - * @date : 2019/04/26 + * @date 2019/04/26 */ @Data public class JournalQuery { diff --git a/src/main/java/run/halo/app/model/params/MailParam.java b/src/main/java/run/halo/app/model/params/MailParam.java index 70dae944e..64733d823 100644 --- a/src/main/java/run/halo/app/model/params/MailParam.java +++ b/src/main/java/run/halo/app/model/params/MailParam.java @@ -9,7 +9,7 @@ import javax.validation.constraints.NotBlank; * Journal query params. * * @author ryanwang - * @date : 2019/05/07 + * @date 2019/05/07 */ @Data public class MailParam { diff --git a/src/main/java/run/halo/app/model/params/OptionQuery.java b/src/main/java/run/halo/app/model/params/OptionQuery.java index 9abcb7df8..d1fce4b9e 100644 --- a/src/main/java/run/halo/app/model/params/OptionQuery.java +++ b/src/main/java/run/halo/app/model/params/OptionQuery.java @@ -7,7 +7,7 @@ import run.halo.app.model.enums.OptionType; * Option query params. * * @author ryanwang - * @date : 2019-12-02 + * @date 2019-12-02 */ @Data public class OptionQuery { diff --git a/src/main/java/run/halo/app/model/params/PhotoQuery.java b/src/main/java/run/halo/app/model/params/PhotoQuery.java index 90f36e26c..7c87c8a9e 100644 --- a/src/main/java/run/halo/app/model/params/PhotoQuery.java +++ b/src/main/java/run/halo/app/model/params/PhotoQuery.java @@ -6,7 +6,7 @@ import lombok.Data; * Photo query params. * * @author ryanwang - * @date : 2019/04/25 + * @date 2019/04/25 */ @Data public class PhotoQuery { diff --git a/src/main/java/run/halo/app/model/properties/BlogProperties.java b/src/main/java/run/halo/app/model/properties/BlogProperties.java index 14b496177..ec022f192 100644 --- a/src/main/java/run/halo/app/model/properties/BlogProperties.java +++ b/src/main/java/run/halo/app/model/properties/BlogProperties.java @@ -2,7 +2,7 @@ package run.halo.app.model.properties; /** * @author ryanwang - * @date : 2019-03-17 + * @date 2019-03-17 */ public enum BlogProperties implements PropertyEnum { diff --git a/src/main/java/run/halo/app/model/support/BackupDto.java b/src/main/java/run/halo/app/model/support/BackupDto.java index 9b0d37dce..50bce5e64 100644 --- a/src/main/java/run/halo/app/model/support/BackupDto.java +++ b/src/main/java/run/halo/app/model/support/BackupDto.java @@ -10,7 +10,7 @@ import java.util.Date; * * * @author ryanwang - * @date : 2018/6/4 + * @date 2018/6/4 */ @Data @Deprecated diff --git a/src/main/java/run/halo/app/model/support/HaloConst.java b/src/main/java/run/halo/app/model/support/HaloConst.java index 18bd89d58..c4e34a704 100644 --- a/src/main/java/run/halo/app/model/support/HaloConst.java +++ b/src/main/java/run/halo/app/model/support/HaloConst.java @@ -11,7 +11,7 @@ import java.time.Duration; * * * @author ryanwang - * @date : 2017/12/29 + * @date 2017/12/29 */ public class HaloConst { diff --git a/src/main/java/run/halo/app/model/support/QiNiuPutSet.java b/src/main/java/run/halo/app/model/support/QiNiuPutSet.java index cfa015bf2..7565c71bf 100644 --- a/src/main/java/run/halo/app/model/support/QiNiuPutSet.java +++ b/src/main/java/run/halo/app/model/support/QiNiuPutSet.java @@ -8,7 +8,7 @@ import lombok.Data; * * * @author : Yawn - * @date : 2018/12/3 + * @date 2018/12/3 */ @Data public class QiNiuPutSet { diff --git a/src/main/java/run/halo/app/model/vo/LinkTeamVO.java b/src/main/java/run/halo/app/model/vo/LinkTeamVO.java index 387227136..600d11195 100644 --- a/src/main/java/run/halo/app/model/vo/LinkTeamVO.java +++ b/src/main/java/run/halo/app/model/vo/LinkTeamVO.java @@ -10,7 +10,7 @@ import java.util.List; * Link team vo. * * @author ryanwang - * @date : 2019/3/22 + * @date 2019/3/22 */ @Data @ToString diff --git a/src/main/java/run/halo/app/model/vo/MenuTeamVO.java b/src/main/java/run/halo/app/model/vo/MenuTeamVO.java index 166518a76..ef11c3f78 100644 --- a/src/main/java/run/halo/app/model/vo/MenuTeamVO.java +++ b/src/main/java/run/halo/app/model/vo/MenuTeamVO.java @@ -10,7 +10,7 @@ import java.util.List; * Menu team vo. * * @author ryanwang - * @date : 2019/8/28 + * @date 2019/8/28 */ @Data @ToString diff --git a/src/main/java/run/halo/app/model/vo/MenuVO.java b/src/main/java/run/halo/app/model/vo/MenuVO.java index f0499f9a6..86fb8f894 100644 --- a/src/main/java/run/halo/app/model/vo/MenuVO.java +++ b/src/main/java/run/halo/app/model/vo/MenuVO.java @@ -9,7 +9,7 @@ import java.util.List; /** * @author ryanwang - * @date : 2019-04-07 + * @date 2019-04-07 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/src/main/java/run/halo/app/model/vo/PhotoTeamVO.java b/src/main/java/run/halo/app/model/vo/PhotoTeamVO.java index af06cf70e..8c15ee8bb 100644 --- a/src/main/java/run/halo/app/model/vo/PhotoTeamVO.java +++ b/src/main/java/run/halo/app/model/vo/PhotoTeamVO.java @@ -10,7 +10,7 @@ import java.util.List; * Link team vo. * * @author ryanwang - * @date : 2019/3/22 + * @date 2019/3/22 */ @Data @ToString diff --git a/src/main/java/run/halo/app/repository/JournalCommentRepository.java b/src/main/java/run/halo/app/repository/JournalCommentRepository.java index 44fe68818..99699799b 100644 --- a/src/main/java/run/halo/app/repository/JournalCommentRepository.java +++ b/src/main/java/run/halo/app/repository/JournalCommentRepository.java @@ -32,6 +32,12 @@ public interface JournalCommentRepository extends BaseCommentRepository countByPostIds(@NonNull Collection postIds); + /** + * Finds direct children count by comment ids. + * + * @param commentIds comment ids must not be null. + * @return a list of CommentChildrenCountProjection + */ @Query("select new run.halo.app.model.projection.CommentChildrenCountProjection(count(comment.id), comment.parentId) " + "from JournalComment comment " + "where comment.parentId in ?1 " + diff --git a/src/main/java/run/halo/app/repository/MenuRepository.java b/src/main/java/run/halo/app/repository/MenuRepository.java index 812d256f8..3957d8166 100644 --- a/src/main/java/run/halo/app/repository/MenuRepository.java +++ b/src/main/java/run/halo/app/repository/MenuRepository.java @@ -17,13 +17,39 @@ import java.util.List; */ public interface MenuRepository extends BaseRepository { + /** + * Query if the menu name already exists + * + * @param name name must not be null. + * @return true or false + */ boolean existsByName(@NonNull String name); + /** + * Query if the menu name already exists by id and name. + * + * @param id id must not be null. + * @param name name must not be null. + * @return true or false. + */ boolean existsByIdNotAndName(@NonNull Integer id, @NonNull String name); + /** + * Finds by menu parent id. + * + * @param id parent id must not be null. + * @return a list of menu. + */ List findByParentId(@NonNull Integer id); - List findByTeam(String team, Sort sort); + /** + * Finds by menu team. + * + * @param team team must not be null. + * @param sort sort. + * @return a list of menu + */ + List findByTeam(@NonNull String team, Sort sort); /** * Find all menu teams. diff --git a/src/main/java/run/halo/app/repository/PostCommentRepository.java b/src/main/java/run/halo/app/repository/PostCommentRepository.java index 3e4d7543d..2109e4e71 100644 --- a/src/main/java/run/halo/app/repository/PostCommentRepository.java +++ b/src/main/java/run/halo/app/repository/PostCommentRepository.java @@ -19,6 +19,12 @@ import java.util.List; */ public interface PostCommentRepository extends BaseCommentRepository { + /** + * Count comments by post ids. + * + * @param postIds post id collection must not be null + * @return a list of CommentCountProjection + */ @Query("select new run.halo.app.model.projection.CommentCountProjection(count(comment.id), comment.postId) " + "from PostComment comment " + "where comment.postId in ?1 group by comment.postId") @@ -26,6 +32,12 @@ public interface PostCommentRepository extends BaseCommentRepository countByPostIds(@NonNull Collection postIds); + /** + * Finds direct children count by comment ids. + * + * @param commentIds comment ids must not be null. + * @return a list of CommentChildrenCountProjection + */ @Query("select new run.halo.app.model.projection.CommentChildrenCountProjection(count(comment.id), comment.parentId) " + "from PostComment comment " + "where comment.parentId in ?1 " + diff --git a/src/main/java/run/halo/app/repository/PostRepository.java b/src/main/java/run/halo/app/repository/PostRepository.java index addac430a..6064bf491 100644 --- a/src/main/java/run/halo/app/repository/PostRepository.java +++ b/src/main/java/run/halo/app/repository/PostRepository.java @@ -14,10 +14,20 @@ import run.halo.app.repository.base.BasePostRepository; */ public interface PostRepository extends BasePostRepository, JpaSpecificationExecutor { + /** + * Count all post visits. + * + * @return visits. + */ @Override @Query("select sum(p.visits) from Post p") Long countVisit(); + /** + * Count all post likes. + * + * @return likes. + */ @Override @Query("select sum(p.likes) from Post p") Long countLike(); diff --git a/src/main/java/run/halo/app/repository/SheetCommentRepository.java b/src/main/java/run/halo/app/repository/SheetCommentRepository.java index 2b6d4d32e..4b4083813 100644 --- a/src/main/java/run/halo/app/repository/SheetCommentRepository.java +++ b/src/main/java/run/halo/app/repository/SheetCommentRepository.java @@ -19,13 +19,25 @@ import java.util.List; */ public interface SheetCommentRepository extends BaseCommentRepository { + /** + * Count comments by sheet ids. + * + * @param sheetIds sheet id collection must not be null + * @return a list of CommentCountProjection + */ @Query("select new run.halo.app.model.projection.CommentCountProjection(count(comment.id), comment.postId) " + "from SheetComment comment " + "where comment.postId in ?1 group by comment.postId") @NonNull @Override - List countByPostIds(@NonNull Collection postIds); + List countByPostIds(@NonNull Collection sheetIds); + /** + * Finds direct children count by comment ids. + * + * @param commentIds comment ids must not be null. + * @return a list of CommentChildrenCountProjection + */ @Query("select new run.halo.app.model.projection.CommentChildrenCountProjection(count(comment.id), comment.parentId) " + "from SheetComment comment " + "where comment.parentId in ?1 " + diff --git a/src/main/java/run/halo/app/repository/SheetRepository.java b/src/main/java/run/halo/app/repository/SheetRepository.java index 557300ffc..898964a40 100644 --- a/src/main/java/run/halo/app/repository/SheetRepository.java +++ b/src/main/java/run/halo/app/repository/SheetRepository.java @@ -16,14 +16,31 @@ import java.util.Optional; */ public interface SheetRepository extends BasePostRepository { + /** + * Count all sheet visits. + * + * @return visits. + */ @Override @Query("select sum(p.visits) from Sheet p") Long countVisit(); + /** + * Count all sheet likes. + * + * @return likes. + */ @Override @Query("select sum(p.likes) from Sheet p") Long countLike(); + /** + * Gets sheet by url and status. + * + * @param url url must not be blank + * @param status status must not be null + * @return an optional of sheet. + */ @NonNull @Override Optional getByUrlAndStatus(@NonNull String url, @NonNull PostStatus status); diff --git a/src/main/java/run/halo/app/repository/TagRepository.java b/src/main/java/run/halo/app/repository/TagRepository.java index b25f2433f..3a15fd6e2 100644 --- a/src/main/java/run/halo/app/repository/TagRepository.java +++ b/src/main/java/run/halo/app/repository/TagRepository.java @@ -25,16 +25,16 @@ public interface TagRepository extends BaseRepository { /** * Get tag by slug name * - * @param slugName slug name - * @return Tag + * @param slugName slug name must not be null. + * @return an optional of slug name. */ Optional getBySlugName(@NonNull String slugName); /** * Get tag by name * - * @param name name - * @return Tag + * @param name name must not be null. + * @return an optional of tag */ Optional getByName(@NonNull String name); } diff --git a/src/main/java/run/halo/app/repository/base/BaseCommentRepository.java b/src/main/java/run/halo/app/repository/base/BaseCommentRepository.java index 6782dcbd1..0cbb97f10 100644 --- a/src/main/java/run/halo/app/repository/base/BaseCommentRepository.java +++ b/src/main/java/run/halo/app/repository/base/BaseCommentRepository.java @@ -166,6 +166,12 @@ public interface BaseCommentRepository extends Base Page findAllByPostIdAndStatusAndParentId(Integer postId, CommentStatus status, Long parentId, Pageable pageable); + /** + * Finds direct children count by comment ids. + * + * @param commentIds comment ids must not be null. + * @return a list of CommentChildrenCountProjection + */ @Query("select new run.halo.app.model.projection.CommentChildrenCountProjection(count(comment.id), comment.parentId) " + "from BaseComment comment " + "where comment.parentId in ?1 " + diff --git a/src/main/java/run/halo/app/repository/base/BasePostRepository.java b/src/main/java/run/halo/app/repository/base/BasePostRepository.java index 2407a0303..733034e39 100644 --- a/src/main/java/run/halo/app/repository/base/BasePostRepository.java +++ b/src/main/java/run/halo/app/repository/base/BasePostRepository.java @@ -18,7 +18,7 @@ import java.util.Optional; * Base post repository. * * @author johnniang - * @date 3/22/19 + * @date 2019-03-22 */ public interface BasePostRepository extends BaseRepository { @@ -108,9 +108,22 @@ public interface BasePostRepository extends BaseRepositor */ long countByStatus(@NonNull PostStatus status); - boolean existsByUrl(@NonNull String title); + /** + * Determine if the url exists. + * + * @param url url must not be null. + * @return true or false. + */ + boolean existsByUrl(@NonNull String url); - boolean existsByIdNotAndUrl(@NonNull Integer id, @NonNull String title); + /** + * Determine if the url exists. + * + * @param id post id must not be null. + * @param url url must not be null. + * @return true or false. + */ + boolean existsByIdNotAndUrl(@NonNull Integer id, @NonNull String url); /** * Get post by url @@ -143,7 +156,7 @@ public interface BasePostRepository extends BaseRepositor int updateLikes(@Param("likes") long likes, @Param("postId") @NonNull Integer postId); /** - * Updates post original content/ + * Updates post original content. * * @param content content could be blank but disallow to be null * @param postId post id must not be null @@ -153,10 +166,24 @@ public interface BasePostRepository extends BaseRepositor @Query("update BasePost p set p.originalContent = :content where p.id = :postId") int updateOriginalContent(@Param("content") @NonNull String content, @Param("postId") @NonNull Integer postId); + /** + * Updates post status by post id. + * + * @param status post status must not be null. + * @param postId post id must not be null. + * @return updated rows. + */ @Modifying @Query("update BasePost p set p.status = :status where p.id = :postId") int updateStatus(@Param("status") @NonNull PostStatus status, @Param("postId") @NonNull Integer postId); + /** + * Updates post format content by post id. + * + * @param formatContent format content must not be null. + * @param postId post id must not be null. + * @return updated rows. + */ @Modifying @Query("update BasePost p set p.formatContent = :formatContent where p.id = :postId") int updateFormatContent(@Param("formatContent") @NonNull String formatContent, @Param("postId") @NonNull Integer postId); diff --git a/src/main/java/run/halo/app/security/util/SecurityUtils.java b/src/main/java/run/halo/app/security/util/SecurityUtils.java index 7ab2dfefe..7fb1b54d5 100644 --- a/src/main/java/run/halo/app/security/util/SecurityUtils.java +++ b/src/main/java/run/halo/app/security/util/SecurityUtils.java @@ -15,18 +15,18 @@ public class SecurityUtils { /** * Access token cache prefix. */ - public final static String TOKEN_ACCESS_CACHE_PREFIX = "halo.admin.access.token."; + private final static String TOKEN_ACCESS_CACHE_PREFIX = "halo.admin.access.token."; /** * Refresh token cache prefix. */ - public final static String TOKEN_REFRESH_CACHE_PREFIX = "halo.admin.refresh.token."; + private final static String TOKEN_REFRESH_CACHE_PREFIX = "halo.admin.refresh.token."; - public final static String ACCESS_TOKEN_CACHE_PREFIX = "halo.admin.access_token."; + private final static String ACCESS_TOKEN_CACHE_PREFIX = "halo.admin.access_token."; - public final static String REFRESH_TOKEN_CACHE_PREFIX = "halo.admin.refresh_token."; + private final static String REFRESH_TOKEN_CACHE_PREFIX = "halo.admin.refresh_token."; - public final static String TEMP_TOKEN_CACHE_PREFIX = "halo.temp.token."; + private final static String TEMP_TOKEN_CACHE_PREFIX = "halo.temp.token."; private SecurityUtils() { diff --git a/src/main/java/run/halo/app/service/AttachmentService.java b/src/main/java/run/halo/app/service/AttachmentService.java index a62a93c0e..a57b360f3 100644 --- a/src/main/java/run/halo/app/service/AttachmentService.java +++ b/src/main/java/run/halo/app/service/AttachmentService.java @@ -19,14 +19,15 @@ import java.util.List; * Attachment service. * * @author johnniang - * @date : 2019-03-14 + * @date 2019-03-14 */ public interface AttachmentService extends CrudService { /** * Pages attachment output dtos. * - * @param pageable page info must not be null + * @param pageable page info must not be null + * @param attachmentQuery attachment query param. * @return a page of attachment output dto */ @NonNull diff --git a/src/main/java/run/halo/app/service/CategoryService.java b/src/main/java/run/halo/app/service/CategoryService.java index 92423d437..cff63fcfd 100755 --- a/src/main/java/run/halo/app/service/CategoryService.java +++ b/src/main/java/run/halo/app/service/CategoryService.java @@ -16,7 +16,7 @@ import java.util.List; * * @author johnniang * @author ryanwang - * @date : 2019-03-14 + * @date 2019-03-14 */ @Transactional(readOnly = true) public interface CategoryService extends CrudService { diff --git a/src/main/java/run/halo/app/service/base/BasePostService.java b/src/main/java/run/halo/app/service/base/BasePostService.java index 6c737188f..e81cda626 100644 --- a/src/main/java/run/halo/app/service/base/BasePostService.java +++ b/src/main/java/run/halo/app/service/base/BasePostService.java @@ -195,24 +195,66 @@ public interface BasePostService extends CrudService convertToMinimal(@Nullable List posts); + /** + * Convert page of POST to minimal dto of page. + * + * @param postPage postPage must not be null. + * @return a page of minimal dto. + */ @NonNull Page convertToMinimal(@NonNull Page postPage); + /** + * Convert POST to simple dto. + * + * @param post post must not be null. + * @return simple dto. + */ @NonNull BasePostSimpleDTO convertToSimple(@NonNull POST post); + /** + * Convert list of POST to list of simple dto. + * + * @param posts posts must not be null. + * @return a list of simple dto. + */ @NonNull List convertToSimple(@Nullable List posts); + /** + * Convert page of POST to page of simple dto. + * + * @param postPage postPage must not be null. + * @return a page of simple dto. + */ @NonNull Page convertToSimple(@NonNull Page postPage); + /** + * Convert POST to detail dto. + * + * @param post post must not be null. + * @return detail dto. + */ @NonNull BasePostDetailDTO convertToDetail(@NonNull POST post); diff --git a/src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java b/src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java index ed19dcb83..faa6f19f7 100644 --- a/src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; * * @author ryanwang * @author johnniang - * @date : 2019-03-14 + * @date 2019-03-14 */ @Slf4j @Service 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 b8a216c23..6bb5ee7ff 100644 --- a/src/main/java/run/halo/app/service/impl/BaseCommentServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/BaseCommentServiceImpl.java @@ -15,7 +15,6 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import run.halo.app.event.comment.CommentNewEvent; -import run.halo.app.event.comment.CommentPassEvent; import run.halo.app.event.comment.CommentReplyEvent; import run.halo.app.exception.BadRequestException; import run.halo.app.exception.NotFoundException; @@ -342,14 +341,7 @@ public abstract class BaseCommentServiceImpl extend comment.setStatus(status); // Update comment - COMMENT updatedComment = update(comment); - - if (CommentStatus.PUBLISHED.equals(status)) { - // Pass a comment - eventPublisher.publishEvent(new CommentPassEvent(this, commentId)); - } - - return updatedComment; + return update(comment); } @Override diff --git a/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java b/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java index 9f44e4f70..ef7028d9a 100644 --- a/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; * * @author ryanwang * @author johnniang - * @date : 2019-03-14 + * @date 2019-03-14 */ @Slf4j @Service diff --git a/src/main/java/run/halo/app/utils/HaloUtils.java b/src/main/java/run/halo/app/utils/HaloUtils.java index 86ae4ab31..711f4e88b 100755 --- a/src/main/java/run/halo/app/utils/HaloUtils.java +++ b/src/main/java/run/halo/app/utils/HaloUtils.java @@ -17,7 +17,7 @@ import static run.halo.app.model.support.HaloConst.FILE_SEPARATOR; * * @author ryanwang * @author johnniang - * @date : 2017/12/22 + * @date 2017/12/22 */ @Slf4j public class HaloUtils { diff --git a/src/main/java/run/halo/app/utils/MarkdownUtils.java b/src/main/java/run/halo/app/utils/MarkdownUtils.java index 5be2edecc..3bcd6fc5d 100644 --- a/src/main/java/run/halo/app/utils/MarkdownUtils.java +++ b/src/main/java/run/halo/app/utils/MarkdownUtils.java @@ -32,7 +32,7 @@ import java.util.Map; * Markdown utils. * * @author ryanwang - * @date : 2019/06/27 + * @date 2019/06/27 */ public class MarkdownUtils { diff --git a/src/main/resources/templates/common/mail_template/mail_attach.ftl b/src/main/resources/templates/common/mail_template/mail_attach.ftl deleted file mode 100644 index 110c96f6a..000000000 --- a/src/main/resources/templates/common/mail_template/mail_attach.ftl +++ /dev/null @@ -1,15 +0,0 @@ -
-
-
-

- 您有新的备份，请按需下载附件。 -

-
- 备份详情：
- 文件名：${fileName}
- 备份时间：${createAt?string("yyyy-MM-dd HH:mm")}
- 文件大小：${size} -
-
-
-
\ No newline at end of file diff --git a/src/main/resources/templates/common/mail_template/mail_passed.ftl b/src/main/resources/templates/common/mail_template/mail_passed.ftl deleted file mode 100644 index fa93eea63..000000000 --- a/src/main/resources/templates/common/mail_template/mail_passed.ftl +++ /dev/null @@ -1,21 +0,0 @@ -
-
-
-

- 留言审核通过通知 -

-
-

您在${blogTitle}《${pageName}》发表的评论：

-

${commentContent}

-

已通过管理员审核并显示。 -
您可在此查看您的评论： - 前往查看 -

-

(此邮件由系统自动发出, 请勿回复。)

-
-

邮件发自： - ${author} -

-
-
-
\ No newline at end of file diff --git a/src/test/java/run/halo/app/utils/DemoUtilTest.java b/src/test/java/run/halo/app/utils/DemoUtilTest.java deleted file mode 100644 index cb7bd4db5..000000000 --- a/src/test/java/run/halo/app/utils/DemoUtilTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package run.halo.app.utils; - -import org.junit.Test; - -/** - * @author ryanwang - * @date : 2017/12/26 - * @version : 1.0 - * description: - */ -public class DemoUtilTest { - - @Test - public void testZip(){ - //ZipUtils.unZip("/Users/ryan0up/Desktop/adminlog.html.zip","/Users/ryan0up/Desktop/"); - } -}