From 36c8a21af4ff25c3a31d4e5466a35f9aeab79b5d Mon Sep 17 00:00:00 2001 From: johnniang Date: Tue, 23 Apr 2019 17:49:40 +0800 Subject: [PATCH] Rename output dto to dto --- gradle/wrapper/gradle-wrapper.properties | 4 +-- ...hmentOutputDTO.java => AttachmentDTO.java} | 2 +- ...ategoryOutputDTO.java => CategoryDTO.java} | 4 +-- ...{CommentOutputDTO.java => CommentDTO.java} | 5 +--- .../{CountOutputDTO.java => CountDTO.java} | 2 +- ...{GalleryOutputDTO.java => GalleryDTO.java} | 4 +-- .../dto/{LinkOutputDTO.java => LinkDTO.java} | 4 +-- .../dto/{LogOutputDTO.java => LogDTO.java} | 5 +--- .../dto/{MenuOutputDTO.java => MenuDTO.java} | 4 +-- .../{OptionOutputDTO.java => OptionDTO.java} | 2 +- .../dto/{TagOutputDTO.java => TagDTO.java} | 4 +-- ...utputDTO.java => TagWithPostCountDTO.java} | 2 +- .../dto/{UserOutputDTO.java => UserDTO.java} | 4 +-- .../run/halo/app/model/vo/CategoryVO.java | 5 ++-- .../java/run/halo/app/model/vo/CommentVO.java | 4 +-- .../app/model/vo/CommentWithParentVO.java | 5 ++-- .../halo/app/model/vo/CommentWithPostVO.java | 4 +-- .../run/halo/app/model/vo/GalleryTeamVO.java | 5 ++-- .../run/halo/app/model/vo/LinkTeamVO.java | 5 ++-- .../java/run/halo/app/model/vo/MenuVO.java | 4 +-- .../run/halo/app/model/vo/PostListVO.java | 8 +++--- .../halo/app/service/AttachmentService.java | 6 ++-- .../run/halo/app/service/GalleryService.java | 6 ++-- .../run/halo/app/service/LinkService.java | 5 ++-- .../java/run/halo/app/service/LogService.java | 5 ++-- .../run/halo/app/service/MenuService.java | 4 +-- .../run/halo/app/service/OptionService.java | 4 +-- .../run/halo/app/service/PostTagService.java | 4 +-- .../java/run/halo/app/service/TagService.java | 4 +-- .../service/impl/AttachmentServiceImpl.java | 21 +++++++------- .../app/service/impl/GalleryServiceImpl.java | 16 +++++------ .../app/service/impl/LinkServiceImpl.java | 17 +++++------ .../halo/app/service/impl/LogServiceImpl.java | 8 ++---- .../app/service/impl/MenuServiceImpl.java | 8 +++--- .../app/service/impl/OptionServiceImpl.java | 6 ++-- .../app/service/impl/PostServiceImpl.java | 8 +++--- .../app/service/impl/PostTagServiceImpl.java | 10 ++----- .../halo/app/service/impl/TagServiceImpl.java | 10 ++----- .../controller/admin/api/AdminController.java | 28 +++++++++---------- .../admin/api/AttachmentController.java | 26 ++++++++--------- .../admin/api/CategoryController.java | 12 ++++---- .../admin/api/CommentController.java | 16 +++++------ .../admin/api/GalleryController.java | 12 ++++---- .../controller/admin/api/LinkController.java | 20 ++++++------- .../controller/admin/api/LogController.java | 6 ++-- .../controller/admin/api/MenuController.java | 18 ++++++------ .../admin/api/OptionController.java | 4 +-- .../controller/admin/api/TagController.java | 27 ++++++++---------- .../controller/admin/api/UserController.java | 14 ++++------ .../content/api/CommentController.java | 6 ++-- .../content/api/MenuController.java | 5 ++-- .../content/api/OptionController.java | 4 +-- .../controller/content/api/TagController.java | 11 ++------ .../content/api/UserController.java | 6 ++-- 54 files changed, 193 insertions(+), 250 deletions(-) rename src/main/java/run/halo/app/model/dto/{AttachmentOutputDTO.java => AttachmentDTO.java} (87%) rename src/main/java/run/halo/app/model/dto/{CategoryOutputDTO.java => CategoryDTO.java} (67%) rename src/main/java/run/halo/app/model/dto/{CommentOutputDTO.java => CommentDTO.java} (75%) rename src/main/java/run/halo/app/model/dto/{CountOutputDTO.java => CountDTO.java} (92%) rename src/main/java/run/halo/app/model/dto/{GalleryOutputDTO.java => GalleryDTO.java} (65%) rename src/main/java/run/halo/app/model/dto/{LinkOutputDTO.java => LinkDTO.java} (69%) rename src/main/java/run/halo/app/model/dto/{LogOutputDTO.java => LogDTO.java} (71%) rename src/main/java/run/halo/app/model/dto/{MenuOutputDTO.java => MenuDTO.java} (70%) rename src/main/java/run/halo/app/model/dto/{OptionOutputDTO.java => OptionDTO.java} (77%) rename src/main/java/run/halo/app/model/dto/{TagOutputDTO.java => TagDTO.java} (64%) rename src/main/java/run/halo/app/model/dto/{TagWithCountOutputDTO.java => TagWithPostCountDTO.java} (75%) rename src/main/java/run/halo/app/model/dto/{UserOutputDTO.java => UserDTO.java} (77%) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 67fab0b3b..56c603f58 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 08 10:50:45 CST 2019 +#Tue Apr 23 17:12:17 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip diff --git a/src/main/java/run/halo/app/model/dto/AttachmentOutputDTO.java b/src/main/java/run/halo/app/model/dto/AttachmentDTO.java similarity index 87% rename from src/main/java/run/halo/app/model/dto/AttachmentOutputDTO.java rename to src/main/java/run/halo/app/model/dto/AttachmentDTO.java index 655f65a79..c65de8bee 100644 --- a/src/main/java/run/halo/app/model/dto/AttachmentOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/AttachmentDTO.java @@ -14,7 +14,7 @@ import java.util.Date; * @date 3/21/19 */ @Data -public class AttachmentOutputDTO implements OutputConverter { +public class AttachmentDTO implements OutputConverter { private Integer id; diff --git a/src/main/java/run/halo/app/model/dto/CategoryOutputDTO.java b/src/main/java/run/halo/app/model/dto/CategoryDTO.java similarity index 67% rename from src/main/java/run/halo/app/model/dto/CategoryOutputDTO.java rename to src/main/java/run/halo/app/model/dto/CategoryDTO.java index 5a314203d..0c0afeba7 100644 --- a/src/main/java/run/halo/app/model/dto/CategoryOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/CategoryDTO.java @@ -3,8 +3,6 @@ package run.halo.app.model.dto; import run.halo.app.model.dto.base.OutputConverter; import run.halo.app.model.entity.Category; import lombok.Data; -import run.halo.app.model.dto.base.OutputConverter; -import run.halo.app.model.entity.Category; /** * Category output dto. @@ -13,7 +11,7 @@ import run.halo.app.model.entity.Category; * @date 3/19/19 */ @Data -public class CategoryOutputDTO implements OutputConverter { +public class CategoryDTO implements OutputConverter { private Integer id; diff --git a/src/main/java/run/halo/app/model/dto/CommentOutputDTO.java b/src/main/java/run/halo/app/model/dto/CommentDTO.java similarity index 75% rename from src/main/java/run/halo/app/model/dto/CommentOutputDTO.java rename to src/main/java/run/halo/app/model/dto/CommentDTO.java index 39fc7c80d..b0b4d9ba0 100644 --- a/src/main/java/run/halo/app/model/dto/CommentOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/CommentDTO.java @@ -6,9 +6,6 @@ import run.halo.app.model.enums.CommentStatus; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import run.halo.app.model.dto.base.OutputConverter; -import run.halo.app.model.entity.Comment; -import run.halo.app.model.enums.CommentStatus; import java.util.Date; @@ -20,7 +17,7 @@ import java.util.Date; @Data @ToString @EqualsAndHashCode -public class CommentOutputDTO implements OutputConverter { +public class CommentDTO implements OutputConverter { private Long id; diff --git a/src/main/java/run/halo/app/model/dto/CountOutputDTO.java b/src/main/java/run/halo/app/model/dto/CountDTO.java similarity index 92% rename from src/main/java/run/halo/app/model/dto/CountOutputDTO.java rename to src/main/java/run/halo/app/model/dto/CountDTO.java index c35604164..8d7b0d93d 100644 --- a/src/main/java/run/halo/app/model/dto/CountOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/CountDTO.java @@ -9,7 +9,7 @@ import lombok.Data; * @date 3/19/19 */ @Data -public class CountOutputDTO { +public class CountDTO { private long postCount; diff --git a/src/main/java/run/halo/app/model/dto/GalleryOutputDTO.java b/src/main/java/run/halo/app/model/dto/GalleryDTO.java similarity index 65% rename from src/main/java/run/halo/app/model/dto/GalleryOutputDTO.java rename to src/main/java/run/halo/app/model/dto/GalleryDTO.java index cfa28b06f..37ec4275f 100644 --- a/src/main/java/run/halo/app/model/dto/GalleryOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/GalleryDTO.java @@ -3,15 +3,13 @@ package run.halo.app.model.dto; import run.halo.app.model.dto.base.OutputConverter; import run.halo.app.model.entity.Gallery; import lombok.Data; -import run.halo.app.model.dto.base.OutputConverter; -import run.halo.app.model.entity.Gallery; /** * @author : RYAN0UP * @date : 2019/3/21 */ @Data -public class GalleryOutputDTO implements OutputConverter { +public class GalleryDTO implements OutputConverter { private Integer id; diff --git a/src/main/java/run/halo/app/model/dto/LinkOutputDTO.java b/src/main/java/run/halo/app/model/dto/LinkDTO.java similarity index 69% rename from src/main/java/run/halo/app/model/dto/LinkOutputDTO.java rename to src/main/java/run/halo/app/model/dto/LinkDTO.java index 863fa7f4e..8cebd36d0 100644 --- a/src/main/java/run/halo/app/model/dto/LinkOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/LinkDTO.java @@ -3,8 +3,6 @@ package run.halo.app.model.dto; import run.halo.app.model.dto.base.OutputConverter; import run.halo.app.model.entity.Link; import lombok.Data; -import run.halo.app.model.dto.base.OutputConverter; -import run.halo.app.model.entity.Link; /** * Link output dto. @@ -13,7 +11,7 @@ import run.halo.app.model.entity.Link; * @date : 2019/3/21 */ @Data -public class LinkOutputDTO implements OutputConverter { +public class LinkDTO implements OutputConverter { private Integer id; diff --git a/src/main/java/run/halo/app/model/dto/LogOutputDTO.java b/src/main/java/run/halo/app/model/dto/LogDTO.java similarity index 71% rename from src/main/java/run/halo/app/model/dto/LogOutputDTO.java rename to src/main/java/run/halo/app/model/dto/LogDTO.java index a9deb1e25..42a90a6ce 100644 --- a/src/main/java/run/halo/app/model/dto/LogOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/LogDTO.java @@ -6,9 +6,6 @@ import run.halo.app.model.enums.LogType; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import run.halo.app.model.dto.base.OutputConverter; -import run.halo.app.model.entity.Log; -import run.halo.app.model.enums.LogType; import java.util.Date; @@ -19,7 +16,7 @@ import java.util.Date; @Data @ToString @EqualsAndHashCode -public class LogOutputDTO implements OutputConverter { +public class LogDTO implements OutputConverter { private Long id; diff --git a/src/main/java/run/halo/app/model/dto/MenuOutputDTO.java b/src/main/java/run/halo/app/model/dto/MenuDTO.java similarity index 70% rename from src/main/java/run/halo/app/model/dto/MenuOutputDTO.java rename to src/main/java/run/halo/app/model/dto/MenuDTO.java index bd7923209..3a2e14b88 100644 --- a/src/main/java/run/halo/app/model/dto/MenuOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/MenuDTO.java @@ -3,8 +3,6 @@ package run.halo.app.model.dto; import run.halo.app.model.dto.base.OutputConverter; import run.halo.app.model.entity.Menu; import lombok.Data; -import run.halo.app.model.dto.base.OutputConverter; -import run.halo.app.model.entity.Menu; /** * Menu output dto. @@ -13,7 +11,7 @@ import run.halo.app.model.entity.Menu; * @date 4/3/19 */ @Data -public class MenuOutputDTO implements OutputConverter { +public class MenuDTO implements OutputConverter { private Integer id; diff --git a/src/main/java/run/halo/app/model/dto/OptionOutputDTO.java b/src/main/java/run/halo/app/model/dto/OptionDTO.java similarity index 77% rename from src/main/java/run/halo/app/model/dto/OptionOutputDTO.java rename to src/main/java/run/halo/app/model/dto/OptionDTO.java index a5ad88d2f..93b905f42 100644 --- a/src/main/java/run/halo/app/model/dto/OptionOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/OptionDTO.java @@ -11,7 +11,7 @@ import run.halo.app.model.entity.Option; * @date 3/20/19 */ @Data -public class OptionOutputDTO implements OutputConverter { +public class OptionDTO implements OutputConverter { private String key; diff --git a/src/main/java/run/halo/app/model/dto/TagOutputDTO.java b/src/main/java/run/halo/app/model/dto/TagDTO.java similarity index 64% rename from src/main/java/run/halo/app/model/dto/TagOutputDTO.java rename to src/main/java/run/halo/app/model/dto/TagDTO.java index 8bf36d6f2..d74b65c40 100644 --- a/src/main/java/run/halo/app/model/dto/TagOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/TagDTO.java @@ -3,8 +3,6 @@ package run.halo.app.model.dto; import run.halo.app.model.dto.base.OutputConverter; import run.halo.app.model.entity.Tag; import lombok.Data; -import run.halo.app.model.dto.base.OutputConverter; -import run.halo.app.model.entity.Tag; /** * Tag output dto. @@ -13,7 +11,7 @@ import run.halo.app.model.entity.Tag; * @date 3/19/19 */ @Data -public class TagOutputDTO implements OutputConverter { +public class TagDTO implements OutputConverter { private Integer id; diff --git a/src/main/java/run/halo/app/model/dto/TagWithCountOutputDTO.java b/src/main/java/run/halo/app/model/dto/TagWithPostCountDTO.java similarity index 75% rename from src/main/java/run/halo/app/model/dto/TagWithCountOutputDTO.java rename to src/main/java/run/halo/app/model/dto/TagWithPostCountDTO.java index 6265ed2cb..9673a8c68 100644 --- a/src/main/java/run/halo/app/model/dto/TagWithCountOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/TagWithPostCountDTO.java @@ -9,7 +9,7 @@ import lombok.Data; * @date 3/20/19 */ @Data -public class TagWithCountOutputDTO extends TagOutputDTO { +public class TagWithPostCountDTO extends TagDTO { private Long postCount; diff --git a/src/main/java/run/halo/app/model/dto/UserOutputDTO.java b/src/main/java/run/halo/app/model/dto/UserDTO.java similarity index 77% rename from src/main/java/run/halo/app/model/dto/UserOutputDTO.java rename to src/main/java/run/halo/app/model/dto/UserDTO.java index a1c49fe96..9e1d7f3eb 100644 --- a/src/main/java/run/halo/app/model/dto/UserOutputDTO.java +++ b/src/main/java/run/halo/app/model/dto/UserDTO.java @@ -5,8 +5,6 @@ import run.halo.app.model.entity.User; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import run.halo.app.model.dto.base.OutputConverter; -import run.halo.app.model.entity.User; import java.util.Date; @@ -19,7 +17,7 @@ import java.util.Date; @Data @ToString @EqualsAndHashCode -public class UserOutputDTO implements OutputConverter { +public class UserDTO implements OutputConverter { private Integer id; diff --git a/src/main/java/run/halo/app/model/vo/CategoryVO.java b/src/main/java/run/halo/app/model/vo/CategoryVO.java index 4916970a8..8a4f8b9f8 100644 --- a/src/main/java/run/halo/app/model/vo/CategoryVO.java +++ b/src/main/java/run/halo/app/model/vo/CategoryVO.java @@ -1,8 +1,7 @@ package run.halo.app.model.vo; -import run.halo.app.model.dto.CategoryOutputDTO; +import run.halo.app.model.dto.CategoryDTO; import lombok.Data; -import run.halo.app.model.dto.CategoryOutputDTO; import java.util.List; @@ -13,7 +12,7 @@ import java.util.List; * @date 3/21/19 */ @Data -public class CategoryVO extends CategoryOutputDTO { +public class CategoryVO extends CategoryDTO { private List children; } diff --git a/src/main/java/run/halo/app/model/vo/CommentVO.java b/src/main/java/run/halo/app/model/vo/CommentVO.java index 3ba9fd7c4..210885cae 100644 --- a/src/main/java/run/halo/app/model/vo/CommentVO.java +++ b/src/main/java/run/halo/app/model/vo/CommentVO.java @@ -1,6 +1,6 @@ package run.halo.app.model.vo; -import run.halo.app.model.dto.CommentOutputDTO; +import run.halo.app.model.dto.CommentDTO; import lombok.Data; import lombok.ToString; @@ -14,7 +14,7 @@ import java.util.List; */ @Data @ToString(callSuper = true) -public class CommentVO extends CommentOutputDTO { +public class CommentVO extends CommentDTO { private List children; diff --git a/src/main/java/run/halo/app/model/vo/CommentWithParentVO.java b/src/main/java/run/halo/app/model/vo/CommentWithParentVO.java index 64397ab3f..1c10bdbf8 100644 --- a/src/main/java/run/halo/app/model/vo/CommentWithParentVO.java +++ b/src/main/java/run/halo/app/model/vo/CommentWithParentVO.java @@ -1,11 +1,10 @@ package run.halo.app.model.vo; -import run.halo.app.model.dto.CommentOutputDTO; +import run.halo.app.model.dto.CommentDTO; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.extern.slf4j.Slf4j; -import run.halo.app.model.dto.CommentOutputDTO; /** * Comment list with parent comment vo. @@ -17,7 +16,7 @@ import run.halo.app.model.dto.CommentOutputDTO; @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) @Slf4j -public class CommentWithParentVO extends CommentOutputDTO implements Cloneable { +public class CommentWithParentVO extends CommentDTO implements Cloneable { /** * Parent comment. diff --git a/src/main/java/run/halo/app/model/vo/CommentWithPostVO.java b/src/main/java/run/halo/app/model/vo/CommentWithPostVO.java index 4b1daba0f..788a1cb7d 100644 --- a/src/main/java/run/halo/app/model/vo/CommentWithPostVO.java +++ b/src/main/java/run/halo/app/model/vo/CommentWithPostVO.java @@ -1,6 +1,6 @@ package run.halo.app.model.vo; -import run.halo.app.model.dto.CommentOutputDTO; +import run.halo.app.model.dto.CommentDTO; import run.halo.app.model.dto.post.PostMinimalOutputDTO; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,7 +14,7 @@ import lombok.ToString; @Data @ToString @EqualsAndHashCode(callSuper = true) -public class CommentWithPostVO extends CommentOutputDTO { +public class CommentWithPostVO extends CommentDTO { private PostMinimalOutputDTO post; } diff --git a/src/main/java/run/halo/app/model/vo/GalleryTeamVO.java b/src/main/java/run/halo/app/model/vo/GalleryTeamVO.java index 83c28ebf5..d327fc185 100644 --- a/src/main/java/run/halo/app/model/vo/GalleryTeamVO.java +++ b/src/main/java/run/halo/app/model/vo/GalleryTeamVO.java @@ -2,8 +2,7 @@ package run.halo.app.model.vo; import lombok.Data; import lombok.ToString; -import run.halo.app.model.dto.GalleryOutputDTO; -import run.halo.app.model.dto.LinkOutputDTO; +import run.halo.app.model.dto.GalleryDTO; import java.util.List; @@ -19,5 +18,5 @@ public class GalleryTeamVO { private String team; - private List galleries; + private List galleries; } 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 ad65ebfd6..55bc0aeba 100644 --- a/src/main/java/run/halo/app/model/vo/LinkTeamVO.java +++ b/src/main/java/run/halo/app/model/vo/LinkTeamVO.java @@ -1,9 +1,8 @@ package run.halo.app.model.vo; -import run.halo.app.model.dto.LinkOutputDTO; +import run.halo.app.model.dto.LinkDTO; import lombok.Data; import lombok.ToString; -import run.halo.app.model.dto.LinkOutputDTO; import java.util.List; @@ -19,5 +18,5 @@ public class LinkTeamVO { private String team; - private List links; + private List links; } 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 2e80a0257..969612ea1 100644 --- a/src/main/java/run/halo/app/model/vo/MenuVO.java +++ b/src/main/java/run/halo/app/model/vo/MenuVO.java @@ -1,7 +1,7 @@ package run.halo.app.model.vo; import lombok.Data; -import run.halo.app.model.dto.MenuOutputDTO; +import run.halo.app.model.dto.MenuDTO; import java.util.List; @@ -10,7 +10,7 @@ import java.util.List; * @date : 2019-04-07 */ @Data -public class MenuVO extends MenuOutputDTO { +public class MenuVO extends MenuDTO { private List children; } diff --git a/src/main/java/run/halo/app/model/vo/PostListVO.java b/src/main/java/run/halo/app/model/vo/PostListVO.java index d34d8c7fb..aa6fed4ba 100644 --- a/src/main/java/run/halo/app/model/vo/PostListVO.java +++ b/src/main/java/run/halo/app/model/vo/PostListVO.java @@ -1,7 +1,7 @@ package run.halo.app.model.vo; -import run.halo.app.model.dto.CategoryOutputDTO; -import run.halo.app.model.dto.TagOutputDTO; +import run.halo.app.model.dto.CategoryDTO; +import run.halo.app.model.dto.TagDTO; import run.halo.app.model.dto.post.PostSimpleOutputDTO; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,8 +20,8 @@ public class PostListVO extends PostSimpleOutputDTO { private Long commentCount; - private List tags; + private List tags; - private List categories; + private List categories; } diff --git a/src/main/java/run/halo/app/service/AttachmentService.java b/src/main/java/run/halo/app/service/AttachmentService.java index a3eb7055d..609a0eeae 100644 --- a/src/main/java/run/halo/app/service/AttachmentService.java +++ b/src/main/java/run/halo/app/service/AttachmentService.java @@ -5,7 +5,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.lang.NonNull; import org.springframework.web.multipart.MultipartFile; import run.halo.app.exception.FileOperationException; -import run.halo.app.model.dto.AttachmentOutputDTO; +import run.halo.app.model.dto.AttachmentDTO; import run.halo.app.model.entity.Attachment; import run.halo.app.model.params.AttachmentQuery; import run.halo.app.service.base.CrudService; @@ -27,7 +27,7 @@ public interface AttachmentService extends CrudService { * @return a page of attachment output dto */ @NonNull - Page pageDtosBy(@NonNull Pageable pageable, AttachmentQuery attachmentQuery); + Page pageDtosBy(@NonNull Pageable pageable, AttachmentQuery attachmentQuery); /** * Uploads file. @@ -55,7 +55,7 @@ public interface AttachmentService extends CrudService { * @return an attachment output dto */ @NonNull - AttachmentOutputDTO convertToDto(@NonNull Attachment attachment); + AttachmentDTO convertToDto(@NonNull Attachment attachment); /** * List all media type. diff --git a/src/main/java/run/halo/app/service/GalleryService.java b/src/main/java/run/halo/app/service/GalleryService.java index 445b0c782..1d53d0db1 100644 --- a/src/main/java/run/halo/app/service/GalleryService.java +++ b/src/main/java/run/halo/app/service/GalleryService.java @@ -2,7 +2,7 @@ package run.halo.app.service; import org.springframework.data.domain.Sort; import org.springframework.lang.NonNull; -import run.halo.app.model.dto.GalleryOutputDTO; +import run.halo.app.model.dto.GalleryDTO; import run.halo.app.model.entity.Gallery; import run.halo.app.model.vo.GalleryTeamVO; import run.halo.app.service.base.CrudService; @@ -22,7 +22,7 @@ public interface GalleryService extends CrudService { * @param sort sort * @return all galleries */ - List listDtos(@NonNull Sort sort); + List listDtos(@NonNull Sort sort); /** * Lists gallery team vos. @@ -39,5 +39,5 @@ public interface GalleryService extends CrudService { * @param sort sort * @return list of galleries */ - List listByTeam(@NonNull String team, Sort sort); + List listByTeam(@NonNull String team, Sort sort); } diff --git a/src/main/java/run/halo/app/service/LinkService.java b/src/main/java/run/halo/app/service/LinkService.java index 7b5732c73..1991eb7c0 100755 --- a/src/main/java/run/halo/app/service/LinkService.java +++ b/src/main/java/run/halo/app/service/LinkService.java @@ -1,13 +1,12 @@ package run.halo.app.service; -import run.halo.app.model.dto.LinkOutputDTO; +import run.halo.app.model.dto.LinkDTO; import run.halo.app.model.entity.Link; import run.halo.app.model.params.LinkParam; import run.halo.app.model.vo.LinkTeamVO; import run.halo.app.service.base.CrudService; import org.springframework.data.domain.Sort; import org.springframework.lang.NonNull; -import run.halo.app.service.base.CrudService; import java.util.List; @@ -25,7 +24,7 @@ public interface LinkService extends CrudService { * @return all links */ @NonNull - List listDtos(@NonNull Sort sort); + List listDtos(@NonNull Sort sort); /** * Lists link team vos. diff --git a/src/main/java/run/halo/app/service/LogService.java b/src/main/java/run/halo/app/service/LogService.java index aacf087b4..2c9ae38f7 100644 --- a/src/main/java/run/halo/app/service/LogService.java +++ b/src/main/java/run/halo/app/service/LogService.java @@ -1,10 +1,9 @@ package run.halo.app.service; -import run.halo.app.model.dto.LogOutputDTO; +import run.halo.app.model.dto.LogDTO; import run.halo.app.model.entity.Log; import run.halo.app.service.base.CrudService; import org.springframework.data.domain.Page; -import run.halo.app.service.base.CrudService; /** * Log service. @@ -19,5 +18,5 @@ public interface LogService extends CrudService { * @param top top number must not be less than 0 * @return a page of latest logs */ - Page pageLatest(int top); + Page pageLatest(int top); } diff --git a/src/main/java/run/halo/app/service/MenuService.java b/src/main/java/run/halo/app/service/MenuService.java index d96bf3b89..173c5fdd6 100644 --- a/src/main/java/run/halo/app/service/MenuService.java +++ b/src/main/java/run/halo/app/service/MenuService.java @@ -2,7 +2,7 @@ package run.halo.app.service; import org.springframework.data.domain.Sort; import org.springframework.lang.NonNull; -import run.halo.app.model.dto.MenuOutputDTO; +import run.halo.app.model.dto.MenuDTO; import run.halo.app.model.entity.Menu; import run.halo.app.model.params.MenuParam; import run.halo.app.model.vo.MenuVO; @@ -25,7 +25,7 @@ public interface MenuService extends CrudService { * @return a list of menu output dto */ @NonNull - List listDtos(@NonNull Sort sort); + List listDtos(@NonNull Sort sort); /** * Creates a menu. diff --git a/src/main/java/run/halo/app/service/OptionService.java b/src/main/java/run/halo/app/service/OptionService.java index b77d92e98..83a003a1a 100755 --- a/src/main/java/run/halo/app/service/OptionService.java +++ b/src/main/java/run/halo/app/service/OptionService.java @@ -5,7 +5,7 @@ import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import org.springframework.transaction.annotation.Transactional; import run.halo.app.exception.MissingPropertyException; -import run.halo.app.model.dto.OptionOutputDTO; +import run.halo.app.model.dto.OptionDTO; import run.halo.app.model.entity.Option; import run.halo.app.model.enums.ValueEnum; import run.halo.app.model.params.OptionParam; @@ -86,7 +86,7 @@ public interface OptionService extends CrudService { * @return a list of option dto */ @NonNull - List listDtos(); + List listDtos(); /** * Get option by key diff --git a/src/main/java/run/halo/app/service/PostTagService.java b/src/main/java/run/halo/app/service/PostTagService.java index b8fe335dc..4ab35ed38 100644 --- a/src/main/java/run/halo/app/service/PostTagService.java +++ b/src/main/java/run/halo/app/service/PostTagService.java @@ -1,7 +1,7 @@ package run.halo.app.service; import org.springframework.transaction.annotation.Transactional; -import run.halo.app.model.dto.TagWithCountOutputDTO; +import run.halo.app.model.dto.TagWithPostCountDTO; import run.halo.app.model.entity.Post; import run.halo.app.model.entity.PostTag; import run.halo.app.model.entity.Tag; @@ -41,7 +41,7 @@ public interface PostTagService extends CrudService { * @return a list of tag with post count output dto */ @NonNull - List listTagWithCountDtos(@NonNull Sort sort); + List listTagWithCountDtos(@NonNull Sort sort); /** * Lists tags list map by post id. diff --git a/src/main/java/run/halo/app/service/TagService.java b/src/main/java/run/halo/app/service/TagService.java index 5dcd5fce9..322d5d9c0 100644 --- a/src/main/java/run/halo/app/service/TagService.java +++ b/src/main/java/run/halo/app/service/TagService.java @@ -1,7 +1,7 @@ package run.halo.app.service; import org.springframework.lang.NonNull; -import run.halo.app.model.dto.TagOutputDTO; +import run.halo.app.model.dto.TagDTO; import run.halo.app.model.entity.Tag; import run.halo.app.service.base.CrudService; @@ -31,5 +31,5 @@ public interface TagService extends CrudService { * @return a list of tag output dto */ @NonNull - List convertTo(List tags); + List convertTo(List tags); } 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 70e117273..65e02eaa8 100644 --- a/src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java @@ -10,10 +10,9 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.web.multipart.MultipartFile; import run.halo.app.handler.file.FileHandlers; -import run.halo.app.model.dto.AttachmentOutputDTO; +import run.halo.app.model.dto.AttachmentDTO; import run.halo.app.model.entity.Attachment; import run.halo.app.model.enums.AttachmentType; -import run.halo.app.model.enums.converter.AttachmentTypeConverter; import run.halo.app.model.params.AttachmentQuery; import run.halo.app.model.properties.AttachmentProperties; import run.halo.app.model.properties.PropertyEnum; @@ -54,7 +53,7 @@ public class AttachmentServiceImpl extends AbstractCrudService pageDtosBy(@NonNull Pageable pageable, AttachmentQuery attachmentQuery) { + public Page pageDtosBy(@NonNull Pageable pageable, AttachmentQuery attachmentQuery) { Assert.notNull(pageable, "Page info must not be null"); // List all @@ -139,26 +138,26 @@ public class AttachmentServiceImpl extends AbstractCrudService im * @return all galleries */ @Override - public List listDtos(Sort sort) { + public List listDtos(Sort sort) { Assert.notNull(sort, "Sort info must not be null"); - return listAll(sort).stream().map(gallery -> (GalleryOutputDTO) new GalleryOutputDTO().convertFrom(gallery)).collect(Collectors.toList()); + return listAll(sort).stream().map(gallery -> (GalleryDTO) new GalleryDTO().convertFrom(gallery)).collect(Collectors.toList()); } /** @@ -57,12 +57,12 @@ public class GalleryServiceImpl extends AbstractCrudService im Assert.notNull(sort, "Sort info must not be null"); // List all galleries - List galleries = listDtos(sort); + List galleries = listDtos(sort); // Get teams - Set teams = ServiceUtils.fetchProperty(galleries, GalleryOutputDTO::getTeam); + Set teams = ServiceUtils.fetchProperty(galleries, GalleryDTO::getTeam); - Map> teamGalleryListMap = ServiceUtils.convertToListMap(teams, galleries, GalleryOutputDTO::getTeam); + Map> teamGalleryListMap = ServiceUtils.convertToListMap(teams, galleries, GalleryDTO::getTeam); List result = new LinkedList<>(); @@ -88,8 +88,8 @@ public class GalleryServiceImpl extends AbstractCrudService im * @return list of galleries */ @Override - public List listByTeam(String team, Sort sort) { + public List listByTeam(String team, Sort sort) { List galleries = galleryRepository.findByTeam(team, sort); - return galleries.stream().map(gallery -> (GalleryOutputDTO) new GalleryOutputDTO().convertFrom(gallery)).collect(Collectors.toList()); + return galleries.stream().map(gallery -> (GalleryDTO) new GalleryDTO().convertFrom(gallery)).collect(Collectors.toList()); } } diff --git a/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java b/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java index 157aa2c7c..6376be411 100644 --- a/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/LinkServiceImpl.java @@ -1,7 +1,7 @@ package run.halo.app.service.impl; import run.halo.app.exception.AlreadyExistsException; -import run.halo.app.model.dto.LinkOutputDTO; +import run.halo.app.model.dto.LinkDTO; import run.halo.app.model.entity.Link; import run.halo.app.model.params.LinkParam; import run.halo.app.model.vo.LinkTeamVO; @@ -16,9 +16,6 @@ import org.springframework.lang.Nullable; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import run.halo.app.exception.AlreadyExistsException; -import run.halo.app.repository.LinkRepository; -import run.halo.app.service.base.AbstractCrudService; import java.util.*; import java.util.stream.Collectors; @@ -46,7 +43,7 @@ public class LinkServiceImpl extends AbstractCrudService implemen * @return all links */ @Override - public List listDtos(Sort sort) { + public List listDtos(Sort sort) { Assert.notNull(sort, "Sort info must not be null"); return convertTo(listAll(sort)); @@ -57,13 +54,13 @@ public class LinkServiceImpl extends AbstractCrudService implemen Assert.notNull(sort, "Sort info must not be null"); // List all links - List links = listDtos(sort); + List links = listDtos(sort); // Get teams - Set teams = ServiceUtils.fetchProperty(links, LinkOutputDTO::getTeam); + Set teams = ServiceUtils.fetchProperty(links, LinkDTO::getTeam); // Convert to team link list map (Key: team, value: link list) - Map> teamLinkListMap = ServiceUtils.convertToListMap(teams, links, LinkOutputDTO::getTeam); + Map> teamLinkListMap = ServiceUtils.convertToListMap(teams, links, LinkDTO::getTeam); List result = new LinkedList<>(); @@ -105,12 +102,12 @@ public class LinkServiceImpl extends AbstractCrudService implemen } @NonNull - private List convertTo(@Nullable List links) { + private List convertTo(@Nullable List links) { if (CollectionUtils.isEmpty(links)) { return Collections.emptyList(); } - return links.stream().map(link -> new LinkOutputDTO().convertFrom(link)) + return links.stream().map(link -> new LinkDTO().convertFrom(link)) .collect(Collectors.toList()); } } diff --git a/src/main/java/run/halo/app/service/impl/LogServiceImpl.java b/src/main/java/run/halo/app/service/impl/LogServiceImpl.java index a7b961ecb..ac6966d25 100644 --- a/src/main/java/run/halo/app/service/impl/LogServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/LogServiceImpl.java @@ -1,6 +1,6 @@ package run.halo.app.service.impl; -import run.halo.app.model.dto.LogOutputDTO; +import run.halo.app.model.dto.LogDTO; import run.halo.app.model.entity.Log; import run.halo.app.repository.LogRepository; import run.halo.app.service.LogService; @@ -10,8 +10,6 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.util.Assert; -import run.halo.app.repository.LogRepository; -import run.halo.app.service.base.AbstractCrudService; /** * LogService implementation class @@ -30,13 +28,13 @@ public class LogServiceImpl extends AbstractCrudService implements Lo } @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 PageRequest latestPageable = PageRequest.of(0, top, Sort.by(Sort.Direction.DESC, "createTime")); // List all - return listAll(latestPageable).map(log -> new LogOutputDTO().convertFrom(log)); + return listAll(latestPageable).map(log -> new LogDTO().convertFrom(log)); } } diff --git a/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java b/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java index d22761d2d..eab322ff2 100644 --- a/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import run.halo.app.exception.AlreadyExistsException; -import run.halo.app.model.dto.MenuOutputDTO; +import run.halo.app.model.dto.MenuDTO; import run.halo.app.model.entity.Menu; import run.halo.app.model.params.MenuParam; import run.halo.app.model.vo.MenuVO; @@ -36,7 +36,7 @@ public class MenuServiceImpl extends AbstractCrudService implemen } @Override - public List listDtos(Sort sort) { + public List listDtos(Sort sort) { Assert.notNull(sort, "Sort info must not be null"); return convertTo(listAll(sort)); @@ -139,13 +139,13 @@ public class MenuServiceImpl extends AbstractCrudService implemen return topMenu; } - private List convertTo(List menus) { + private List convertTo(List menus) { if (CollectionUtils.isEmpty(menus)) { return Collections.emptyList(); } return menus.stream() - .map(menu -> new MenuOutputDTO().convertFrom(menu)) + .map(menu -> new MenuDTO().convertFrom(menu)) .collect(Collectors.toList()); } } diff --git a/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java b/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java index 9c09ce8a0..33257a48c 100644 --- a/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/OptionServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import run.halo.app.cache.StringCacheStore; import run.halo.app.exception.MissingPropertyException; -import run.halo.app.model.dto.OptionOutputDTO; +import run.halo.app.model.dto.OptionDTO; import run.halo.app.model.entity.Option; import run.halo.app.model.enums.ValueEnum; import run.halo.app.model.params.OptionParam; @@ -129,8 +129,8 @@ public class OptionServiceImpl extends AbstractCrudService impl } @Override - public List listDtos() { - return listAll().stream().map(option -> new OptionOutputDTO().convertFrom(option)).collect(Collectors.toList()); + public List listDtos() { + return listAll().stream().map(option -> new OptionDTO().convertFrom(option)).collect(Collectors.toList()); } @Override diff --git a/src/main/java/run/halo/app/service/impl/PostServiceImpl.java b/src/main/java/run/halo/app/service/impl/PostServiceImpl.java index 81c5f2961..1e02d0ef4 100644 --- a/src/main/java/run/halo/app/service/impl/PostServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/PostServiceImpl.java @@ -18,8 +18,8 @@ import run.halo.app.event.post.VisitEvent; import run.halo.app.exception.AlreadyExistsException; import run.halo.app.exception.BadRequestException; import run.halo.app.exception.NotFoundException; -import run.halo.app.model.dto.CategoryOutputDTO; -import run.halo.app.model.dto.TagOutputDTO; +import run.halo.app.model.dto.CategoryDTO; +import run.halo.app.model.dto.TagDTO; import run.halo.app.model.dto.post.PostMinimalOutputDTO; import run.halo.app.model.dto.post.PostSimpleOutputDTO; import run.halo.app.model.entity.*; @@ -499,7 +499,7 @@ public class PostServiceImpl extends AbstractCrudService implemen .orElseGet(LinkedList::new) .stream() .filter(Objects::nonNull) - .map(tag -> new TagOutputDTO().convertFrom(tag)) + .map(tag -> new TagDTO().convertFrom(tag)) .collect(Collectors.toList())); // Set categories @@ -507,7 +507,7 @@ public class PostServiceImpl extends AbstractCrudService implemen .orElseGet(LinkedList::new) .stream() .filter(Objects::nonNull) - .map(category -> new CategoryOutputDTO().convertFrom(category)) + .map(category -> new CategoryDTO().convertFrom(category)) .collect(Collectors.toList())); // Set comment count diff --git a/src/main/java/run/halo/app/service/impl/PostTagServiceImpl.java b/src/main/java/run/halo/app/service/impl/PostTagServiceImpl.java index c97170d94..c0287d70b 100644 --- a/src/main/java/run/halo/app/service/impl/PostTagServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/PostTagServiceImpl.java @@ -1,6 +1,6 @@ package run.halo.app.service.impl; -import run.halo.app.model.dto.TagWithCountOutputDTO; +import run.halo.app.model.dto.TagWithPostCountDTO; import run.halo.app.model.entity.Post; import run.halo.app.model.entity.PostTag; import run.halo.app.model.entity.Tag; @@ -17,10 +17,6 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; -import run.halo.app.repository.PostRepository; -import run.halo.app.repository.PostTagRepository; -import run.halo.app.repository.TagRepository; -import run.halo.app.service.base.AbstractCrudService; import java.util.*; import java.util.stream.Collectors; @@ -60,7 +56,7 @@ public class PostTagServiceImpl extends AbstractCrudService im } @Override - public List listTagWithCountDtos(Sort sort) { + public List listTagWithCountDtos(Sort sort) { Assert.notNull(sort, "Sort info must not be null"); // Find all tags @@ -72,7 +68,7 @@ public class PostTagServiceImpl extends AbstractCrudService im // Find post count return tags.stream().map( tag -> { - TagWithCountOutputDTO tagWithCountOutputDTO = new TagWithCountOutputDTO().convertFrom(tag); + TagWithPostCountDTO tagWithCountOutputDTO = new TagWithPostCountDTO().convertFrom(tag); tagWithCountOutputDTO.setPostCount(tagPostCountMap.getOrDefault(tag.getId(), 0L)); return tagWithCountOutputDTO; } diff --git a/src/main/java/run/halo/app/service/impl/TagServiceImpl.java b/src/main/java/run/halo/app/service/impl/TagServiceImpl.java index d3a5442f9..e8d706081 100644 --- a/src/main/java/run/halo/app/service/impl/TagServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/TagServiceImpl.java @@ -2,7 +2,7 @@ package run.halo.app.service.impl; import run.halo.app.exception.AlreadyExistsException; import run.halo.app.exception.NotFoundException; -import run.halo.app.model.dto.TagOutputDTO; +import run.halo.app.model.dto.TagDTO; import run.halo.app.model.entity.Tag; import run.halo.app.repository.TagRepository; import run.halo.app.service.TagService; @@ -10,10 +10,6 @@ import run.halo.app.service.base.AbstractCrudService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import run.halo.app.exception.AlreadyExistsException; -import run.halo.app.exception.NotFoundException; -import run.halo.app.repository.TagRepository; -import run.halo.app.service.base.AbstractCrudService; import java.util.Collections; import java.util.List; @@ -64,11 +60,11 @@ public class TagServiceImpl extends AbstractCrudService implements } @Override - public List convertTo(List tags) { + public List convertTo(List tags) { return CollectionUtils.isEmpty(tags) ? Collections.emptyList() : tags.stream() - .map(tag -> (TagOutputDTO) new TagOutputDTO().convertFrom(tag)) + .map(tag -> (TagDTO) new TagDTO().convertFrom(tag)) .collect(Collectors.toList()); } } diff --git a/src/main/java/run/halo/app/web/controller/admin/api/AdminController.java b/src/main/java/run/halo/app/web/controller/admin/api/AdminController.java index 94023305a..c4ba2914a 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/AdminController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/AdminController.java @@ -5,8 +5,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import run.halo.app.cache.lock.CacheLock; import run.halo.app.exception.BadRequestException; -import run.halo.app.model.dto.CountOutputDTO; -import run.halo.app.model.dto.UserOutputDTO; +import run.halo.app.model.dto.CountDTO; +import run.halo.app.model.dto.UserDTO; import run.halo.app.model.enums.PostStatus; import run.halo.app.model.params.LoginParam; import run.halo.app.model.properties.PrimaryProperties; @@ -61,11 +61,11 @@ public class AdminController { */ @GetMapping("counts") @ApiOperation("Gets count info") - public CountOutputDTO getCount() { - CountOutputDTO countOutputDTO = new CountOutputDTO(); - countOutputDTO.setPostCount(postService.countByStatus(PostStatus.PUBLISHED)); - countOutputDTO.setAttachmentCount(attachmentService.count()); - countOutputDTO.setCommentCount(commentService.count()); + public CountDTO getCount() { + CountDTO countDTO = new CountDTO(); + countDTO.setPostCount(postService.countByStatus(PostStatus.PUBLISHED)); + countDTO.setAttachmentCount(attachmentService.count()); + countDTO.setCommentCount(commentService.count()); long currentTimeMillis = System.currentTimeMillis(); @@ -73,19 +73,19 @@ public class AdminController { // TODO Initialize the birthday if absent Long birthday = optionService.getByPropertyOrDefault(PrimaryProperties.BIRTHDAY, Long.class, currentTimeMillis); long days = (currentTimeMillis - birthday) / (1000 * 24 * 3600); - countOutputDTO.setEstablishDays(days); + countDTO.setEstablishDays(days); - countOutputDTO.setLinkCount(linkService.count()); - countOutputDTO.setVisitCount(postService.countVisit()); - countOutputDTO.setLikeCount(postService.countLike()); - return countOutputDTO; + countDTO.setLinkCount(linkService.count()); + countDTO.setVisitCount(postService.countVisit()); + countDTO.setLikeCount(postService.countLike()); + return countDTO; } @PostMapping("login") @ApiOperation("Login with session") @CacheLock(autoDelete = false, traceRequest = true) - public UserOutputDTO login(@Valid @RequestBody LoginParam loginParam, HttpServletRequest request) { - return new UserOutputDTO().convertFrom(userService.login(loginParam.getUsername(), loginParam.getPassword(), request.getSession())); + public UserDTO login(@Valid @RequestBody LoginParam loginParam, HttpServletRequest request) { + return new UserDTO().convertFrom(userService.login(loginParam.getUsername(), loginParam.getPassword(), request.getSession())); } @PostMapping("logout") diff --git a/src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java b/src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java index 3bce435ca..a3356843b 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java @@ -7,7 +7,7 @@ import org.springframework.data.web.PageableDefault; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import run.halo.app.model.dto.AttachmentOutputDTO; +import run.halo.app.model.dto.AttachmentDTO; import run.halo.app.model.entity.Attachment; import run.halo.app.model.params.AttachmentParam; import run.halo.app.model.params.AttachmentQuery; @@ -39,11 +39,11 @@ public class AttachmentController { * List of attachment. * * @param pageable pageable - * @return Page + * @return Page */ @GetMapping - public Page pageBy(@PageableDefault(sort = "updateTime", direction = DESC) Pageable pageable, - AttachmentQuery attachmentQuery) { + public Page pageBy(@PageableDefault(sort = "updateTime", direction = DESC) Pageable pageable, + AttachmentQuery attachmentQuery) { return attachmentService.pageDtosBy(pageable, attachmentQuery); } @@ -51,22 +51,22 @@ public class AttachmentController { * Get attachment by id. * * @param id attachment id - * @return AttachmentOutputDTO + * @return AttachmentDTO */ @GetMapping("{id:\\d+}") @ApiOperation("Get attachment detail by id") - public AttachmentOutputDTO getBy(@PathVariable("id") Integer id) { + public AttachmentDTO getBy(@PathVariable("id") Integer id) { Attachment attachment = attachmentService.getById(id); return attachmentService.convertToDto(attachment); } @PutMapping("{attachmentId:\\d+}") @ApiOperation("Updates a attachment") - public AttachmentOutputDTO updateBy(@PathVariable("attachmentId") Integer attachmentId, - @RequestBody @Valid AttachmentParam attachmentParam) { + public AttachmentDTO updateBy(@PathVariable("attachmentId") Integer attachmentId, + @RequestBody @Valid AttachmentParam attachmentParam) { Attachment attachment = attachmentService.getById(attachmentId); attachmentParam.update(attachment); - return new AttachmentOutputDTO().convertFrom(attachmentService.update(attachment)); + return new AttachmentDTO().convertFrom(attachmentService.update(attachment)); } /** @@ -76,20 +76,20 @@ public class AttachmentController { */ @DeleteMapping("{id:\\d+}") @ApiOperation("Delete attachment by id") - public AttachmentOutputDTO deletePermanently(@PathVariable("id") Integer id) { + public AttachmentDTO deletePermanently(@PathVariable("id") Integer id) { return attachmentService.convertToDto(attachmentService.removePermanently(id)); } @PostMapping("upload") @ApiOperation("Uploads single file") - public AttachmentOutputDTO uploadAttachment(@RequestPart("file") MultipartFile file) { + public AttachmentDTO uploadAttachment(@RequestPart("file") MultipartFile file) { return attachmentService.convertToDto(attachmentService.upload(file)); } @PostMapping(value = "uploads", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @ApiOperation("Uploads multi files (Invalid in Swagger UI)") - public List uploadAttachments(@RequestPart("files") MultipartFile[] files) { - List result = new LinkedList<>(); + public List uploadAttachments(@RequestPart("files") MultipartFile[] files) { + List result = new LinkedList<>(); for (MultipartFile file : files) { // Upload single file diff --git a/src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java b/src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java index 809ad82a9..0ac0b9852 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Sort; import org.springframework.data.web.SortDefault; import org.springframework.web.bind.annotation.*; -import run.halo.app.model.dto.CategoryOutputDTO; +import run.halo.app.model.dto.CategoryDTO; import run.halo.app.model.entity.Category; import run.halo.app.model.params.CategoryParam; import run.halo.app.model.vo.CategoryVO; @@ -44,24 +44,24 @@ public class CategoryController { } @PostMapping - public CategoryOutputDTO createBy(@Valid @RequestBody CategoryParam categoryParam) { + public CategoryDTO createBy(@Valid @RequestBody CategoryParam categoryParam) { // Convert to category Category category = categoryParam.convertTo(); // Save it - return new CategoryOutputDTO().convertFrom(categoryService.create(category)); + return new CategoryDTO().convertFrom(categoryService.create(category)); } /** * Get Category by id * * @param id id - * @return CategoryOutputDTO + * @return CategoryDTO */ @GetMapping("{id:\\d+}") @ApiOperation("Get category detail by id") - public CategoryOutputDTO getBy(@PathVariable("id") Integer id) { - return new CategoryOutputDTO().convertFrom(categoryService.getById(id)); + public CategoryDTO getBy(@PathVariable("id") Integer id) { + return new CategoryDTO().convertFrom(categoryService.getById(id)); } /** diff --git a/src/main/java/run/halo/app/web/controller/admin/api/CommentController.java b/src/main/java/run/halo/app/web/controller/admin/api/CommentController.java index 6872a4e6d..202c77bc6 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/CommentController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/CommentController.java @@ -6,7 +6,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; import org.springframework.web.bind.annotation.*; -import run.halo.app.model.dto.CommentOutputDTO; +import run.halo.app.model.dto.CommentDTO; import run.halo.app.model.entity.Comment; import run.halo.app.model.entity.User; import run.halo.app.model.enums.CommentStatus; @@ -68,7 +68,7 @@ public class CommentController { } @PostMapping - public CommentOutputDTO createBy(@RequestBody CommentParam commentParam, HttpServletRequest request, User user) { + public CommentDTO createBy(@RequestBody CommentParam commentParam, HttpServletRequest request, User user) { // Set some default info commentParam.setAuthor(StringUtils.isEmpty(user.getNickname()) ? user.getUsername() : user.getNickname()); commentParam.setEmail(user.getEmail()); @@ -85,28 +85,28 @@ public class CommentController { commentService.mustExistById(commentParam.getParentId()); } - return new CommentOutputDTO().convertFrom(commentService.createBy(commentParam.convertTo(), request)); + return new CommentDTO().convertFrom(commentService.createBy(commentParam.convertTo(), request)); } @PutMapping("{commentId:\\d+}/status/{status}") @ApiOperation("Updates comment status") - public CommentOutputDTO updateStatusBy(@PathVariable("commentId") Long commentId, - @PathVariable("status") CommentStatus status) { + public CommentDTO updateStatusBy(@PathVariable("commentId") Long commentId, + @PathVariable("status") CommentStatus status) { // Update comment status Comment updatedComment = commentService.updateStatus(commentId, status); - return new CommentOutputDTO().convertFrom(updatedComment); + return new CommentDTO().convertFrom(updatedComment); } @DeleteMapping("{commentId:\\d+}") @ApiOperation("Deletes comment permanently and recursively") - public CommentOutputDTO deleteBy(@PathVariable("commentId") Long commentId) { + public CommentDTO deleteBy(@PathVariable("commentId") Long commentId) { // Get comment by id Comment comment = commentService.getById(commentId); // Remove it commentService.remove(comment); - return new CommentOutputDTO().convertFrom(comment); + return new CommentDTO().convertFrom(comment); } } diff --git a/src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java b/src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java index 697d1f1de..e995fac52 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java @@ -1,13 +1,11 @@ package run.halo.app.web.controller.admin.api; -import run.halo.app.model.dto.GalleryOutputDTO; +import run.halo.app.model.dto.GalleryDTO; import run.halo.app.service.GalleryService; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Sort; import org.springframework.data.web.SortDefault; import org.springframework.web.bind.annotation.*; -import run.halo.app.model.dto.GalleryOutputDTO; -import run.halo.app.service.GalleryService; import java.util.List; @@ -34,7 +32,7 @@ public class GalleryController { * @return all of galleries */ @GetMapping - public List listGalleries(@SortDefault(sort = "updateTime", direction = Sort.Direction.DESC) Sort sort) { + public List listGalleries(@SortDefault(sort = "updateTime", direction = Sort.Direction.DESC) Sort sort) { return galleryService.listDtos(sort); } @@ -42,12 +40,12 @@ public class GalleryController { * Get gallery by id. * * @param galleryId gallery id - * @return GalleryOutputDTO + * @return GalleryDTO */ @GetMapping("{galleryId:\\d+}") @ApiOperation("Get gallery detail by id") - public GalleryOutputDTO getBy(@PathVariable("galleryId") Integer galleryId) { - return new GalleryOutputDTO().convertFrom(galleryService.getById(galleryId)); + public GalleryDTO getBy(@PathVariable("galleryId") Integer galleryId) { + return new GalleryDTO().convertFrom(galleryService.getById(galleryId)); } /** diff --git a/src/main/java/run/halo/app/web/controller/admin/api/LinkController.java b/src/main/java/run/halo/app/web/controller/admin/api/LinkController.java index 156992c86..064a6182c 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/LinkController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/LinkController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Sort; import org.springframework.data.web.SortDefault; import org.springframework.web.bind.annotation.*; -import run.halo.app.model.dto.LinkOutputDTO; +import run.halo.app.model.dto.LinkDTO; import run.halo.app.model.entity.Link; import run.halo.app.model.params.LinkParam; import run.halo.app.service.LinkService; @@ -35,7 +35,7 @@ public class LinkController { * @return List */ @GetMapping - public List listLinks(@SortDefault(sort = "updateTime", direction = Sort.Direction.DESC) Sort sort) { + public List listLinks(@SortDefault(sort = "updateTime", direction = Sort.Direction.DESC) Sort sort) { return linkService.listDtos(sort); } @@ -43,27 +43,27 @@ public class LinkController { * Get link by id. * * @param id id - * @return LinkOutputDTO + * @return LinkDTO */ @GetMapping("{id:\\d+}") @ApiOperation("Get link detail by id") - public LinkOutputDTO getBy(@PathVariable("id") Integer id) { - return new LinkOutputDTO().convertFrom(linkService.getById(id)); + public LinkDTO getBy(@PathVariable("id") Integer id) { + return new LinkDTO().convertFrom(linkService.getById(id)); } @PostMapping - public LinkOutputDTO createBy(@RequestBody @Valid LinkParam linkParam) { + public LinkDTO createBy(@RequestBody @Valid LinkParam linkParam) { Link link = linkService.createBy(linkParam); - return new LinkOutputDTO().convertFrom(link); + return new LinkDTO().convertFrom(link); } @PutMapping("{id:\\d+}") @ApiOperation("Updates a link") - public LinkOutputDTO updateBy(@PathVariable("id") Integer id, - @RequestBody @Valid LinkParam linkParam) { + public LinkDTO updateBy(@PathVariable("id") Integer id, + @RequestBody @Valid LinkParam linkParam) { Link link = linkService.getById(id); linkParam.update(link); - return new LinkOutputDTO().convertFrom(linkService.update(link)); + return new LinkDTO().convertFrom(linkService.update(link)); } /** diff --git a/src/main/java/run/halo/app/web/controller/admin/api/LogController.java b/src/main/java/run/halo/app/web/controller/admin/api/LogController.java index e015f0713..e9a43c298 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/LogController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/LogController.java @@ -1,14 +1,12 @@ package run.halo.app.web.controller.admin.api; -import run.halo.app.model.dto.LogOutputDTO; +import run.halo.app.model.dto.LogDTO; import run.halo.app.service.LogService; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import run.halo.app.model.dto.LogOutputDTO; -import run.halo.app.service.LogService; import java.util.List; @@ -36,7 +34,7 @@ public class LogController { */ @GetMapping("latest") @ApiOperation("Pages latest logs") - public List pageLatest(@RequestParam(name = "top", defaultValue = "10") int top) { + public List pageLatest(@RequestParam(name = "top", defaultValue = "10") int top) { return logService.pageLatest(top).getContent(); } diff --git a/src/main/java/run/halo/app/web/controller/admin/api/MenuController.java b/src/main/java/run/halo/app/web/controller/admin/api/MenuController.java index c53d98a42..f11c64447 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/MenuController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/MenuController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Sort; import org.springframework.data.web.SortDefault; import org.springframework.web.bind.annotation.*; -import run.halo.app.model.dto.MenuOutputDTO; +import run.halo.app.model.dto.MenuDTO; import run.halo.app.model.entity.Menu; import run.halo.app.model.params.MenuParam; import run.halo.app.model.vo.MenuVO; @@ -34,7 +34,7 @@ public class MenuController { @GetMapping @ApiOperation("Lists all menus") - public List listAll(@SortDefault(sort = "sort", direction = DESC) Sort sort) { + public List listAll(@SortDefault(sort = "sort", direction = DESC) Sort sort) { return menuService.listDtos(sort); } @@ -46,14 +46,14 @@ public class MenuController { @PostMapping @ApiOperation("Creates a menu") - public MenuOutputDTO createBy(@RequestBody @Valid MenuParam menuParam) { - return new MenuOutputDTO().convertFrom(menuService.createBy(menuParam)); + public MenuDTO createBy(@RequestBody @Valid MenuParam menuParam) { + return new MenuDTO().convertFrom(menuService.createBy(menuParam)); } @PutMapping("{menuId:\\d+}") @ApiOperation("Updates a menu") - public MenuOutputDTO updateBy(@PathVariable("menuId") Integer menuId, - @RequestBody @Valid MenuParam menuParam) { + public MenuDTO updateBy(@PathVariable("menuId") Integer menuId, + @RequestBody @Valid MenuParam menuParam) { // Get the menu Menu menu = menuService.getById(menuId); @@ -61,12 +61,12 @@ public class MenuController { menuParam.update(menu); // Update menu in database - return new MenuOutputDTO().convertFrom(menuService.update(menu)); + return new MenuDTO().convertFrom(menuService.update(menu)); } @DeleteMapping("{menuId:\\d+}") @ApiOperation("Deletes a menu") - public MenuOutputDTO deleteBy(@PathVariable("menuId") Integer menuId) { - return new MenuOutputDTO().convertFrom(menuService.removeById(menuId)); + public MenuDTO deleteBy(@PathVariable("menuId") Integer menuId) { + return new MenuDTO().convertFrom(menuService.removeById(menuId)); } } diff --git a/src/main/java/run/halo/app/web/controller/admin/api/OptionController.java b/src/main/java/run/halo/app/web/controller/admin/api/OptionController.java index ce6d1474d..58f8d9fda 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/OptionController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/OptionController.java @@ -1,6 +1,6 @@ package run.halo.app.web.controller.admin.api; -import run.halo.app.model.dto.OptionOutputDTO; +import run.halo.app.model.dto.OptionDTO; import run.halo.app.model.params.OptionParam; import run.halo.app.service.OptionService; import io.swagger.annotations.ApiOperation; @@ -27,7 +27,7 @@ public class OptionController { } @GetMapping - public List listAll() { + public List listAll() { return optionService.listDtos(); } diff --git a/src/main/java/run/halo/app/web/controller/admin/api/TagController.java b/src/main/java/run/halo/app/web/controller/admin/api/TagController.java index 4e04582f6..1edf5f111 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/TagController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/TagController.java @@ -1,6 +1,6 @@ package run.halo.app.web.controller.admin.api; -import run.halo.app.model.dto.TagOutputDTO; +import run.halo.app.model.dto.TagDTO; import run.halo.app.model.entity.Tag; import run.halo.app.model.params.TagParam; import run.halo.app.service.PostTagService; @@ -10,11 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Sort; import org.springframework.data.web.SortDefault; import org.springframework.web.bind.annotation.*; -import run.halo.app.model.dto.TagOutputDTO; -import run.halo.app.model.entity.Tag; -import run.halo.app.model.params.TagParam; -import run.halo.app.service.PostTagService; -import run.halo.app.service.TagService; import javax.validation.Valid; import java.util.List; @@ -41,8 +36,8 @@ public class TagController { } @GetMapping - public List listTags(@SortDefault(sort = "updateTime", direction = Sort.Direction.DESC) Sort sort, - @RequestParam(name = "more", required = false, defaultValue = "false") Boolean more) { + public List listTags(@SortDefault(sort = "updateTime", direction = Sort.Direction.DESC) Sort sort, + @RequestParam(name = "more", required = false, defaultValue = "false") Boolean more) { if (more) { return postTagService.listTagWithCountDtos(sort); } @@ -50,32 +45,32 @@ public class TagController { } @PostMapping - public TagOutputDTO createTag(@Valid @RequestBody TagParam tagParam) { + public TagDTO createTag(@Valid @RequestBody TagParam tagParam) { // Convert to tag Tag tag = tagParam.convertTo(); log.debug("Tag to be created: [{}]", tag); // Create and convert - return new TagOutputDTO().convertFrom(tagService.create(tag)); + return new TagDTO().convertFrom(tagService.create(tag)); } /** * Get tag by id * * @param tagId tag id - * @return TagOutputDTO + * @return TagDTO */ @GetMapping("{tagId:\\d+}") @ApiOperation("Get tag detail by id") - public TagOutputDTO getBy(@PathVariable("tagId") Integer tagId) { - return new TagOutputDTO().convertFrom(tagService.getById(tagId)); + public TagDTO getBy(@PathVariable("tagId") Integer tagId) { + return new TagDTO().convertFrom(tagService.getById(tagId)); } @PutMapping("{tagId:\\d+}") @ApiOperation("Updates tag") - public TagOutputDTO updateBy(@PathVariable("tagId") Integer tagId, - @Valid @RequestBody TagParam tagParam) { + public TagDTO updateBy(@PathVariable("tagId") Integer tagId, + @Valid @RequestBody TagParam tagParam) { // Get old tag Tag tag = tagService.getById(tagId); @@ -83,7 +78,7 @@ public class TagController { tagParam.update(tag); // Update tag - return new TagOutputDTO().convertFrom(tagService.update(tag)); + return new TagDTO().convertFrom(tagService.update(tag)); } /** diff --git a/src/main/java/run/halo/app/web/controller/admin/api/UserController.java b/src/main/java/run/halo/app/web/controller/admin/api/UserController.java index c3c7ce48b..0184560b8 100644 --- a/src/main/java/run/halo/app/web/controller/admin/api/UserController.java +++ b/src/main/java/run/halo/app/web/controller/admin/api/UserController.java @@ -1,15 +1,11 @@ package run.halo.app.web.controller.admin.api; -import run.halo.app.model.dto.UserOutputDTO; +import run.halo.app.model.dto.UserDTO; import run.halo.app.model.entity.User; import run.halo.app.model.params.PasswordParam; import run.halo.app.model.params.UserParam; import run.halo.app.service.UserService; import org.springframework.web.bind.annotation.*; -import run.halo.app.model.dto.UserOutputDTO; -import run.halo.app.model.entity.User; -import run.halo.app.model.params.PasswordParam; -import run.halo.app.model.params.UserParam; import javax.validation.Valid; @@ -30,17 +26,17 @@ public class UserController { } @GetMapping("profile") - public UserOutputDTO getProfile(User user) { - return new UserOutputDTO().convertFrom(user); + public UserDTO getProfile(User user) { + return new UserDTO().convertFrom(user); } @PutMapping("profile") - public UserOutputDTO updateProfile(@Valid @RequestBody UserParam userParam, User user) { + public UserDTO updateProfile(@Valid @RequestBody UserParam userParam, User user) { // Update properties userParam.update(user); // Update user and convert to dto - return new UserOutputDTO().convertFrom(userService.update(user)); + return new UserDTO().convertFrom(userService.update(user)); } @PutMapping("profile/password") diff --git a/src/main/java/run/halo/app/web/controller/content/api/CommentController.java b/src/main/java/run/halo/app/web/controller/content/api/CommentController.java index 9de5331e5..d331eeafe 100644 --- a/src/main/java/run/halo/app/web/controller/content/api/CommentController.java +++ b/src/main/java/run/halo/app/web/controller/content/api/CommentController.java @@ -1,7 +1,7 @@ package run.halo.app.web.controller.content.api; import io.swagger.annotations.ApiOperation; -import run.halo.app.model.dto.CommentOutputDTO; +import run.halo.app.model.dto.CommentDTO; import run.halo.app.model.entity.User; import run.halo.app.model.params.CommentParam; import run.halo.app.model.properties.BlogProperties; @@ -45,7 +45,7 @@ public class CommentController { @PostMapping @ApiOperation("Comments a post") - public CommentOutputDTO comment(@RequestBody CommentParam commentParam, HttpServletRequest request) { + public CommentDTO comment(@RequestBody CommentParam commentParam, HttpServletRequest request) { // Get authentication Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication != null) { @@ -67,6 +67,6 @@ public class CommentController { commentService.mustExistById(commentParam.getParentId()); } - return new CommentOutputDTO().convertFrom(commentService.createBy(commentParam.convertTo(), request)); + return new CommentDTO().convertFrom(commentService.createBy(commentParam.convertTo(), request)); } } diff --git a/src/main/java/run/halo/app/web/controller/content/api/MenuController.java b/src/main/java/run/halo/app/web/controller/content/api/MenuController.java index 48b368b89..6ab4a9b8f 100644 --- a/src/main/java/run/halo/app/web/controller/content/api/MenuController.java +++ b/src/main/java/run/halo/app/web/controller/content/api/MenuController.java @@ -1,6 +1,6 @@ package run.halo.app.web.controller.content.api; -import run.halo.app.model.dto.MenuOutputDTO; +import run.halo.app.model.dto.MenuDTO; import run.halo.app.service.MenuService; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Sort; @@ -8,7 +8,6 @@ import org.springframework.data.web.SortDefault; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import run.halo.app.service.MenuService; import java.util.List; @@ -32,7 +31,7 @@ public class MenuController { @GetMapping @ApiOperation("Lists all menus") - public List listAll(@SortDefault(sort = "sort", direction = DESC) Sort sort) { + public List listAll(@SortDefault(sort = "sort", direction = DESC) Sort sort) { return menuService.listDtos(sort); } } diff --git a/src/main/java/run/halo/app/web/controller/content/api/OptionController.java b/src/main/java/run/halo/app/web/controller/content/api/OptionController.java index d4baa4258..8bb78052f 100644 --- a/src/main/java/run/halo/app/web/controller/content/api/OptionController.java +++ b/src/main/java/run/halo/app/web/controller/content/api/OptionController.java @@ -1,6 +1,6 @@ package run.halo.app.web.controller.content.api; -import run.halo.app.model.dto.OptionOutputDTO; +import run.halo.app.model.dto.OptionDTO; import run.halo.app.model.support.BaseResponse; import run.halo.app.service.OptionService; import io.swagger.annotations.ApiOperation; @@ -31,7 +31,7 @@ public class OptionController { @GetMapping("list_view") @ApiOperation("Lists all options with list view") - public List listAll() { + public List listAll() { return optionService.listDtos(); } diff --git a/src/main/java/run/halo/app/web/controller/content/api/TagController.java b/src/main/java/run/halo/app/web/controller/content/api/TagController.java index 1aed58505..73ebaf1d4 100644 --- a/src/main/java/run/halo/app/web/controller/content/api/TagController.java +++ b/src/main/java/run/halo/app/web/controller/content/api/TagController.java @@ -1,6 +1,6 @@ package run.halo.app.web.controller.content.api; -import run.halo.app.model.dto.TagOutputDTO; +import run.halo.app.model.dto.TagDTO; import run.halo.app.model.dto.post.PostSimpleOutputDTO; import run.halo.app.model.entity.Tag; import run.halo.app.service.PostTagService; @@ -13,11 +13,6 @@ import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; import org.springframework.data.web.SortDefault; import org.springframework.web.bind.annotation.*; -import run.halo.app.model.dto.TagOutputDTO; -import run.halo.app.model.dto.post.PostSimpleOutputDTO; -import run.halo.app.model.entity.Tag; -import run.halo.app.service.PostTagService; -import run.halo.app.service.TagService; import java.util.List; @@ -44,8 +39,8 @@ public class TagController { @GetMapping @ApiOperation("Lists tags") - public List listTags(@SortDefault(sort = "updateTime", direction = DESC) Sort sort, - @ApiParam("If the param is true, post count of tag will be returned") + public List listTags(@SortDefault(sort = "updateTime", direction = DESC) Sort sort, + @ApiParam("If the param is true, post count of tag will be returned") @RequestParam(name = "more", required = false, defaultValue = "false") Boolean more) { if (more) { return postTagService.listTagWithCountDtos(sort); diff --git a/src/main/java/run/halo/app/web/controller/content/api/UserController.java b/src/main/java/run/halo/app/web/controller/content/api/UserController.java index 7aa055790..665cbe3f3 100644 --- a/src/main/java/run/halo/app/web/controller/content/api/UserController.java +++ b/src/main/java/run/halo/app/web/controller/content/api/UserController.java @@ -1,6 +1,6 @@ package run.halo.app.web.controller.content.api; -import run.halo.app.model.dto.UserOutputDTO; +import run.halo.app.model.dto.UserDTO; import run.halo.app.service.UserService; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; @@ -25,7 +25,7 @@ public class UserController { @GetMapping("profile") @ApiOperation("Gets blogger profile") - public UserOutputDTO getProfile() { - return userService.getCurrentUser().map(user -> new UserOutputDTO().convertFrom(user)).get(); + public UserDTO getProfile() { + return userService.getCurrentUser().map(user -> new UserDTO().convertFrom(user)).get(); } }