From 5cfcae6911f168b1e73f3199c34886dd469d1789 Mon Sep 17 00:00:00 2001 From: johnniang Date: Wed, 24 Apr 2019 11:40:24 +0800 Subject: [PATCH] Change Page entity to Sheet --- .../halo/app/event/comment/CommentEventListener.java | 1 - .../halo/app/model/entity/{Page.java => Sheet.java} | 4 ++-- .../{PageRepository.java => SheetRepository.java} | 5 ++--- ...ageRepositoryTest.java => SheetRepositoryTest.java} | 10 +++++----- 4 files changed, 9 insertions(+), 11 deletions(-) rename src/main/java/run/halo/app/model/entity/{Page.java => Sheet.java} (76%) rename src/main/java/run/halo/app/repository/{PageRepository.java => SheetRepository.java} (50%) rename src/test/java/run/halo/app/repository/{PageRepositoryTest.java => SheetRepositoryTest.java} (72%) 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 e02ad533f..554eb1df2 100644 --- a/src/main/java/run/halo/app/event/comment/CommentEventListener.java +++ b/src/main/java/run/halo/app/event/comment/CommentEventListener.java @@ -15,7 +15,6 @@ import run.halo.app.service.*; import java.util.HashMap; import java.util.Map; -import java.util.Optional; /** * Comment event listener. diff --git a/src/main/java/run/halo/app/model/entity/Page.java b/src/main/java/run/halo/app/model/entity/Sheet.java similarity index 76% rename from src/main/java/run/halo/app/model/entity/Page.java rename to src/main/java/run/halo/app/model/entity/Sheet.java index 0d8ae0744..a58520679 100644 --- a/src/main/java/run/halo/app/model/entity/Page.java +++ b/src/main/java/run/halo/app/model/entity/Sheet.java @@ -9,7 +9,7 @@ import javax.persistence.Entity; * @author johnniang * @date 3/22/19 */ -@Entity(name = "Page") +@Entity(name = "Sheet") @DiscriminatorValue("1") -public class Page extends BasePost { +public class Sheet extends BasePost { } diff --git a/src/main/java/run/halo/app/repository/PageRepository.java b/src/main/java/run/halo/app/repository/SheetRepository.java similarity index 50% rename from src/main/java/run/halo/app/repository/PageRepository.java rename to src/main/java/run/halo/app/repository/SheetRepository.java index f65824a50..f63201e13 100644 --- a/src/main/java/run/halo/app/repository/PageRepository.java +++ b/src/main/java/run/halo/app/repository/SheetRepository.java @@ -1,7 +1,6 @@ package run.halo.app.repository; -import run.halo.app.model.entity.Page; -import run.halo.app.repository.base.BasePostRepository; +import run.halo.app.model.entity.Sheet; import run.halo.app.repository.base.BasePostRepository; /** @@ -10,6 +9,6 @@ import run.halo.app.repository.base.BasePostRepository; * @author johnniang * @date 3/22/19 */ -public interface PageRepository extends BasePostRepository { +public interface SheetRepository extends BasePostRepository { } diff --git a/src/test/java/run/halo/app/repository/PageRepositoryTest.java b/src/test/java/run/halo/app/repository/SheetRepositoryTest.java similarity index 72% rename from src/test/java/run/halo/app/repository/PageRepositoryTest.java rename to src/test/java/run/halo/app/repository/SheetRepositoryTest.java index a7868f6e8..4db9ec92b 100644 --- a/src/test/java/run/halo/app/repository/PageRepositoryTest.java +++ b/src/test/java/run/halo/app/repository/SheetRepositoryTest.java @@ -1,6 +1,6 @@ package run.halo.app.repository; -import run.halo.app.model.entity.Page; +import run.halo.app.model.entity.Sheet; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -19,14 +19,14 @@ import java.util.List; @RunWith(SpringRunner.class) @SpringBootTest @ActiveProfiles("test") -public class PageRepositoryTest { +public class SheetRepositoryTest { @Autowired - private PageRepository pageRepository; + private SheetRepository sheetRepository; @Test public void listAllTest() { - List allPages = pageRepository.findAll(); - System.out.println(allPages); + List allSheets = sheetRepository.findAll(); + System.out.println(allSheets); } }