diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/HistoryEventImpl.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/HistoryEventImpl.java index 6006975be..e1987ddc9 100644 --- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/HistoryEventImpl.java +++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/HistoryEventImpl.java @@ -1,6 +1,6 @@ package pro.taskana.simplehistory.impl; -import pro.taskana.history.api.TaskanaHistoryEvent; +import pro.taskana.history.api.events.TaskanaHistoryEvent; /** This entity contains the most important information about a history event. */ public class HistoryEventImpl extends TaskanaHistoryEvent { diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImpl.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImpl.java index 6670f50a1..5ee14290b 100644 --- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImpl.java +++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/SimpleHistoryServiceImpl.java @@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory; import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.history.api.TaskanaHistory; -import pro.taskana.history.api.TaskanaHistoryEvent; +import pro.taskana.history.api.events.TaskanaHistoryEvent; import pro.taskana.simplehistory.impl.mappings.HistoryEventMapper; import pro.taskana.simplehistory.impl.mappings.HistoryQueryMapper; import pro.taskana.simplehistory.query.HistoryQuery; diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/mappings/HistoryEventMapper.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/mappings/HistoryEventMapper.java index 2985a5b64..37411273c 100644 --- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/mappings/HistoryEventMapper.java +++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/mappings/HistoryEventMapper.java @@ -3,7 +3,7 @@ package pro.taskana.simplehistory.impl.mappings; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; -import pro.taskana.history.api.TaskanaHistoryEvent; +import pro.taskana.history.api.events.TaskanaHistoryEvent; /** This class is the mybatis mapping of workbaskets. */ @SuppressWarnings("checkstyle:LineLength") diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/resource/TaskHistoryEventAssembler.java b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/resource/TaskHistoryEventAssembler.java index 2e9449e47..ec99e4131 100644 --- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/resource/TaskHistoryEventAssembler.java +++ b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/resource/TaskHistoryEventAssembler.java @@ -3,7 +3,7 @@ package pro.taskana.rest.resource; import org.springframework.beans.BeanUtils; import org.springframework.hateoas.mvc.ResourceAssemblerSupport; -import pro.taskana.history.api.TaskanaHistoryEvent; +import pro.taskana.history.api.events.TaskanaHistoryEvent; import pro.taskana.simplehistory.impl.HistoryEventImpl; /** Transforms any {@link HistoryEventImpl} into its {@link TaskHistoryEventResource}. */ diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/resource/TaskHistoryEventResource.java b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/resource/TaskHistoryEventResource.java index 3c55be394..bf08b48da 100644 --- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/resource/TaskHistoryEventResource.java +++ b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/resource/TaskHistoryEventResource.java @@ -3,7 +3,7 @@ package pro.taskana.rest.resource; import javax.validation.constraints.NotNull; import org.springframework.hateoas.ResourceSupport; -import pro.taskana.history.api.TaskanaHistoryEvent; +import pro.taskana.history.api.events.TaskanaHistoryEvent; /** Resource class for {@link TaskanaHistoryEvent}. */ public class TaskHistoryEventResource extends ResourceSupport { diff --git a/lib/taskana-core/src/main/java/pro/taskana/history/api/TaskanaHistory.java b/lib/taskana-core/src/main/java/pro/taskana/history/api/TaskanaHistory.java index 45f56ff6d..95d4c2169 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/history/api/TaskanaHistory.java +++ b/lib/taskana-core/src/main/java/pro/taskana/history/api/TaskanaHistory.java @@ -1,6 +1,7 @@ package pro.taskana.history.api; import pro.taskana.TaskanaEngineConfiguration; +import pro.taskana.history.api.events.TaskanaHistoryEvent; /** Interface for TASKANA History Service Provider. */ public interface TaskanaHistory { diff --git a/lib/taskana-core/src/main/java/pro/taskana/history/api/TaskanaHistoryEvent.java b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/TaskanaHistoryEvent.java similarity index 99% rename from lib/taskana-core/src/main/java/pro/taskana/history/api/TaskanaHistoryEvent.java rename to lib/taskana-core/src/main/java/pro/taskana/history/api/events/TaskanaHistoryEvent.java index 95a6b5fbf..773e32f15 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/history/api/TaskanaHistoryEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/TaskanaHistoryEvent.java @@ -1,4 +1,4 @@ -package pro.taskana.history.api; +package pro.taskana.history.api.events; import java.time.Instant; diff --git a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/ClaimCancelledEvent.java b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/ClaimCancelledEvent.java similarity index 85% rename from lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/ClaimCancelledEvent.java rename to lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/ClaimCancelledEvent.java index ff0ea6055..1644944e6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/ClaimCancelledEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/ClaimCancelledEvent.java @@ -1,4 +1,4 @@ -package pro.taskana.history.internal.events.task; +package pro.taskana.history.api.events.task; import pro.taskana.task.api.Task; diff --git a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/ClaimedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/ClaimedEvent.java similarity index 83% rename from lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/ClaimedEvent.java rename to lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/ClaimedEvent.java index 58c8b79a7..9830f3309 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/ClaimedEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/ClaimedEvent.java @@ -1,4 +1,4 @@ -package pro.taskana.history.internal.events.task; +package pro.taskana.history.api.events.task; import pro.taskana.task.api.Task; diff --git a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/CompletedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/CompletedEvent.java similarity index 90% rename from lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/CompletedEvent.java rename to lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/CompletedEvent.java index c9bcb7181..7e7248820 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/CompletedEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/CompletedEvent.java @@ -1,4 +1,4 @@ -package pro.taskana.history.internal.events.task; +package pro.taskana.history.api.events.task; import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskSummary; diff --git a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/CreatedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/CreatedEvent.java similarity index 83% rename from lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/CreatedEvent.java rename to lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/CreatedEvent.java index 2d1a27871..28d1b3872 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/CreatedEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/CreatedEvent.java @@ -1,4 +1,4 @@ -package pro.taskana.history.internal.events.task; +package pro.taskana.history.api.events.task; import pro.taskana.task.api.Task; diff --git a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/TaskEvent.java b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/TaskEvent.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/TaskEvent.java rename to lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/TaskEvent.java index c66f3ce07..cbe06af62 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/TaskEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/TaskEvent.java @@ -1,6 +1,6 @@ -package pro.taskana.history.internal.events.task; +package pro.taskana.history.api.events.task; -import pro.taskana.history.api.TaskanaHistoryEvent; +import pro.taskana.history.api.events.TaskanaHistoryEvent; import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskSummary; diff --git a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/TransferredEvent.java b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/TransferredEvent.java similarity index 92% rename from lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/TransferredEvent.java rename to lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/TransferredEvent.java index cc09af28e..fc47eb505 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/history/internal/events/task/TransferredEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/history/api/events/task/TransferredEvent.java @@ -1,4 +1,4 @@ -package pro.taskana.history.internal.events.task; +package pro.taskana.history.api.events.task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/lib/taskana-core/src/main/java/pro/taskana/history/internal/HistoryEventProducer.java b/lib/taskana-core/src/main/java/pro/taskana/history/internal/HistoryEventProducer.java index 614f4eaa0..f453b0301 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/history/internal/HistoryEventProducer.java +++ b/lib/taskana-core/src/main/java/pro/taskana/history/internal/HistoryEventProducer.java @@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory; import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.history.api.TaskanaHistory; -import pro.taskana.history.api.TaskanaHistoryEvent; +import pro.taskana.history.api.events.TaskanaHistoryEvent; /** Creates events and emits them to the registered history service providers. */ public final class HistoryEventProducer { diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java index e4e8b398d..0181220c7 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java @@ -34,11 +34,11 @@ import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.common.internal.util.IdGenerator; import pro.taskana.common.internal.util.LoggerUtils; +import pro.taskana.history.api.events.task.ClaimCancelledEvent; +import pro.taskana.history.api.events.task.ClaimedEvent; +import pro.taskana.history.api.events.task.CompletedEvent; +import pro.taskana.history.api.events.task.CreatedEvent; import pro.taskana.history.internal.HistoryEventProducer; -import pro.taskana.history.internal.events.task.ClaimCancelledEvent; -import pro.taskana.history.internal.events.task.ClaimedEvent; -import pro.taskana.history.internal.events.task.CompletedEvent; -import pro.taskana.history.internal.events.task.CreatedEvent; import pro.taskana.report.internal.DaysToWorkingDaysConverter; import pro.taskana.report.internal.header.TimeIntervalColumnHeader; import pro.taskana.task.api.Attachment; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskTransferrer.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskTransferrer.java index 2d5f95e14..dc32142f6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskTransferrer.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskTransferrer.java @@ -18,8 +18,8 @@ import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.common.internal.util.LoggerUtils; +import pro.taskana.history.api.events.task.TransferredEvent; import pro.taskana.history.internal.HistoryEventProducer; -import pro.taskana.history.internal.events.task.TransferredEvent; import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.TaskNotFoundException;