From 3691ea624d3e8ec7e04dffa269be206567835bab Mon Sep 17 00:00:00 2001 From: Joerg Heffner <56156750+gitgoodjhe@users.noreply.github.com> Date: Thu, 13 Aug 2020 09:19:00 +0200 Subject: [PATCH] TSK-1369: Refactor TaskHistoryCustomField from events package to events/task --- .../pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java | 2 +- .../pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java | 2 +- .../src/test/java/acceptance/query/QueryTaskHistoryAccTest.java | 2 +- .../taskana/simplehistory/rest/TaskHistoryEventController.java | 2 +- .../assembler/TaskHistoryEventRepresentationModelAssembler.java | 2 +- .../TaskHistoryEventRepresentationModelAssemblerTest.java | 2 +- .../history/api/events/{ => task}/TaskHistoryCustomField.java | 2 +- .../taskana/spi/history/api/events/task/TaskHistoryEvent.java | 1 - 8 files changed, 7 insertions(+), 8 deletions(-) rename lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/{ => task}/TaskHistoryCustomField.java (63%) diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java index 13324e72f..f874dc9b1 100644 --- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java +++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java @@ -11,7 +11,7 @@ import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.SystemException; import pro.taskana.simplehistory.impl.task.TaskHistoryQuery; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryColumnName; -import pro.taskana.spi.history.api.events.TaskHistoryCustomField; +import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; /** Implementation for generating dynamic sql. */ diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java index af20e78e9..5429a581c 100644 --- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java +++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/task/TaskHistoryQuery.java @@ -2,7 +2,7 @@ package pro.taskana.simplehistory.impl.task; import pro.taskana.common.api.BaseQuery; import pro.taskana.common.api.TimeInterval; -import pro.taskana.spi.history.api.events.TaskHistoryCustomField; +import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; /** HistoryQuery for generating dynamic sql. */ diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java index 824de91b7..9903956aa 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/query/QueryTaskHistoryAccTest.java @@ -12,7 +12,7 @@ import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.TimeInterval; import pro.taskana.simplehistory.impl.task.TaskHistoryQuery; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryColumnName; -import pro.taskana.spi.history.api.events.TaskHistoryCustomField; +import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; import pro.taskana.spi.history.api.events.task.TaskHistoryEventType; diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryEventController.java b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryEventController.java index c91b36d65..d2a771bc0 100644 --- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryEventController.java +++ b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/TaskHistoryEventController.java @@ -30,7 +30,7 @@ import pro.taskana.simplehistory.rest.assembler.TaskHistoryEventListResourceAsse import pro.taskana.simplehistory.rest.assembler.TaskHistoryEventRepresentationModelAssembler; import pro.taskana.simplehistory.rest.models.TaskHistoryEventListResource; import pro.taskana.simplehistory.rest.models.TaskHistoryEventRepresentationModel; -import pro.taskana.spi.history.api.events.TaskHistoryCustomField; +import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; import pro.taskana.spi.history.api.exceptions.TaskanaHistoryEventNotFoundException; diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssembler.java b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssembler.java index 820a3d825..3310b5f5e 100644 --- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssembler.java +++ b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssembler.java @@ -9,7 +9,7 @@ import org.springframework.lang.NonNull; import pro.taskana.common.api.exceptions.SystemException; import pro.taskana.simplehistory.rest.TaskHistoryEventController; import pro.taskana.simplehistory.rest.models.TaskHistoryEventRepresentationModel; -import pro.taskana.spi.history.api.events.TaskHistoryCustomField; +import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; /** Transforms any {@link TaskHistoryEvent} into its {@link TaskHistoryEventRepresentationModel}. */ diff --git a/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssemblerTest.java b/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssemblerTest.java index e3b833ff8..a59865dd7 100644 --- a/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssemblerTest.java +++ b/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/assembler/TaskHistoryEventRepresentationModelAssemblerTest.java @@ -11,7 +11,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import pro.taskana.simplehistory.rest.TaskHistoryRestConfiguration; import pro.taskana.simplehistory.rest.models.TaskHistoryEventRepresentationModel; -import pro.taskana.spi.history.api.events.TaskHistoryCustomField; +import pro.taskana.spi.history.api.events.task.TaskHistoryCustomField; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; /** Test for {@link TaskHistoryEventRepresentationModelAssembler}. */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/TaskHistoryCustomField.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryCustomField.java similarity index 63% rename from lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/TaskHistoryCustomField.java rename to lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryCustomField.java index f5dd74bb3..7267afb38 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/TaskHistoryCustomField.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryCustomField.java @@ -1,4 +1,4 @@ -package pro.taskana.spi.history.api.events; +package pro.taskana.spi.history.api.events.task; public enum TaskHistoryCustomField { CUSTOM_1, diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java index 6fdbcd6c7..7c9150567 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskHistoryEvent.java @@ -4,7 +4,6 @@ import java.time.Instant; import java.util.Objects; import pro.taskana.common.api.exceptions.SystemException; -import pro.taskana.spi.history.api.events.TaskHistoryCustomField; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.models.TaskSummary;