From 6a644b7db25a63cf16aa59e4a301bf98439c4bfe Mon Sep 17 00:00:00 2001 From: Marcel Lengl <52546181+LenglBoy@users.noreply.github.com> Date: Thu, 15 Feb 2018 12:18:23 +0100 Subject: [PATCH] TSK-248: Moved models to IMPL, resigned hardcoded Strings, deleted model-package. --- .../java/pro/taskana/ExampleBootstrap.java | 2 +- .../src/test/java/pro/taskana/TaskanaEjb.java | 2 +- .../java/pro/taskana/TaskanaRestTest.java | 4 +- .../src/main/java/pro/taskana/Attachment.java | 2 +- .../pro/taskana/ObjectReferenceQuery.java | 2 +- .../src/main/java/pro/taskana/Task.java | 4 +- .../java/pro/taskana/TaskMonitorService.java | 6 +- .../src/main/java/pro/taskana/TaskQuery.java | 2 +- .../main/java/pro/taskana/TaskService.java | 2 +- .../main/java/pro/taskana/TaskSummary.java | 4 +- .../src/main/java/pro/taskana/Workbasket.java | 2 +- .../java/pro/taskana/WorkbasketQuery.java | 4 +- .../java/pro/taskana/WorkbasketService.java | 2 +- .../java/pro/taskana/WorkbasketSummary.java | 2 +- .../java/pro/taskana/impl/AttachmentImpl.java | 1 - .../taskana/impl/ClassificationQueryImpl.java | 4 +- .../impl/ClassificationServiceImpl.java | 2 +- .../impl/DaysToWorkingDaysConverter.java | 1 - .../pro/taskana/impl/MinimalTaskSummary.java | 2 - .../{model => impl}/MonitorQueryItem.java | 2 +- .../{model => impl}/ObjectReference.java | 2 +- .../impl/ObjectReferenceQueryImpl.java | 5 +- .../pro/taskana/{model => impl}/Report.java | 2 +- .../taskana/{model => impl}/ReportLine.java | 2 +- .../{model => impl}/ReportLineItem.java | 2 +- .../ReportLineItemDefinition.java | 2 +- .../main/java/pro/taskana/impl/TaskImpl.java | 2 - .../taskana/impl/TaskMonitorServiceImpl.java | 8 +- .../java/pro/taskana/impl/TaskQueryImpl.java | 6 +- .../pro/taskana/impl/TaskServiceImpl.java | 7 +- .../taskana/{model => impl}/TaskState.java | 2 +- .../pro/taskana/impl/TaskSummaryImpl.java | 2 - .../pro/taskana/impl/TaskanaEngineImpl.java | 18 +- .../impl/WorkbasketAccessItemQueryImpl.java | 4 +- .../WorkbasketAuthorization.java | 2 +- .../java/pro/taskana/impl/WorkbasketImpl.java | 1 - .../pro/taskana/impl/WorkbasketQueryImpl.java | 6 +- .../taskana/impl/WorkbasketServiceImpl.java | 7 +- .../taskana/impl/WorkbasketSummaryImpl.java | 1 - .../{model => impl}/WorkbasketType.java | 2 +- .../mappings/AttachmentMapper.java | 2 +- .../mappings/ClassificationMapper.java | 2 +- .../mappings/DistributionTargetMapper.java | 2 +- .../mappings/ObjectReferenceMapper.java | 5 +- .../{model => }/mappings/QueryMapper.java | 12 +- .../{model => }/mappings/TaskMapper.java | 12 +- .../mappings/TaskMonitorMapper.java | 6 +- .../mappings/WorkbasketAccessMapper.java | 2 +- .../mappings/WorkbasketMapper.java | 4 +- .../test/java/acceptance/AbstractAccTest.java | 2 +- .../ProvideCategoryReportAccTest.java | 6 +- .../ProvideClassificationReportAccTest.java | 8 +- .../ProvideCustomFieldValueReportAccTest.java | 8 +- .../ProvideWorkbasketLevelReportAccTest.java | 6 +- ...ObjectreferencesWithPaginationAccTest.java | 2 +- .../acceptance/task/CreateTaskAccTest.java | 2 +- .../task/QueryTasksWithSortingAccTest.java | 2 +- .../acceptance/task/TransferTaskAccTest.java | 2 +- .../acceptance/task/WorkOnTaskAccTest.java | 2 +- .../workbasket/CreateWorkbasketAccTest.java | 2 +- .../workbasket/GetWorkbasketAccTest.java | 4 +- .../workbasket/QueryWorkbasketAccTest.java | 2 +- .../QueryWorkbasketByPermissionAccTest.java | 2 +- .../workbasket/UpdateWorkbasketAccTest.java | 2 +- .../impl/ClassificationServiceImplTest.java | 2 +- .../impl/DaysToWorkingDaysConverterTest.java | 2 - .../java/pro/taskana/impl/JunitHelper.java | 1 - .../impl/ObjectReferenceQueryImplTest.java | 1 - .../impl/TaskMonitorServiceImplTest.java | 8 +- .../pro/taskana/impl/TaskQueryImplTest.java | 1 - .../pro/taskana/impl/TaskServiceImplTest.java | 9 +- .../impl/WorkbasketServiceImplTest.java | 8 +- .../TaskServiceImplIntAutocommitTest.java | 6 +- .../TaskServiceImplIntExplicitTest.java | 6 +- ...orkbasketServiceImplIntAutocommitTest.java | 6 +- .../WorkbasketServiceImplIntExplicitTest.java | 2 +- .../java/pro/taskana/ExampleBootstrap.java | 2 +- .../springtx/TaskanaTestController.java | 2 +- .../java/pro/taskana/TaskanaComponent.java | 2 +- .../pro/taskana/rest/MonitorController.java | 2 +- .../java/pro/taskana/rest/TaskController.java | 2 +- .../taskana/rest/WorkbasketController.java | 221 ++++++++++-------- .../rest/dto/WorkbasketSummaryDto.java | 5 +- .../pro/taskana/rest/query/TaskFilter.java | 2 +- 84 files changed, 254 insertions(+), 270 deletions(-) rename lib/taskana-core/src/main/java/pro/taskana/{model => impl}/MonitorQueryItem.java (91%) rename lib/taskana-core/src/main/java/pro/taskana/{model => impl}/ObjectReference.java (99%) rename lib/taskana-core/src/main/java/pro/taskana/{model => impl}/Report.java (95%) rename lib/taskana-core/src/main/java/pro/taskana/{model => impl}/ReportLine.java (95%) rename lib/taskana-core/src/main/java/pro/taskana/{model => impl}/ReportLineItem.java (97%) rename lib/taskana-core/src/main/java/pro/taskana/{model => impl}/ReportLineItemDefinition.java (95%) rename lib/taskana-core/src/main/java/pro/taskana/{model => impl}/TaskState.java (80%) rename lib/taskana-core/src/main/java/pro/taskana/{model => impl}/WorkbasketAuthorization.java (92%) rename lib/taskana-core/src/main/java/pro/taskana/{model => impl}/WorkbasketType.java (83%) rename lib/taskana-core/src/main/java/pro/taskana/{model => }/mappings/AttachmentMapper.java (99%) rename lib/taskana-core/src/main/java/pro/taskana/{model => }/mappings/ClassificationMapper.java (99%) rename lib/taskana-core/src/main/java/pro/taskana/{model => }/mappings/DistributionTargetMapper.java (97%) rename lib/taskana-core/src/main/java/pro/taskana/{model => }/mappings/ObjectReferenceMapper.java (97%) rename lib/taskana-core/src/main/java/pro/taskana/{model => }/mappings/QueryMapper.java (98%) rename lib/taskana-core/src/main/java/pro/taskana/{model => }/mappings/TaskMapper.java (96%) rename lib/taskana-core/src/main/java/pro/taskana/{model => }/mappings/TaskMonitorMapper.java (96%) rename lib/taskana-core/src/main/java/pro/taskana/{model => }/mappings/WorkbasketAccessMapper.java (99%) rename lib/taskana-core/src/main/java/pro/taskana/{model => }/mappings/WorkbasketMapper.java (99%) diff --git a/lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java b/lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java index f1ce03d51..9ce2d29d8 100644 --- a/lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java +++ b/lib/taskana-cdi-example/src/main/java/pro/taskana/ExampleBootstrap.java @@ -15,7 +15,7 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskAlreadyExistException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.model.ObjectReference; +import pro.taskana.impl.ObjectReference; @ApplicationScoped public class ExampleBootstrap { diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java index f0e60436d..468b1f56c 100644 --- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java +++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java @@ -9,7 +9,7 @@ import pro.taskana.exceptions.InvalidWorkbasketException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskAlreadyExistException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.model.ObjectReference; +import pro.taskana.impl.ObjectReference; @Stateless public class TaskanaEjb { diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java index 7cf744d47..89bc72a72 100644 --- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java +++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java @@ -22,8 +22,8 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskAlreadyExistException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.model.ObjectReference; -import pro.taskana.model.WorkbasketType; +import pro.taskana.impl.ObjectReference; +import pro.taskana.impl.WorkbasketType; @Path("/test") public class TaskanaRestTest { diff --git a/lib/taskana-core/src/main/java/pro/taskana/Attachment.java b/lib/taskana-core/src/main/java/pro/taskana/Attachment.java index f60d3d096..04b48094e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/Attachment.java +++ b/lib/taskana-core/src/main/java/pro/taskana/Attachment.java @@ -3,7 +3,7 @@ package pro.taskana; import java.time.Instant; import java.util.Map; -import pro.taskana.model.ObjectReference; +import pro.taskana.impl.ObjectReference; /** * Attachment-Interface to specify Attachment Attributes. diff --git a/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQuery.java b/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQuery.java index d5ea95a0f..9d2e13d8f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQuery.java @@ -1,6 +1,6 @@ package pro.taskana; -import pro.taskana.model.ObjectReference; +import pro.taskana.impl.ObjectReference; /** * ObjectReferenceQuery for generating dynamic sql. diff --git a/lib/taskana-core/src/main/java/pro/taskana/Task.java b/lib/taskana-core/src/main/java/pro/taskana/Task.java index 211375ed2..2e790d264 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/Task.java +++ b/lib/taskana-core/src/main/java/pro/taskana/Task.java @@ -4,8 +4,8 @@ import java.time.Instant; import java.util.List; import java.util.Map; -import pro.taskana.model.ObjectReference; -import pro.taskana.model.TaskState; +import pro.taskana.impl.ObjectReference; +import pro.taskana.impl.TaskState; /** * task-Interface to specify attribute interactions. diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskMonitorService.java b/lib/taskana-core/src/main/java/pro/taskana/TaskMonitorService.java index 37a4f19f9..fb8dd5709 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/TaskMonitorService.java +++ b/lib/taskana-core/src/main/java/pro/taskana/TaskMonitorService.java @@ -3,9 +3,9 @@ package pro.taskana; import java.util.List; import pro.taskana.impl.CustomField; -import pro.taskana.model.Report; -import pro.taskana.model.ReportLineItemDefinition; -import pro.taskana.model.TaskState; +import pro.taskana.impl.Report; +import pro.taskana.impl.ReportLineItemDefinition; +import pro.taskana.impl.TaskState; /** * The Task Monitor Service manages operations on tasks regarding the monitoring. diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java b/lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java index caaa5c8e1..b68388594 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java @@ -1,6 +1,6 @@ package pro.taskana; -import pro.taskana.model.TaskState; +import pro.taskana.impl.TaskState; /** * TaskQuery for generating dynamic sql. diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskService.java b/lib/taskana-core/src/main/java/pro/taskana/TaskService.java index 889b8e751..a6bb3a8e9 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/TaskService.java +++ b/lib/taskana-core/src/main/java/pro/taskana/TaskService.java @@ -15,7 +15,7 @@ import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.TaskanaException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.BulkOperationResults; -import pro.taskana.model.TaskState; +import pro.taskana.impl.TaskState; /** * The Task Service manages all operations on tasks. diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskSummary.java b/lib/taskana-core/src/main/java/pro/taskana/TaskSummary.java index 6cb824635..28321a6af 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/TaskSummary.java +++ b/lib/taskana-core/src/main/java/pro/taskana/TaskSummary.java @@ -2,8 +2,8 @@ package pro.taskana; import java.time.Instant; -import pro.taskana.model.ObjectReference; -import pro.taskana.model.TaskState; +import pro.taskana.impl.ObjectReference; +import pro.taskana.impl.TaskState; /** * Interface for TaskSummary. This is a specific short model-object which only contains the most important information. diff --git a/lib/taskana-core/src/main/java/pro/taskana/Workbasket.java b/lib/taskana-core/src/main/java/pro/taskana/Workbasket.java index 517dde3e2..5cd4c5ec6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/Workbasket.java +++ b/lib/taskana-core/src/main/java/pro/taskana/Workbasket.java @@ -2,7 +2,7 @@ package pro.taskana; import java.time.Instant; -import pro.taskana.model.WorkbasketType; +import pro.taskana.impl.WorkbasketType; /** * Workbasket entity interface. diff --git a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQuery.java b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQuery.java index ed4f589de..85dc901b7 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQuery.java @@ -3,8 +3,8 @@ package pro.taskana; import java.time.Instant; import pro.taskana.exceptions.InvalidArgumentException; -import pro.taskana.model.WorkbasketAuthorization; -import pro.taskana.model.WorkbasketType; +import pro.taskana.impl.WorkbasketAuthorization; +import pro.taskana.impl.WorkbasketType; /** * WorkitemQuery for generating dynamic sql. diff --git a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java index 77810c72f..fdab07694 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java +++ b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java @@ -7,7 +7,7 @@ import pro.taskana.exceptions.InvalidWorkbasketException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.WorkbasketInUseException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.model.WorkbasketAuthorization; +import pro.taskana.impl.WorkbasketAuthorization; /** * This service manages Workbaskets. diff --git a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketSummary.java b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketSummary.java index 982249b3f..2bf76a644 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketSummary.java +++ b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketSummary.java @@ -1,6 +1,6 @@ package pro.taskana; -import pro.taskana.model.WorkbasketType; +import pro.taskana.impl.WorkbasketType; /** * Interface for WorkbasketSummary. This is a specific short model-object which only contains the most important diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentImpl.java index a9487cf29..e08d44332 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/AttachmentImpl.java @@ -7,7 +7,6 @@ import java.util.Map; import pro.taskana.Attachment; import pro.taskana.AttachmentSummary; import pro.taskana.ClassificationSummary; -import pro.taskana.model.ObjectReference; /** * Attachment entity. diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java index 704cfb2c8..30f11e641 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java @@ -22,8 +22,8 @@ import pro.taskana.impl.util.LoggerUtils; */ public class ClassificationQueryImpl implements ClassificationQuery { - private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryClassification"; - private static final String LINK_TO_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryClassifications"; + private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryClassification"; + private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryClassifications"; private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationQueryImpl.class); private TaskanaEngineImpl taskanaEngineImpl; private String[] key; diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java index 32bae8c71..64f685994 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java @@ -22,7 +22,7 @@ import pro.taskana.exceptions.NotAuthorizedToQueryWorkbasketException; import pro.taskana.exceptions.SystemException; import pro.taskana.impl.util.IdGenerator; import pro.taskana.impl.util.LoggerUtils; -import pro.taskana.model.mappings.ClassificationMapper; +import pro.taskana.mappings.ClassificationMapper; /** * This is the implementation of ClassificationService. diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/DaysToWorkingDaysConverter.java b/lib/taskana-core/src/main/java/pro/taskana/impl/DaysToWorkingDaysConverter.java index d8d75c3d5..08a0d500f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/DaysToWorkingDaysConverter.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/DaysToWorkingDaysConverter.java @@ -9,7 +9,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pro.taskana.impl.util.LoggerUtils; -import pro.taskana.model.ReportLineItemDefinition; /** * The DaysToWorkingDaysConverter provides a method to convert an age in days into an age in working days. Before the diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/MinimalTaskSummary.java b/lib/taskana-core/src/main/java/pro/taskana/impl/MinimalTaskSummary.java index 24bd3783f..207be3f30 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/MinimalTaskSummary.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/MinimalTaskSummary.java @@ -1,7 +1,5 @@ package pro.taskana.impl; -import pro.taskana.model.TaskState; - /** * A convenience class to represent pairs of task id and task state. */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/MonitorQueryItem.java b/lib/taskana-core/src/main/java/pro/taskana/impl/MonitorQueryItem.java similarity index 91% rename from lib/taskana-core/src/main/java/pro/taskana/model/MonitorQueryItem.java rename to lib/taskana-core/src/main/java/pro/taskana/impl/MonitorQueryItem.java index b2d47b7b6..cdc968b4c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/MonitorQueryItem.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/MonitorQueryItem.java @@ -1,4 +1,4 @@ -package pro.taskana.model; +package pro.taskana.impl; /** * The MonitorQueryItem entity contains the number of tasks for a key (e.g. workbasketKey) and age in days. diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReference.java similarity index 99% rename from lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java rename to lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReference.java index 6485f65b0..ddd7a5f63 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReference.java @@ -1,4 +1,4 @@ -package pro.taskana.model; +package pro.taskana.impl; /** * ObjectReference entity. diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java index 662708bfa..ee9d6fd53 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java @@ -12,7 +12,6 @@ import pro.taskana.ObjectReferenceQuery; import pro.taskana.TaskanaEngine; import pro.taskana.exceptions.TaskanaRuntimeException; import pro.taskana.impl.util.LoggerUtils; -import pro.taskana.model.ObjectReference; /** * Implementation of ObjectReferenceQuery interface. @@ -21,8 +20,8 @@ import pro.taskana.model.ObjectReference; */ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery { - private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryObjectReference"; - private static final String LINK_TO_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryObjectReferences"; + private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryObjectReference"; + private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryObjectReferences"; private static final Logger LOGGER = LoggerFactory.getLogger(ObjectReferenceQueryImpl.class); private TaskanaEngineImpl taskanaEngineImpl; diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/Report.java b/lib/taskana-core/src/main/java/pro/taskana/impl/Report.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/model/Report.java rename to lib/taskana-core/src/main/java/pro/taskana/impl/Report.java index 462aecdd2..43df31925 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/Report.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/Report.java @@ -1,4 +1,4 @@ -package pro.taskana.model; +package pro.taskana.impl; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/ReportLine.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ReportLine.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/model/ReportLine.java rename to lib/taskana-core/src/main/java/pro/taskana/impl/ReportLine.java index 1f62127ef..1e889c47a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/ReportLine.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ReportLine.java @@ -1,4 +1,4 @@ -package pro.taskana.model; +package pro.taskana.impl; import java.util.ArrayList; import java.util.List; diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/ReportLineItem.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ReportLineItem.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/model/ReportLineItem.java rename to lib/taskana-core/src/main/java/pro/taskana/impl/ReportLineItem.java index daa3c4b08..edcd9ce45 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/ReportLineItem.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ReportLineItem.java @@ -1,4 +1,4 @@ -package pro.taskana.model; +package pro.taskana.impl; /** * Each ReportLineItem consists of a {@link ReportLineItemDefinition} that defines the upper and lower age limits of diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/ReportLineItemDefinition.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ReportLineItemDefinition.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/model/ReportLineItemDefinition.java rename to lib/taskana-core/src/main/java/pro/taskana/impl/ReportLineItemDefinition.java index b772dafbc..a65ff313e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/ReportLineItemDefinition.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ReportLineItemDefinition.java @@ -1,4 +1,4 @@ -package pro.taskana.model; +package pro.taskana.impl; /** * A ReportLineItemDefinition has a lower and an upper age limit which subdivide the count of tasks into different diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskImpl.java index 800a9d455..ea5463641 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskImpl.java @@ -13,8 +13,6 @@ import pro.taskana.ClassificationSummary; import pro.taskana.Task; import pro.taskana.TaskSummary; import pro.taskana.WorkbasketSummary; -import pro.taskana.model.ObjectReference; -import pro.taskana.model.TaskState; /** * Task entity. diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java index bb81f855f..77d47635a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java @@ -9,13 +9,7 @@ import pro.taskana.TaskMonitorService; import pro.taskana.TaskanaEngine; import pro.taskana.Workbasket; import pro.taskana.impl.util.LoggerUtils; -import pro.taskana.model.MonitorQueryItem; -import pro.taskana.model.Report; -import pro.taskana.model.ReportLine; -import pro.taskana.model.ReportLineItem; -import pro.taskana.model.ReportLineItemDefinition; -import pro.taskana.model.TaskState; -import pro.taskana.model.mappings.TaskMonitorMapper; +import pro.taskana.mappings.TaskMonitorMapper; /** * This is the implementation of TaskMonitorService. diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java index 1c880d04c..c2dac6333 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java @@ -18,16 +18,14 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.NotAuthorizedToQueryWorkbasketException; import pro.taskana.exceptions.TaskanaRuntimeException; import pro.taskana.impl.util.LoggerUtils; -import pro.taskana.model.TaskState; -import pro.taskana.model.WorkbasketAuthorization; /** * TaskQuery for generating dynamic sql. */ public class TaskQueryImpl implements TaskQuery { - private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryTasks"; - private static final String LINK_TO_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryTasks"; + private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryTasks"; + private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryTasks"; private static final Logger LOGGER = LoggerFactory.getLogger(TaskQueryImpl.class); private TaskanaEngineImpl taskanaEngineImpl; private TaskServiceImpl taskService; diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java index a4f6c703d..c89079ee6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java @@ -40,11 +40,8 @@ import pro.taskana.exceptions.TaskanaException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.util.IdGenerator; import pro.taskana.impl.util.LoggerUtils; -import pro.taskana.model.ObjectReference; -import pro.taskana.model.TaskState; -import pro.taskana.model.WorkbasketAuthorization; -import pro.taskana.model.mappings.AttachmentMapper; -import pro.taskana.model.mappings.TaskMapper; +import pro.taskana.mappings.AttachmentMapper; +import pro.taskana.mappings.TaskMapper; import pro.taskana.security.CurrentUserContext; /** diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/TaskState.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskState.java similarity index 80% rename from lib/taskana-core/src/main/java/pro/taskana/model/TaskState.java rename to lib/taskana-core/src/main/java/pro/taskana/impl/TaskState.java index 3138d1575..610adc98d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/TaskState.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskState.java @@ -1,4 +1,4 @@ -package pro.taskana.model; +package pro.taskana.impl; /** * This enum contains all status of the tasks. diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java index 9339a8f76..2cff91053 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java @@ -8,8 +8,6 @@ import pro.taskana.AttachmentSummary; import pro.taskana.ClassificationSummary; import pro.taskana.TaskSummary; import pro.taskana.WorkbasketSummary; -import pro.taskana.model.ObjectReference; -import pro.taskana.model.TaskState; /** * Entity which contains the most important informations about a Task. diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java index 883a8024e..779a0a283 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java @@ -28,15 +28,15 @@ import pro.taskana.exceptions.ConnectionNotSetException; import pro.taskana.exceptions.SystemException; import pro.taskana.exceptions.UnsupportedDatabaseException; import pro.taskana.impl.persistence.MapTypeHandler; -import pro.taskana.model.mappings.AttachmentMapper; -import pro.taskana.model.mappings.ClassificationMapper; -import pro.taskana.model.mappings.DistributionTargetMapper; -import pro.taskana.model.mappings.ObjectReferenceMapper; -import pro.taskana.model.mappings.QueryMapper; -import pro.taskana.model.mappings.TaskMapper; -import pro.taskana.model.mappings.TaskMonitorMapper; -import pro.taskana.model.mappings.WorkbasketAccessMapper; -import pro.taskana.model.mappings.WorkbasketMapper; +import pro.taskana.mappings.AttachmentMapper; +import pro.taskana.mappings.ClassificationMapper; +import pro.taskana.mappings.DistributionTargetMapper; +import pro.taskana.mappings.ObjectReferenceMapper; +import pro.taskana.mappings.QueryMapper; +import pro.taskana.mappings.TaskMapper; +import pro.taskana.mappings.TaskMonitorMapper; +import pro.taskana.mappings.WorkbasketAccessMapper; +import pro.taskana.mappings.WorkbasketMapper; /** * This is the implementation of TaskanaEngine. diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java index ba56990bc..55561cfa1 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java @@ -22,8 +22,8 @@ import pro.taskana.impl.util.LoggerUtils; */ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery { - private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryWorkbasketAccessItem"; - private static final String LINK_TO_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryWorkbasketAccessItems"; + private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryWorkbasketAccessItem"; + private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryWorkbasketAccessItems"; private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketQueryImpl.class); private String[] accessIdIn; private String[] workbasketKeyIn; diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAuthorization.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAuthorization.java similarity index 92% rename from lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAuthorization.java rename to lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAuthorization.java index 8638993b7..89da36c8e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketAuthorization.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAuthorization.java @@ -1,4 +1,4 @@ -package pro.taskana.model; +package pro.taskana.impl; /** * This enum contains all permission values for the workbaskets. diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketImpl.java index 161e1134c..ecb460e45 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketImpl.java @@ -4,7 +4,6 @@ import java.time.Instant; import pro.taskana.Workbasket; import pro.taskana.WorkbasketSummary; -import pro.taskana.model.WorkbasketType; /** * Workbasket entity. diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java index 94fa57959..beaf314d5 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketQueryImpl.java @@ -17,8 +17,6 @@ import pro.taskana.configuration.TaskanaEngineConfiguration; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.TaskanaRuntimeException; import pro.taskana.impl.util.LoggerUtils; -import pro.taskana.model.WorkbasketAuthorization; -import pro.taskana.model.WorkbasketType; import pro.taskana.security.CurrentUserContext; /** @@ -28,8 +26,8 @@ import pro.taskana.security.CurrentUserContext; */ public class WorkbasketQueryImpl implements WorkbasketQuery { - private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryWorkbasket"; - private static final String LINK_TO_COUNTER = "pro.taskana.model.mappings.QueryMapper.countQueryWorkbaskets"; + private static final String LINK_TO_MAPPER = "pro.taskana.mappings.QueryMapper.queryWorkbasket"; + private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryWorkbaskets"; private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketQueryImpl.class); private String[] accessId; private WorkbasketAuthorization authorization; diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java index e05980c8f..83494457e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java @@ -25,10 +25,9 @@ import pro.taskana.exceptions.WorkbasketInUseException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.util.IdGenerator; import pro.taskana.impl.util.LoggerUtils; -import pro.taskana.model.WorkbasketAuthorization; -import pro.taskana.model.mappings.DistributionTargetMapper; -import pro.taskana.model.mappings.WorkbasketAccessMapper; -import pro.taskana.model.mappings.WorkbasketMapper; +import pro.taskana.mappings.DistributionTargetMapper; +import pro.taskana.mappings.WorkbasketAccessMapper; +import pro.taskana.mappings.WorkbasketMapper; import pro.taskana.security.CurrentUserContext; /** diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketSummaryImpl.java index a4ed053d1..483c31267 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketSummaryImpl.java @@ -1,7 +1,6 @@ package pro.taskana.impl; import pro.taskana.WorkbasketSummary; -import pro.taskana.model.WorkbasketType; /** * This entity contains the most important information about a workbasket. diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketType.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketType.java similarity index 83% rename from lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketType.java rename to lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketType.java index b3d37c375..ab962b07d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/WorkbasketType.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketType.java @@ -1,4 +1,4 @@ -package pro.taskana.model; +package pro.taskana.impl; /** * This enum contains the supported work basket types. diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/AttachmentMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/AttachmentMapper.java similarity index 99% rename from lib/taskana-core/src/main/java/pro/taskana/model/mappings/AttachmentMapper.java rename to lib/taskana-core/src/main/java/pro/taskana/mappings/AttachmentMapper.java index f59b44f06..f5502fea5 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/AttachmentMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/AttachmentMapper.java @@ -1,4 +1,4 @@ -package pro.taskana.model.mappings; +package pro.taskana.mappings; import java.util.List; import java.util.Map; diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ClassificationMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/ClassificationMapper.java similarity index 99% rename from lib/taskana-core/src/main/java/pro/taskana/model/mappings/ClassificationMapper.java rename to lib/taskana-core/src/main/java/pro/taskana/mappings/ClassificationMapper.java index 2de384a18..e736d344d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ClassificationMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/ClassificationMapper.java @@ -1,4 +1,4 @@ -package pro.taskana.model.mappings; +package pro.taskana.mappings; import java.util.List; diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/DistributionTargetMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/DistributionTargetMapper.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/model/mappings/DistributionTargetMapper.java rename to lib/taskana-core/src/main/java/pro/taskana/mappings/DistributionTargetMapper.java index 4d6765034..967523712 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/DistributionTargetMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/DistributionTargetMapper.java @@ -1,4 +1,4 @@ -package pro.taskana.model.mappings; +package pro.taskana.mappings; import java.util.List; diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/ObjectReferenceMapper.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java rename to lib/taskana-core/src/main/java/pro/taskana/mappings/ObjectReferenceMapper.java index db1a17515..46a32372b 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/ObjectReferenceMapper.java @@ -1,4 +1,4 @@ -package pro.taskana.model.mappings; +package pro.taskana.mappings; import java.util.List; @@ -9,7 +9,8 @@ import org.apache.ibatis.annotations.Result; import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import pro.taskana.model.ObjectReference; + +import pro.taskana.impl.ObjectReference; /** * This class is the mybatis mapping of ObjectReference. */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java rename to lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java index 7d4314541..4bc5c966e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java @@ -1,4 +1,4 @@ -package pro.taskana.model.mappings; +package pro.taskana.mappings; import java.util.List; @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Select; import pro.taskana.impl.ClassificationQueryImpl; import pro.taskana.impl.ClassificationSummaryImpl; +import pro.taskana.impl.ObjectReference; import pro.taskana.impl.ObjectReferenceQueryImpl; import pro.taskana.impl.TaskQueryImpl; import pro.taskana.impl.TaskSummaryImpl; @@ -15,17 +16,16 @@ import pro.taskana.impl.WorkbasketAccessItemImpl; import pro.taskana.impl.WorkbasketAccessItemQueryImpl; import pro.taskana.impl.WorkbasketQueryImpl; import pro.taskana.impl.WorkbasketSummaryImpl; -import pro.taskana.model.ObjectReference; /** * This class provides a mapper for all queries. */ public interface QueryMapper { - String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById"; - String CLASSIFICATION_FINDBYKEYANDDOMAIN = "pro.taskana.model.mappings.ClassificationMapper.findByKeyAndDomain"; - String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findById"; - String WORKBASKET_FINDSUMMARYBYKEY = "pro.taskana.model.mappings.WorkbasketMapper.findSummaryByKey"; + String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.mappings.ObjectReferenceMapper.findById"; + String CLASSIFICATION_FINDBYKEYANDDOMAIN = "pro.taskana.mappings.ClassificationMapper.findByKeyAndDomain"; + String CLASSIFICATION_FINDBYID = "pro.taskana.mappings.ClassificationMapper.findById"; + String WORKBASKET_FINDSUMMARYBYKEY = "pro.taskana.mappings.WorkbasketMapper.findSummaryByKey"; @Select("