diff --git a/src/main/java/run/halo/app/model/vo/CommentVO.java b/src/main/java/run/halo/app/model/vo/CommentVO.java deleted file mode 100644 index b823960d8..000000000 --- a/src/main/java/run/halo/app/model/vo/CommentVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package run.halo.app.model.vo; - -import lombok.Data; -import lombok.ToString; -import run.halo.app.model.dto.CommentDTO; - -import java.util.List; - -/** - * Comment vo. - * - * @author johnniang - * @date 3/25/19 - */ -@Data -@ToString(callSuper = true) -@Deprecated -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 deleted file mode 100644 index bbd3e2f59..000000000 --- a/src/main/java/run/halo/app/model/vo/CommentWithParentVO.java +++ /dev/null @@ -1,35 +0,0 @@ -package run.halo.app.model.vo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.extern.slf4j.Slf4j; -import run.halo.app.model.dto.CommentDTO; - -/** - * Comment list with parent comment vo. - * - * @author johnniang - * @date 3/31/19 - */ -@Data -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = true) -@Slf4j -@Deprecated -public class CommentWithParentVO extends CommentDTO implements Cloneable { - - /** - * Parent comment. - */ - private CommentWithParentVO parent; - - public CommentWithParentVO clone() { - try { - return (CommentWithParentVO) super.clone(); - } catch (CloneNotSupportedException e) { - log.error("Clone not support exception", e); - return null; - } - } -} diff --git a/src/main/java/run/halo/app/service/base/BaseCommentService.java b/src/main/java/run/halo/app/service/base/BaseCommentService.java index 4020a5a74..804379bf6 100644 --- a/src/main/java/run/halo/app/service/base/BaseCommentService.java +++ b/src/main/java/run/halo/app/service/base/BaseCommentService.java @@ -28,7 +28,6 @@ public interface BaseCommentService extends CrudSer * %s: parent commentator author name * %s: comment content */ - @Deprecated String COMMENT_TEMPLATE = "@%s %s"; /** diff --git a/src/main/java/run/halo/app/service/base/BaseCommentServiceImpl.java b/src/main/java/run/halo/app/service/base/BaseCommentServiceImpl.java index bd4279e43..4cb8c29ec 100644 --- a/src/main/java/run/halo/app/service/base/BaseCommentServiceImpl.java +++ b/src/main/java/run/halo/app/service/base/BaseCommentServiceImpl.java @@ -26,7 +26,6 @@ import run.halo.app.model.properties.CommentProperties; import run.halo.app.model.support.CommentPage; import run.halo.app.model.vo.BaseCommentVO; import run.halo.app.model.vo.BaseCommentWithParentVO; -import run.halo.app.model.vo.CommentWithParentVO; import run.halo.app.repository.PostRepository; import run.halo.app.repository.base.BaseCommentRepository; import run.halo.app.security.authentication.Authentication; @@ -183,7 +182,7 @@ public abstract class BaseCommentServiceImpl extend if (parentComment != null) { // Convert to parent comment vo - parentCommentVo = new CommentWithParentVO().convertFrom(parentComment); + parentCommentVo = new BaseCommentWithParentVO().convertFrom(parentComment); // Cache the parent comment vo parentCommentVoMap.put(parentComment.getId(), parentCommentVo); }