diff --git a/src/main/java/cc/ryanc/halo/model/vo/CommentVO.java b/src/main/java/cc/ryanc/halo/model/vo/CommentListVO.java similarity index 86% rename from src/main/java/cc/ryanc/halo/model/vo/CommentVO.java rename to src/main/java/cc/ryanc/halo/model/vo/CommentListVO.java index 7f012a1c2..96ceeb1c7 100644 --- a/src/main/java/cc/ryanc/halo/model/vo/CommentVO.java +++ b/src/main/java/cc/ryanc/halo/model/vo/CommentListVO.java @@ -14,7 +14,7 @@ import lombok.ToString; @Data @ToString @EqualsAndHashCode(callSuper = true) -public class CommentVO extends CommentOutputDTO { +public class CommentListVO extends CommentOutputDTO { private PostMinimalOutputDTO post; } diff --git a/src/main/java/cc/ryanc/halo/service/CommentService.java b/src/main/java/cc/ryanc/halo/service/CommentService.java index 46a4b5999..5f518df85 100644 --- a/src/main/java/cc/ryanc/halo/service/CommentService.java +++ b/src/main/java/cc/ryanc/halo/service/CommentService.java @@ -3,7 +3,7 @@ package cc.ryanc.halo.service; import cc.ryanc.halo.model.entity.Comment; import cc.ryanc.halo.model.enums.CommentStatus; import cc.ryanc.halo.model.params.CommentParam; -import cc.ryanc.halo.model.vo.CommentVO; +import cc.ryanc.halo.model.vo.CommentListVO; import cc.ryanc.halo.service.base.CrudService; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -36,7 +36,7 @@ public interface CommentService extends CrudService { * @return a page of comments */ @NonNull - Page pageLatest(int top); + Page pageLatest(int top); /** * Pages comments. @@ -46,7 +46,7 @@ public interface CommentService extends CrudService { * @return a page of comment */ @NonNull - Page pageBy(@NonNull CommentStatus status, @NonNull Pageable pageable); + Page pageBy(@NonNull CommentStatus status, @NonNull Pageable pageable); /** * Lists comments by post id. diff --git a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java index 76235ecc4..397a9ff54 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java @@ -8,7 +8,7 @@ import cc.ryanc.halo.model.enums.BlogProperties; import cc.ryanc.halo.model.enums.CommentStatus; import cc.ryanc.halo.model.params.CommentParam; import cc.ryanc.halo.model.projection.CommentCountProjection; -import cc.ryanc.halo.model.vo.CommentVO; +import cc.ryanc.halo.model.vo.CommentListVO; import cc.ryanc.halo.repository.CommentRepository; import cc.ryanc.halo.repository.PostRepository; import cc.ryanc.halo.service.CommentService; @@ -59,7 +59,7 @@ public class CommentServiceImpl extends AbstractCrudService imple } @Override - public Page pageLatest(int top) { + public Page pageLatest(int top) { Assert.isTrue(top > 0, "Top number must not be less than 0"); // Build page request @@ -69,7 +69,7 @@ public class CommentServiceImpl extends AbstractCrudService imple } @Override - public Page pageBy(CommentStatus status, Pageable pageable) { + public Page pageBy(CommentStatus status, Pageable pageable) { Assert.notNull(status, "Comment status must not be null"); Assert.notNull(pageable, "Page info must not be null"); @@ -152,7 +152,7 @@ public class CommentServiceImpl extends AbstractCrudService imple * @return a page of comment vo */ @NonNull - private Page convertBy(@NonNull Page commentPage) { + private Page convertBy(@NonNull Page commentPage) { Assert.notNull(commentPage, "Comment page must not be null"); return new PageImpl<>(convertBy(commentPage.getContent()), commentPage.getPageable(), commentPage.getTotalElements()); @@ -165,7 +165,7 @@ public class CommentServiceImpl extends AbstractCrudService imple * @return a list of comment vo */ @NonNull - private List convertBy(@Nullable List comments) { + private List convertBy(@Nullable List comments) { if (CollectionUtils.isEmpty(comments)) { return Collections.emptyList(); } @@ -178,12 +178,12 @@ public class CommentServiceImpl extends AbstractCrudService imple return comments.stream().map(comment -> { // Convert to vo - CommentVO commentVO = new CommentVO().convertFrom(comment); + CommentListVO commentListVO = new CommentListVO().convertFrom(comment); // Get post and set to the vo - commentVO.setPost(new PostMinimalOutputDTO().convertFrom(postMap.get(comment.getPostId()))); + commentListVO.setPost(new PostMinimalOutputDTO().convertFrom(postMap.get(comment.getPostId()))); - return commentVO; + return commentListVO; }).collect(Collectors.toList()); } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/api/CommentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/api/CommentController.java index c34905ccc..0e29c6e98 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/api/CommentController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/api/CommentController.java @@ -3,7 +3,7 @@ package cc.ryanc.halo.web.controller.admin.api; import cc.ryanc.halo.model.dto.CommentOutputDTO; import cc.ryanc.halo.model.enums.CommentStatus; import cc.ryanc.halo.model.params.CommentParam; -import cc.ryanc.halo.model.vo.CommentVO; +import cc.ryanc.halo.model.vo.CommentListVO; import cc.ryanc.halo.service.CommentService; import cc.ryanc.halo.service.OptionService; import cc.ryanc.halo.service.PostService; @@ -45,13 +45,13 @@ public class CommentController { @GetMapping("latest") @ApiOperation("Pages latest comments") - public List pageLatest(@RequestParam(name = "top", defaultValue = "10") int top) { + public List pageLatest(@RequestParam(name = "top", defaultValue = "10") int top) { return commentService.pageLatest(top).getContent(); } @GetMapping("status/{status}") - public Page pageBy(@PageableDefault(sort = "updateTime", direction = DESC) Pageable pageable, - @PathVariable("status") CommentStatus status) { + public Page pageBy(@PageableDefault(sort = "updateTime", direction = DESC) Pageable pageable, + @PathVariable("status") CommentStatus status) { return commentService.pageBy(status, pageable); } @@ -59,4 +59,5 @@ public class CommentController { public CommentOutputDTO createBy(@Valid @RequestBody CommentParam commentParam, HttpServletRequest request) { return new CommentOutputDTO().convertFrom(commentService.createBy(commentParam, request)); } + }