From 5c7d38451ce7cbea2ad52d3b84be72d49c474c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Heffner?= <56156750+gitgoodjhe@users.noreply.github.com> Date: Thu, 13 Feb 2020 12:54:46 +0100 Subject: [PATCH] TSK-1094 introduce models package for */api and */internal --- .../java/pro/taskana/ExampleBootstrap.java | 4 +- .../src/test/java/pro/taskana/TaskanaEjb.java | 4 +- .../java/pro/taskana/TaskanaRestTest.java | 8 +- .../taskana/TaskanaEngineConfiguration.java | 2 +- .../api/ClassificationQuery.java | 1 + .../api/ClassificationService.java | 1 + .../ClassificationAlreadyExistException.java | 2 +- .../api/{ => models}/Classification.java | 2 +- .../{ => models}/ClassificationSummary.java | 2 +- .../internal/ClassificationMapper.java | 2 + .../internal/ClassificationQueryImpl.java | 2 +- .../internal/ClassificationQueryMapper.java | 2 + .../internal/ClassificationServiceImpl.java | 9 ++- .../{ => models}/ClassificationImpl.java | 8 +- .../ClassificationSummaryImpl.java | 4 +- .../pro/taskana/common/api/TaskanaEngine.java | 1 - .../{task => common}/api/TaskanaRole.java | 2 +- .../common/internal/TaskanaEngineImpl.java | 2 +- .../common/internal/jobs/TaskCleanupJob.java | 2 +- .../util/DaysToWorkingDaysConverter.java | 58 +++++++------- .../monitor/internal/MonitorServiceImpl.java | 4 +- .../DaysToWorkingDaysReportConverter.java | 60 +++++++-------- .../reports/CategoryReportBuilderImpl.java | 2 +- .../ClassificationReportBuilderImpl.java | 5 +- .../CustomFieldValueReportBuilderImpl.java | 9 +-- .../reports/TaskStatusReportBuilderImpl.java | 2 +- .../TimeIntervalReportBuilderImpl.java | 5 +- .../reports/TimestampReportBuilderImpl.java | 5 +- .../reports/WorkbasketReportBuilderImpl.java | 5 +- .../api/events/task/ClaimCancelledEvent.java | 2 +- .../history/api/events/task/ClaimedEvent.java | 2 +- .../api/events/task/CompletedEvent.java | 4 +- .../history/api/events/task/CreatedEvent.java | 2 +- .../history/api/events/task/TaskEvent.java | 4 +- .../api/events/task/TransferredEvent.java | 4 +- .../spi/routing/api/TaskRoutingProvider.java | 2 +- .../task/api/ObjectReferenceQuery.java | 1 + .../java/pro/taskana/task/api/TaskQuery.java | 1 + .../pro/taskana/task/api/TaskService.java | 5 +- .../java/pro/taskana/task/api/Timestamp.java | 2 + .../task/api/{ => models}/Attachment.java | 4 +- .../api/{ => models}/AttachmentSummary.java | 4 +- .../api/{ => models}/ObjectReference.java | 2 +- .../taskana/task/api/{ => models}/Task.java | 5 +- .../task/api/{ => models}/TaskSummary.java | 7 +- .../task/internal/AttachmentMapper.java | 2 + .../task/internal/ObjectReferenceMapper.java | 2 +- .../internal/ObjectReferenceQueryImpl.java | 2 +- .../pro/taskana/task/internal/TaskMapper.java | 3 + .../taskana/task/internal/TaskQueryImpl.java | 5 +- .../task/internal/TaskQueryMapper.java | 3 +- .../task/internal/TaskRoutingManager.java | 2 +- .../task/internal/TaskServiceImpl.java | 25 +++--- .../task/internal/TaskTransferrer.java | 9 ++- .../internal/{ => models}/AttachmentImpl.java | 6 +- .../{ => models}/AttachmentSummaryImpl.java | 10 +-- .../{ => models}/MinimalTaskSummary.java | 2 +- .../task/internal/{ => models}/TaskImpl.java | 16 ++-- .../{ => models}/TaskSummaryImpl.java | 18 ++--- .../AbstractWorkbasketAccessItemQuery.java | 1 + .../api/WorkbasketAccessItemQuery.java | 1 + .../workbasket/api/WorkbasketQuery.java | 1 + .../workbasket/api/WorkbasketService.java | 3 + ...basketAccessItemAlreadyExistException.java | 2 +- .../WorkbasketAlreadyExistException.java | 2 +- .../api/{ => models}/Workbasket.java | 6 +- .../{ => models}/WorkbasketAccessItem.java | 2 +- .../api/{ => models}/WorkbasketSummary.java | 4 +- ...AbstractWorkbasketAccessItemQueryImpl.java | 2 +- .../WorkbasketAccessItemQueryImpl.java | 3 +- .../internal/WorkbasketAccessMapper.java | 2 + .../workbasket/internal/WorkbasketMapper.java | 3 + .../internal/WorkbasketQueryImpl.java | 4 +- .../internal/WorkbasketQueryMapper.java | 2 + .../internal/WorkbasketServiceImpl.java | 11 ++- .../WorkbasketAccessItemImpl.java | 6 +- .../internal/{ => models}/WorkbasketImpl.java | 6 +- .../{ => models}/WorkbasketSummaryImpl.java | 4 +- .../test/java/acceptance/AbstractAccTest.java | 4 +- .../CreateClassificationAccTest.java | 4 +- .../DeleteClassificationAccTest.java | 2 +- .../GetClassificationAccTest.java | 4 +- .../QueryClassificationAccTest.java | 2 +- ...ryClassificationWithPaginationAccTest.java | 2 +- .../UpdateClassificationAccTest.java | 6 +- .../config/TaskanaRoleConfigAccTest.java | 2 +- .../jobs/TaskCleanupJobAccTest.java | 4 +- .../jobs/WorkbasketCleanupJobAccTest.java | 2 +- .../QueryObjectReferenceAccTest.java | 2 +- ...ObjectreferencesWithPaginationAccTest.java | 2 +- .../UpdateObjectsUseUtcTimeStampsAccTest.java | 10 +-- .../report/ProvideCategoryReportAccTest.java | 5 +- .../ProvideClassificationReportAccTest.java | 3 +- .../ProvideCustomFieldValueReportAccTest.java | 12 +-- .../report/ProvideTimestampReportAccTest.java | 5 +- .../security/ClassificationQueryAccTest.java | 2 +- .../security/TaskEngineAccTest.java | 2 +- .../acceptance/security/TaskQueryAccTest.java | 2 +- .../security/WorkbasketQueryAccTest.java | 2 +- .../acceptance/task/CallbackStateAccTest.java | 6 +- .../acceptance/task/CompleteTaskAccTest.java | 4 +- .../acceptance/task/CreateTaskAccTest.java | 10 +-- .../acceptance/task/DeleteTaskAccTest.java | 2 +- .../java/acceptance/task/GetTaskAccTest.java | 2 +- .../QueryTaskByClassificationNameAccTest.java | 4 +- .../task/QueryTaskWithAttachment.java | 8 +- .../acceptance/task/QueryTasksAccTest.java | 8 +- .../QueryTasksByObjectReferenceAccTest.java | 2 +- .../QueryTasksByTimeIntervalsAccTest.java | 2 +- .../task/QueryTasksByWorkbasketAccTest.java | 2 +- .../task/QueryTasksWithPaginationAccTest.java | 2 +- .../task/QueryTasksWithSortingAccTest.java | 2 +- .../acceptance/task/TransferTaskAccTest.java | 4 +- .../acceptance/task/UpdateTaskAccTest.java | 10 +-- .../task/UpdateTaskAttachmentsAccTest.java | 18 ++--- .../acceptance/task/WorkOnTaskAccTest.java | 2 +- .../taskrouting/TaskRoutingAccTest.java | 4 +- .../TestTaskRoutingProviderForDomainA.java | 2 +- .../TestTaskRoutingProviderForDomainB.java | 2 +- .../workbasket/CreateWorkbasketAccTest.java | 4 +- .../workbasket/DeleteWorkbasketAccTest.java | 6 +- .../DistributionTargetsAccTest.java | 4 +- .../workbasket/GetWorkbasketAccTest.java | 4 +- .../workbasket/QueryWorkbasketAccTest.java | 2 +- .../QueryWorkbasketAccessItemsAccTest.java | 2 +- .../QueryWorkbasketByPermissionAccTest.java | 2 +- ...QueryWorkbasketsWithPaginationAccTest.java | 2 +- .../workbasket/UpdateWorkbasketAccTest.java | 4 +- ...pdateWorkbasketAuthorizations2AccTest.java | 2 +- ...UpdateWorkbasketAuthorizationsAccTest.java | 8 +- ...sketQueryWithOrderedPaginationAccTest.java | 2 +- .../internal/ClassificationQueryImplTest.java | 3 +- ...ificationServiceImplIntAutoCommitTest.java | 4 +- ...ssificationServiceImplIntExplicitTest.java | 5 +- .../ClassificationServiceImplTest.java | 3 +- .../internal/TestClassificationQuery.java | 3 +- .../taskana/common/internal/JunitHelper.java | 6 +- .../util/DaysToWorkingDaysConverterTest.java | 9 +-- .../ObjectReferenceQueryImplTest.java | 2 +- .../task/internal/TaskAttachmentTest.java | 10 ++- .../task/internal/TaskQueryImplTest.java | 3 +- .../TaskServiceImplIntAutocommitTest.java | 17 +++-- .../TaskServiceImplIntExplicitTest.java | 17 +++-- .../task/internal/TaskServiceImplTest.java | 13 ++-- .../TaskStatusReportBuilderImplTest.java | 12 +-- .../taskana/task/internal/TaskTestMapper.java | 1 + .../task/internal/TaskTransferrerTest.java | 7 +- .../WorkbasketAccessItemQueryImplTest.java | 3 +- .../internal/WorkbasketQueryImplTest.java | 3 +- .../WorkbasketReportBuilderImplTest.java | 2 +- ...orkbasketServiceImplIntAutocommitTest.java | 7 +- .../WorkbasketServiceImplIntExplicitTest.java | 7 +- .../internal/WorkbasketServiceImplTest.java | 6 +- .../java/pro/taskana/ExampleBootstrap.java | 8 +- .../pro/taskana/TaskanaTestController.java | 4 +- .../taskana/TaskanaTransactionIntTest.java | 19 ++--- .../java/pro/taskana/TaskanaComponent.java | 4 +- .../java/pro/taskana/jobs/JobScheduler.java | 2 +- .../taskana/jobs/AsyncUpdateJobIntTest.java | 4 +- .../taskana/rest/AttachmentController.java | 2 +- .../rest/ClassificationController.java | 5 +- .../ClassificationDefinitionController.java | 4 +- .../pro/taskana/rest/RestConfiguration.java | 1 - .../java/pro/taskana/rest/TaskController.java | 4 +- .../taskana/rest/TaskanaEngineController.java | 2 +- .../rest/WorkbasketAccessItemController.java | 2 +- .../taskana/rest/WorkbasketController.java | 6 +- .../rest/WorkbasketDefinitionController.java | 10 +-- .../rest/resource/AttachmentResource.java | 4 +- .../resource/AttachmentResourceAssembler.java | 4 +- .../resource/AttachmentSummaryResource.java | 4 +- .../AttachmentSummaryResourceAssembler.java | 2 +- .../rest/resource/ClassificationResource.java | 2 +- .../ClassificationResourceAssembler.java | 4 +- .../ClassificationSummaryResource.java | 2 +- ...lassificationSummaryResourceAssembler.java | 4 +- .../resource/DistributionTargetResource.java | 2 +- .../DistributionTargetResourceAssembler.java | 2 +- .../taskana/rest/resource/TaskResource.java | 4 +- .../rest/resource/TaskResourceAssembler.java | 4 +- .../rest/resource/TaskSummaryResource.java | 6 +- .../TaskSummaryResourceAssembler.java | 2 +- .../resource/TaskanaUserInfoResource.java | 2 +- .../WorkbasketAccessItemResource.java | 2 +- ...WorkbasketAccessItemResourceAssembler.java | 4 +- .../WorkbasketDefinitionResource.java | 2 +- ...WorkbasketDefinitionResourceAssembler.java | 10 +-- .../rest/resource/WorkbasketResource.java | 2 +- .../resource/WorkbasketResourceAssembler.java | 4 +- .../WorkbasketResourceWithoutLinks.java | 2 +- .../resource/WorkbasketSummaryResource.java | 2 +- .../WorkbasketSummaryResourceAssembler.java | 4 +- .../DistributionTargetDeserializer.java | 2 +- .../DistributionTargetSerializer.java | 2 +- .../rest/serialization/WorkbasketMixIn.java | 2 +- .../rest/AccessIdControllerIntTest.java | 17 ++--- .../rest/ClassificationControllerIntTest.java | 38 +++++----- .../taskana/rest/TaskControllerIntTest.java | 76 +++++++++---------- .../rest/TaskanaEngineControllerIntTest.java | 2 +- ...WorkbasketAccessItemControllerIntTest.java | 10 +-- .../rest/WorkbasketControllerIntTest.java | 33 ++++---- .../resource/ClassificationAssemblerTest.java | 4 +- .../ClassificationSummaryAssemblerTest.java | 4 +- .../resource/TaskResourceAssemberTest.java | 14 ++-- .../resource/TaskSummaryAssemblerTest.java | 14 ++-- ...basketAccessItemResourceAssemblerTest.java | 4 +- .../WorkbasketResourceAssemblerTest.java | 4 +- .../WorkbasketSummaryAssemblerTest.java | 2 +- 208 files changed, 609 insertions(+), 572 deletions(-) rename lib/taskana-core/src/main/java/pro/taskana/classification/api/{ => models}/Classification.java (98%) rename lib/taskana-core/src/main/java/pro/taskana/classification/api/{ => models}/ClassificationSummary.java (97%) rename lib/taskana-core/src/main/java/pro/taskana/classification/internal/{ => models}/ClassificationImpl.java (95%) rename lib/taskana-core/src/main/java/pro/taskana/classification/internal/{ => models}/ClassificationSummaryImpl.java (97%) rename lib/taskana-core/src/main/java/pro/taskana/{task => common}/api/TaskanaRole.java (97%) rename lib/taskana-core/src/main/java/pro/taskana/task/api/{ => models}/Attachment.java (93%) rename lib/taskana-core/src/main/java/pro/taskana/task/api/{ => models}/AttachmentSummary.java (92%) rename lib/taskana-core/src/main/java/pro/taskana/task/api/{ => models}/ObjectReference.java (98%) rename lib/taskana-core/src/main/java/pro/taskana/task/api/{ => models}/Task.java (97%) rename lib/taskana-core/src/main/java/pro/taskana/task/api/{ => models}/TaskSummary.java (94%) rename lib/taskana-core/src/main/java/pro/taskana/task/internal/{ => models}/AttachmentImpl.java (93%) rename lib/taskana-core/src/main/java/pro/taskana/task/internal/{ => models}/AttachmentSummaryImpl.java (93%) rename lib/taskana-core/src/main/java/pro/taskana/task/internal/{ => models}/MinimalTaskSummary.java (97%) rename lib/taskana-core/src/main/java/pro/taskana/task/internal/{ => models}/TaskImpl.java (96%) rename lib/taskana-core/src/main/java/pro/taskana/task/internal/{ => models}/TaskSummaryImpl.java (97%) rename lib/taskana-core/src/main/java/pro/taskana/workbasket/api/{ => models}/Workbasket.java (95%) rename lib/taskana-core/src/main/java/pro/taskana/workbasket/api/{ => models}/WorkbasketAccessItem.java (99%) rename lib/taskana-core/src/main/java/pro/taskana/workbasket/api/{ => models}/WorkbasketSummary.java (95%) rename lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/{ => models}/WorkbasketAccessItemImpl.java (98%) rename lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/{ => models}/WorkbasketImpl.java (95%) rename lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/{ => models}/WorkbasketSummaryImpl.java (98%) 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 7ae406f31..5ffb39b88 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 @@ -11,10 +11,10 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidOwnerException; import pro.taskana.common.api.exceptions.InvalidStateException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** Example Bootstrap Application. */ 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 5fb31fb81..e707738af 100644 --- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java +++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaEjb.java @@ -7,10 +7,10 @@ import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; 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 a2645a104..ad8eedc34 100644 --- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java +++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java @@ -11,24 +11,24 @@ import javax.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidOwnerException; import pro.taskana.common.api.exceptions.InvalidStateException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; /** TODO. */ @Path("/test") diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java b/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java index 261f5237a..1759b4698 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java +++ b/lib/taskana-core/src/main/java/pro/taskana/TaskanaEngineConfiguration.java @@ -29,11 +29,11 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.TaskanaEngine; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.SystemException; import pro.taskana.common.internal.TaskanaEngineImpl; import pro.taskana.common.internal.configuration.DB; import pro.taskana.common.internal.configuration.DbSchemaCreator; -import pro.taskana.task.api.TaskanaRole; /** * This central class creates the TaskanaEngine and holds all the information about DB and Security. diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java b/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java index 97d586b1a..2d0a598e4 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationQuery.java @@ -1,5 +1,6 @@ package pro.taskana.classification.api; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.BaseQuery; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.InvalidArgumentException; diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationService.java b/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationService.java index 14e1360a0..6c82d4b0c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationService.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationService.java @@ -3,6 +3,7 @@ package pro.taskana.classification.api; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationInUseException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationAlreadyExistException.java b/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationAlreadyExistException.java index b54a63cba..271487f08 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationAlreadyExistException.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/api/exceptions/ClassificationAlreadyExistException.java @@ -1,6 +1,6 @@ package pro.taskana.classification.api.exceptions; -import pro.taskana.classification.api.Classification; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.exceptions.TaskanaException; /** Thrown, when a classification does already exits, but wanted to create with same ID+domain. */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/Classification.java b/lib/taskana-core/src/main/java/pro/taskana/classification/api/models/Classification.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/Classification.java rename to lib/taskana-core/src/main/java/pro/taskana/classification/api/models/Classification.java index fedce07af..1b9a9a7b2 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/Classification.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/api/models/Classification.java @@ -1,4 +1,4 @@ -package pro.taskana.classification.api; +package pro.taskana.classification.api.models; import java.time.Instant; diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationSummary.java b/lib/taskana-core/src/main/java/pro/taskana/classification/api/models/ClassificationSummary.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationSummary.java rename to lib/taskana-core/src/main/java/pro/taskana/classification/api/models/ClassificationSummary.java index 34a2e7265..9646c86e0 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/api/ClassificationSummary.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/api/models/ClassificationSummary.java @@ -1,4 +1,4 @@ -package pro.taskana.classification.api; +package pro.taskana.classification.api.models; /** * Interface for ClassificationSummaries. This is a specific short model-object which only requieres diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationMapper.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationMapper.java index 0561d309b..cf820db8d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationMapper.java @@ -8,6 +8,8 @@ import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; +import pro.taskana.classification.internal.models.ClassificationImpl; + /** This class is the mybatis mapping of classifications. */ @SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"}) public interface ClassificationMapper { diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java index d0f7c2102..1ce2c80d9 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java @@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory; import pro.taskana.classification.api.ClassificationQuery; import pro.taskana.classification.api.ClassificationQueryColumnName; -import pro.taskana.classification.api.ClassificationSummary; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.InvalidArgumentException; diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryMapper.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryMapper.java index 2b414b469..f591e1296 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryMapper.java @@ -5,6 +5,8 @@ import org.apache.ibatis.annotations.Result; import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; +import pro.taskana.classification.internal.models.ClassificationSummaryImpl; + /** This class provides a mapper for all classification queries. */ @SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"}) public interface ClassificationQueryMapper { diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java index 9d3e7f458..b4bacd878 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java @@ -13,14 +13,16 @@ import org.apache.ibatis.exceptions.PersistenceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationQuery; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationInUseException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.api.models.ClassificationSummary; +import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.common.api.ScheduledJob; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; @@ -28,8 +30,7 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.jobs.ClassificationChangedJob; import pro.taskana.common.internal.util.IdGenerator; -import pro.taskana.task.api.TaskSummary; -import pro.taskana.task.api.TaskanaRole; +import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.internal.TaskMapper; /** This is the implementation of ClassificationService. */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java index a13143314..8d6125575 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationImpl.java @@ -1,10 +1,10 @@ -package pro.taskana.classification.internal; +package pro.taskana.classification.internal.models; import java.time.Instant; import java.util.Objects; -import pro.taskana.classification.api.Classification; -import pro.taskana.classification.api.ClassificationSummary; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.api.models.ClassificationSummary; /** Classification entity. */ public class ClassificationImpl extends ClassificationSummaryImpl implements Classification { @@ -17,7 +17,7 @@ public class ClassificationImpl extends ClassificationSummaryImpl implements Cla public ClassificationImpl() {} - ClassificationImpl(ClassificationImpl classification) { + public ClassificationImpl(ClassificationImpl classification) { this.id = classification.getId(); this.key = classification.getKey(); this.parentId = classification.getParentId(); diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationSummaryImpl.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationSummaryImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationSummaryImpl.java index 925ca9bdd..918904ca8 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/models/ClassificationSummaryImpl.java @@ -1,8 +1,8 @@ -package pro.taskana.classification.internal; +package pro.taskana.classification.internal.models; import java.util.Objects; -import pro.taskana.classification.api.ClassificationSummary; +import pro.taskana.classification.api.models.ClassificationSummary; /** Implementation for the short summaries of a classification entity. */ public class ClassificationSummaryImpl implements ClassificationSummary { diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaEngine.java b/lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaEngine.java index d0fac3497..931121388 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaEngine.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaEngine.java @@ -7,7 +7,6 @@ import pro.taskana.classification.api.ClassificationService; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.monitor.api.MonitorService; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskanaRole; import pro.taskana.workbasket.api.WorkbasketService; /** The TaskanaEngine represents an overall set of all needed services. */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskanaRole.java b/lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaRole.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/task/api/TaskanaRole.java rename to lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaRole.java index c07c2e37c..b903974dd 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskanaRole.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/api/TaskanaRole.java @@ -1,4 +1,4 @@ -package pro.taskana.task.api; +package pro.taskana.common.api; import java.util.Arrays; import java.util.List; diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java b/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java index dca1ce7c9..f316330c4 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/internal/TaskanaEngineImpl.java @@ -34,6 +34,7 @@ import pro.taskana.classification.internal.ClassificationServiceImpl; import pro.taskana.common.api.JobService; import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.TaskanaEngine; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.AutocommitFailedException; import pro.taskana.common.api.exceptions.ConnectionNotSetException; import pro.taskana.common.api.exceptions.NotAuthorizedException; @@ -49,7 +50,6 @@ import pro.taskana.monitor.internal.MonitorMapper; import pro.taskana.monitor.internal.MonitorServiceImpl; import pro.taskana.spi.history.internal.HistoryEventProducer; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskanaRole; import pro.taskana.task.internal.AttachmentMapper; import pro.taskana.task.internal.ObjectReferenceMapper; import pro.taskana.task.internal.TaskMapper; diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskCleanupJob.java b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskCleanupJob.java index b454696ce..43415bf59 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskCleanupJob.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskCleanupJob.java @@ -19,7 +19,7 @@ import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.TaskSummary; /** Job to cleanup completed tasks after a period of time. */ public class TaskCleanupJob extends AbstractTaskanaJob { diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverter.java b/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverter.java index 6aeffb9d5..f0fd6010d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverter.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverter.java @@ -82,35 +82,6 @@ public final class DaysToWorkingDaysConverter { .orElse(0); } - /** - * Computes the date of Easter Sunday for a given year. - * - * @param year for which the date of Easter Sunday should be calculated - * @return the date of Easter Sunday for the given year - */ - static LocalDate getEasterSunday(int year) { - // Formula to compute Easter Sunday by Gauss. - int a = year % 19; - int b = year % 4; - int c = year % 7; - int k = year / 100; - int p = (13 + 8 * k) / 25; - int q = k / 4; - int m = (15 - p + k - q) % 30; - int n = (4 + k - q) % 7; - int d = (19 * a + m) % 30; - - int e = (2 * b + 4 * c + 6 * d + n) % 7; - - if (d == 29 && e == 6) { - return LocalDate.of(year, 3, 15).plusDays(d + e); - } - if (d == 28 && e == 6 && (11 * m + 11) % 30 < 19) { - return LocalDate.of(year, 3, 15).plusDays(d + e); - } - return LocalDate.of(year, 3, 22).plusDays(d + e); - } - public boolean isWorkingDay(long day, Instant referenceDate) { LocalDateTime dateToCheck = LocalDateTime.ofInstant(referenceDate, ZoneId.systemDefault()).plusDays(day); @@ -150,6 +121,35 @@ public final class DaysToWorkingDaysConverter { .anyMatch(diff -> diff == diffFromEasterSunday); } + /** + * Computes the date of Easter Sunday for a given year. + * + * @param year for which the date of Easter Sunday should be calculated + * @return the date of Easter Sunday for the given year + */ + static LocalDate getEasterSunday(int year) { + // Formula to compute Easter Sunday by Gauss. + int a = year % 19; + int b = year % 4; + int c = year % 7; + int k = year / 100; + int p = (13 + 8 * k) / 25; + int q = k / 4; + int m = (15 - p + k - q) % 30; + int n = (4 + k - q) % 7; + int d = (19 * a + m) % 30; + + int e = (2 * b + 4 * c + 6 * d + n) % 7; + + if (d == 29 && e == 6) { + return LocalDate.of(year, 3, 15).plusDays(d + e); + } + if (d == 28 && e == 6 && (11 * m + 11) % 30 < 19) { + return LocalDate.of(year, 3, 15).plusDays(d + e); + } + return LocalDate.of(year, 3, 22).plusDays(d + e); + } + @Override public String toString() { return "DaysToWorkingDaysConverter{" diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorServiceImpl.java index 4fe74eb30..84d697cde 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorServiceImpl.java @@ -8,7 +8,6 @@ import pro.taskana.monitor.api.reports.CustomFieldValueReport; import pro.taskana.monitor.api.reports.TaskStatusReport; import pro.taskana.monitor.api.reports.TimestampReport; import pro.taskana.monitor.api.reports.WorkbasketReport; -import pro.taskana.monitor.internal.MonitorMapper; import pro.taskana.monitor.internal.reports.CategoryReportBuilderImpl; import pro.taskana.monitor.internal.reports.ClassificationReportBuilderImpl; import pro.taskana.monitor.internal.reports.CustomFieldValueReportBuilderImpl; @@ -23,8 +22,7 @@ public class MonitorServiceImpl implements MonitorService { private InternalTaskanaEngine taskanaEngine; private MonitorMapper monitorMapper; - public MonitorServiceImpl( - InternalTaskanaEngine taskanaEngine, MonitorMapper monitorMapper) { + public MonitorServiceImpl(InternalTaskanaEngine taskanaEngine, MonitorMapper monitorMapper) { super(); this.taskanaEngine = taskanaEngine; this.monitorMapper = monitorMapper; diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/preprocessor/DaysToWorkingDaysReportConverter.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/preprocessor/DaysToWorkingDaysReportConverter.java index c6bc530a1..367b88863 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/preprocessor/DaysToWorkingDaysReportConverter.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/preprocessor/DaysToWorkingDaysReportConverter.java @@ -77,36 +77,6 @@ public class DaysToWorkingDaysReportConverter { return new DaysToWorkingDaysReportConverter(columnHeaders, daysToWorkingDaysConverter); } - protected List generateNegativeDaysToWorkingDays( - List columnHeaders, Instant referenceDate) { - int minUpperLimit = TimeIntervalColumnHeader.getSmallestUpperLimit(columnHeaders); - - List daysToWorkingDays = new ArrayList<>(); - daysToWorkingDays.add(0); - int day = -1; - int workingDay = 0; - while (workingDay > minUpperLimit) { - workingDay -= (daysToWorkingDaysConverter.isWorkingDay(day--, referenceDate)) ? 1 : 0; - daysToWorkingDays.add(workingDay); - } - return daysToWorkingDays; - } - - protected List generatePositiveDaysToWorkingDays( - List columnHeaders, Instant referenceDate) { - int maxLowerLimit = TimeIntervalColumnHeader.getLargestLowerLimit(columnHeaders); - ArrayList daysToWorkingDays = new ArrayList<>(); - daysToWorkingDays.add(0); - - int day = 1; - int workingDay = 0; - while (workingDay < maxLowerLimit) { - workingDay += (daysToWorkingDaysConverter.isWorkingDay(day++, referenceDate)) ? 1 : 0; - daysToWorkingDays.add(workingDay); - } - return daysToWorkingDays; - } - /** * Converts an integer, that represents the age in days, to the age in working days by using the * table that was created by initialization. If the age in days is beyond the limits of the table, @@ -184,6 +154,36 @@ public class DaysToWorkingDaysReportConverter { return list; } + protected List generateNegativeDaysToWorkingDays( + List columnHeaders, Instant referenceDate) { + int minUpperLimit = TimeIntervalColumnHeader.getSmallestUpperLimit(columnHeaders); + + List daysToWorkingDays = new ArrayList<>(); + daysToWorkingDays.add(0); + int day = -1; + int workingDay = 0; + while (workingDay > minUpperLimit) { + workingDay -= (daysToWorkingDaysConverter.isWorkingDay(day--, referenceDate)) ? 1 : 0; + daysToWorkingDays.add(workingDay); + } + return daysToWorkingDays; + } + + protected List generatePositiveDaysToWorkingDays( + List columnHeaders, Instant referenceDate) { + int maxLowerLimit = TimeIntervalColumnHeader.getLargestLowerLimit(columnHeaders); + ArrayList daysToWorkingDays = new ArrayList<>(); + daysToWorkingDays.add(0); + + int day = 1; + int workingDay = 0; + while (workingDay < maxLowerLimit) { + workingDay += (daysToWorkingDaysConverter.isWorkingDay(day++, referenceDate)) ? 1 : 0; + daysToWorkingDays.add(workingDay); + } + return daysToWorkingDays; + } + @Override public String toString() { return "DaysToWorkingDaysReportConverter [positiveDaysToWorkingDays=" diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/CategoryReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/CategoryReportBuilderImpl.java index 8c260e824..9151164a6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/CategoryReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/CategoryReportBuilderImpl.java @@ -4,6 +4,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; @@ -13,7 +14,6 @@ import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; import pro.taskana.monitor.api.reports.item.MonitorQueryItem; import pro.taskana.monitor.internal.MonitorMapper; import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportPreProcessor; -import pro.taskana.task.api.TaskanaRole; /** The implementation of CategoryReportBuilder. */ public class CategoryReportBuilderImpl diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/ClassificationReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/ClassificationReportBuilderImpl.java index 4a019149c..d9c2edb9c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/ClassificationReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/ClassificationReportBuilderImpl.java @@ -4,6 +4,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; @@ -15,12 +16,10 @@ import pro.taskana.monitor.api.reports.item.DetailedMonitorQueryItem; import pro.taskana.monitor.api.reports.item.MonitorQueryItem; import pro.taskana.monitor.internal.MonitorMapper; import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportPreProcessor; -import pro.taskana.task.api.TaskanaRole; /** The implementation of ClassificationReportBuilder. */ public class ClassificationReportBuilderImpl - extends TimeIntervalReportBuilderImpl< - Builder, MonitorQueryItem, TimeIntervalColumnHeader> + extends TimeIntervalReportBuilderImpl implements ClassificationReport.Builder { private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationReport.Builder.class); diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/CustomFieldValueReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/CustomFieldValueReportBuilderImpl.java index 4cbd35055..77022b01b 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/CustomFieldValueReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/CustomFieldValueReportBuilderImpl.java @@ -4,6 +4,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; @@ -14,12 +15,10 @@ import pro.taskana.monitor.api.reports.item.MonitorQueryItem; import pro.taskana.monitor.internal.MonitorMapper; import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportPreProcessor; import pro.taskana.task.api.CustomField; -import pro.taskana.task.api.TaskanaRole; /** The implementation of CustomFieldValueReportBuilder. */ public class CustomFieldValueReportBuilderImpl - extends TimeIntervalReportBuilderImpl< - Builder, MonitorQueryItem, TimeIntervalColumnHeader> + extends TimeIntervalReportBuilderImpl implements CustomFieldValueReport.Builder { private static final Logger LOGGER = @@ -28,9 +27,7 @@ public class CustomFieldValueReportBuilderImpl private CustomField customField; public CustomFieldValueReportBuilderImpl( - InternalTaskanaEngine taskanaEngine, - MonitorMapper monitorMapper, - CustomField customField) { + InternalTaskanaEngine taskanaEngine, MonitorMapper monitorMapper, CustomField customField) { super(taskanaEngine, monitorMapper); this.customField = customField; } diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TaskStatusReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TaskStatusReportBuilderImpl.java index db82e1f0b..bd789fe57 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TaskStatusReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TaskStatusReportBuilderImpl.java @@ -4,13 +4,13 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.monitor.api.reports.TaskStatusReport; import pro.taskana.monitor.api.reports.item.TaskQueryItem; import pro.taskana.monitor.internal.MonitorMapper; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskanaRole; /** The implementation of TaskStatusReportBuilder. */ public class TaskStatusReportBuilderImpl implements TaskStatusReport.Builder { diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java index c5566abc7..89fdee2a0 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java @@ -9,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pro.taskana.common.api.LoggerUtils; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; @@ -22,7 +23,6 @@ import pro.taskana.monitor.internal.MonitorMapper; import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportConverter; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskanaRole; /** * Implementation of {@link TimeIntervalReportBuilder}. @@ -51,8 +51,7 @@ abstract class TimeIntervalReportBuilderImpl< protected List excludedClassificationIds; protected Map customAttributeFilter; - TimeIntervalReportBuilderImpl( - InternalTaskanaEngine taskanaEngine, MonitorMapper monitorMapper) { + TimeIntervalReportBuilderImpl(InternalTaskanaEngine taskanaEngine, MonitorMapper monitorMapper) { this.taskanaEngine = taskanaEngine; this.monitorMapper = monitorMapper; this.columnHeaders = Collections.emptyList(); diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimestampReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimestampReportBuilderImpl.java index 8577b75f0..533025c69 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimestampReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimestampReportBuilderImpl.java @@ -8,6 +8,7 @@ import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; @@ -19,13 +20,11 @@ import pro.taskana.monitor.api.reports.item.TimestampQueryItem; import pro.taskana.monitor.internal.MonitorMapper; import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportPreProcessor; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskanaRole; import pro.taskana.task.api.Timestamp; /** The implementation of {@link TimestampReport.Builder}. */ public class TimestampReportBuilderImpl - extends TimeIntervalReportBuilderImpl< - Builder, TimestampQueryItem, TimeIntervalColumnHeader> + extends TimeIntervalReportBuilderImpl implements TimestampReport.Builder { private static final Logger LOGGER = LoggerFactory.getLogger(TimestampReport.Builder.class); diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/WorkbasketReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/WorkbasketReportBuilderImpl.java index 63b56fafd..65bdc3cfc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/WorkbasketReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/WorkbasketReportBuilderImpl.java @@ -4,6 +4,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; @@ -14,12 +15,10 @@ import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; import pro.taskana.monitor.api.reports.item.MonitorQueryItem; import pro.taskana.monitor.internal.MonitorMapper; import pro.taskana.monitor.internal.preprocessor.DaysToWorkingDaysReportPreProcessor; -import pro.taskana.task.api.TaskanaRole; /** The implementation of WorkbasketReportBuilder. */ public class WorkbasketReportBuilderImpl - extends TimeIntervalReportBuilderImpl< - Builder, MonitorQueryItem, TimeIntervalColumnHeader> + extends TimeIntervalReportBuilderImpl implements WorkbasketReport.Builder { private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketReportBuilderImpl.class); diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/ClaimCancelledEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/ClaimCancelledEvent.java index 4973221d9..2a94d2978 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/ClaimCancelledEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/ClaimCancelledEvent.java @@ -1,6 +1,6 @@ package pro.taskana.spi.history.api.events.task; -import pro.taskana.task.api.Task; +import pro.taskana.task.api.models.Task; /** Event fired if a task is cancelled to be claimed. */ public class ClaimCancelledEvent extends TaskEvent { diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/ClaimedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/ClaimedEvent.java index 05872e825..9fdddb8ee 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/ClaimedEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/ClaimedEvent.java @@ -1,6 +1,6 @@ package pro.taskana.spi.history.api.events.task; -import pro.taskana.task.api.Task; +import pro.taskana.task.api.models.Task; /** Event fired if a task is claimed. */ public class ClaimedEvent extends TaskEvent { diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/CompletedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/CompletedEvent.java index 409cf0b71..d967562d2 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/CompletedEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/CompletedEvent.java @@ -1,7 +1,7 @@ package pro.taskana.spi.history.api.events.task; -import pro.taskana.task.api.Task; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; /** Event fired if a task is completed. */ public class CompletedEvent extends TaskEvent { diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/CreatedEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/CreatedEvent.java index 80a80ce54..ead47cdb9 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/CreatedEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/CreatedEvent.java @@ -1,6 +1,6 @@ package pro.taskana.spi.history.api.events.task; -import pro.taskana.task.api.Task; +import pro.taskana.task.api.models.Task; /** Event fired if a task is created. */ public class CreatedEvent extends TaskEvent { diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskEvent.java index 0257eed91..b077aaa30 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TaskEvent.java @@ -1,8 +1,8 @@ package pro.taskana.spi.history.api.events.task; import pro.taskana.spi.history.api.events.TaskanaHistoryEvent; -import pro.taskana.task.api.Task; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; /** Super class for all task related events. */ public class TaskEvent extends TaskanaHistoryEvent { diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TransferredEvent.java b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TransferredEvent.java index 0cd2fcd32..0c21a988a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TransferredEvent.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/task/TransferredEvent.java @@ -3,8 +3,8 @@ package pro.taskana.spi.history.api.events.task; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.task.api.Task; -import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.task.api.models.Task; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Event fired if a task is transferred. */ public class TransferredEvent extends TaskEvent { diff --git a/lib/taskana-core/src/main/java/pro/taskana/spi/routing/api/TaskRoutingProvider.java b/lib/taskana-core/src/main/java/pro/taskana/spi/routing/api/TaskRoutingProvider.java index 7de1b8699..56995c378 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/spi/routing/api/TaskRoutingProvider.java +++ b/lib/taskana-core/src/main/java/pro/taskana/spi/routing/api/TaskRoutingProvider.java @@ -1,7 +1,7 @@ package pro.taskana.spi.routing.api; import pro.taskana.common.api.TaskanaEngine; -import pro.taskana.task.api.Task; +import pro.taskana.task.api.models.Task; /** Interface for TASKANA TaskRoutingProvider SPI. */ public interface TaskRoutingProvider { diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReferenceQuery.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReferenceQuery.java index 64a72c3d4..ec775ce7a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReferenceQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReferenceQuery.java @@ -1,6 +1,7 @@ package pro.taskana.task.api; import pro.taskana.common.api.BaseQuery; +import pro.taskana.task.api.models.ObjectReference; /** ObjectReferenceQuery for generating dynamic sql. */ public interface ObjectReferenceQuery diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQuery.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQuery.java index 26b419119..0c084158d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskQuery.java @@ -4,6 +4,7 @@ import pro.taskana.common.api.BaseQuery; import pro.taskana.common.api.KeyDomain; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.InvalidArgumentException; +import pro.taskana.task.api.models.TaskSummary; /** TaskQuery for generating dynamic sql. */ public interface TaskQuery extends BaseQuery { diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskService.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskService.java index 2ceac2d1f..45f729107 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskService.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskService.java @@ -3,8 +3,8 @@ package pro.taskana.task.api; import java.util.List; import java.util.Map; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.exceptions.AttachmentPersistenceException; import pro.taskana.common.api.exceptions.ConcurrencyException; @@ -15,6 +15,9 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** The Task Service manages all operations on tasks. */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/Timestamp.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/Timestamp.java index 040b9ca28..41639cef7 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/api/Timestamp.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/Timestamp.java @@ -1,5 +1,7 @@ package pro.taskana.task.api; +import pro.taskana.task.api.models.Task; + /** This enum contains all timestamps saved in the database table for a {@link Task}. */ public enum Timestamp { CREATED, diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/Attachment.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/models/Attachment.java similarity index 93% rename from lib/taskana-core/src/main/java/pro/taskana/task/api/Attachment.java rename to lib/taskana-core/src/main/java/pro/taskana/task/api/models/Attachment.java index 1ef2086e9..a43e412ff 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/api/Attachment.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/models/Attachment.java @@ -1,9 +1,9 @@ -package pro.taskana.task.api; +package pro.taskana.task.api.models; import java.time.Instant; import java.util.Map; -import pro.taskana.classification.api.ClassificationSummary; +import pro.taskana.classification.api.models.ClassificationSummary; /** Attachment-Interface to specify Attachment Attributes. */ public interface Attachment extends AttachmentSummary { diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/AttachmentSummary.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/models/AttachmentSummary.java similarity index 92% rename from lib/taskana-core/src/main/java/pro/taskana/task/api/AttachmentSummary.java rename to lib/taskana-core/src/main/java/pro/taskana/task/api/models/AttachmentSummary.java index f6427d0de..4a3cfd3dc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/api/AttachmentSummary.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/models/AttachmentSummary.java @@ -1,8 +1,8 @@ -package pro.taskana.task.api; +package pro.taskana.task.api.models; import java.time.Instant; -import pro.taskana.classification.api.ClassificationSummary; +import pro.taskana.classification.api.models.ClassificationSummary; /** * Interface for AttachmentSummaries. This is a specific short model-object which only contains the diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReference.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/models/ObjectReference.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReference.java rename to lib/taskana-core/src/main/java/pro/taskana/task/api/models/ObjectReference.java index f05a13f09..b9ffa74d1 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/api/ObjectReference.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/models/ObjectReference.java @@ -1,4 +1,4 @@ -package pro.taskana.task.api; +package pro.taskana.task.api.models; import java.util.Objects; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/Task.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/models/Task.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/task/api/Task.java rename to lib/taskana-core/src/main/java/pro/taskana/task/api/models/Task.java index 5def188c5..e0d38d43e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/api/Task.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/models/Task.java @@ -1,11 +1,12 @@ -package pro.taskana.task.api; +package pro.taskana.task.api.models; import java.time.Instant; import java.util.List; import java.util.Map; -import pro.taskana.classification.api.Classification; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.exceptions.InvalidArgumentException; +import pro.taskana.task.api.TaskService; /** task-Interface to specify attribute interactions. */ public interface Task extends TaskSummary { diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskSummary.java b/lib/taskana-core/src/main/java/pro/taskana/task/api/models/TaskSummary.java similarity index 94% rename from lib/taskana-core/src/main/java/pro/taskana/task/api/TaskSummary.java rename to lib/taskana-core/src/main/java/pro/taskana/task/api/models/TaskSummary.java index 23c25581a..70eb902a7 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/api/TaskSummary.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/api/models/TaskSummary.java @@ -1,11 +1,12 @@ -package pro.taskana.task.api; +package pro.taskana.task.api.models; import java.time.Instant; import java.util.List; -import pro.taskana.classification.api.ClassificationSummary; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.exceptions.InvalidArgumentException; -import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.task.api.TaskState; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** * Interface for TaskSummary. This is a specific short model-object which only contains the most diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentMapper.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentMapper.java index 9e79ab04b..2641b8f15 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentMapper.java @@ -12,6 +12,8 @@ import org.apache.ibatis.annotations.Update; import org.apache.ibatis.type.ClobTypeHandler; import pro.taskana.common.internal.persistence.MapTypeHandler; +import pro.taskana.task.internal.models.AttachmentImpl; +import pro.taskana.task.internal.models.AttachmentSummaryImpl; /** This class is the mybatis mapping of Attachment. */ @SuppressWarnings("checkstyle:LineLength") diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceMapper.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceMapper.java index 56f8c867d..32afe4105 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import pro.taskana.task.api.ObjectReference; +import pro.taskana.task.api.models.ObjectReference; /** This class is the mybatis mapping of ObjectReference. */ @SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"}) diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceQueryImpl.java index 6f638ad64..053663434 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceQueryImpl.java @@ -11,9 +11,9 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.exceptions.TaskanaRuntimeException; import pro.taskana.common.internal.InternalTaskanaEngine; -import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.ObjectReferenceQuery; import pro.taskana.task.api.ObjectReferenceQueryColumnName; +import pro.taskana.task.api.models.ObjectReference; /** * Implementation of ObjectReferenceQuery interface. diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskMapper.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskMapper.java index a74865e95..1fd841022 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskMapper.java @@ -14,6 +14,9 @@ import org.apache.ibatis.annotations.Update; import pro.taskana.common.internal.CustomPropertySelector; import pro.taskana.common.internal.persistence.MapTypeHandler; import pro.taskana.task.api.CallbackState; +import pro.taskana.task.internal.models.MinimalTaskSummary; +import pro.taskana.task.internal.models.TaskImpl; +import pro.taskana.task.internal.models.TaskSummaryImpl; /** This class is the mybatis mapping of task. */ @SuppressWarnings("checkstyle:LineLength") diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java index b34cd9a37..79c948f46 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java @@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.KeyDomain; import pro.taskana.common.api.LoggerUtils; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; @@ -23,8 +24,8 @@ import pro.taskana.task.api.ObjectReferenceQuery; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskQueryColumnName; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskSummary; -import pro.taskana.task.api.TaskanaRole; +import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.task.internal.models.TaskSummaryImpl; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryMapper.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryMapper.java index 2b4ba2a5c..06a24f60a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryMapper.java @@ -5,7 +5,8 @@ import org.apache.ibatis.annotations.Result; import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; -import pro.taskana.task.api.ObjectReference; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.internal.models.TaskSummaryImpl; /** This class provides a mapper for all task queries. */ @SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"}) diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskRoutingManager.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskRoutingManager.java index 04da96b51..1fcbdf4cb 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskRoutingManager.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskRoutingManager.java @@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.spi.routing.api.TaskRoutingProvider; -import pro.taskana.task.api.Task; +import pro.taskana.task.api.models.Task; /** * Loads TaskRoutingProvider SPI implementation(s) and passes requests to determine workbasketids to 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 7c3c2b8f8..de87dc5c2 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 @@ -16,12 +16,13 @@ import org.apache.ibatis.exceptions.PersistenceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.LoggerUtils; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.AttachmentPersistenceException; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.InvalidArgumentException; @@ -41,24 +42,28 @@ import pro.taskana.spi.history.api.events.task.ClaimedEvent; import pro.taskana.spi.history.api.events.task.CompletedEvent; import pro.taskana.spi.history.api.events.task.CreatedEvent; import pro.taskana.spi.history.internal.HistoryEventProducer; -import pro.taskana.task.api.Attachment; import pro.taskana.task.api.CallbackState; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskSummary; -import pro.taskana.task.api.TaskanaRole; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.task.internal.models.AttachmentImpl; +import pro.taskana.task.internal.models.AttachmentSummaryImpl; +import pro.taskana.task.internal.models.MinimalTaskSummary; +import pro.taskana.task.internal.models.TaskImpl; +import pro.taskana.task.internal.models.TaskSummaryImpl; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketSummary; import pro.taskana.workbasket.internal.WorkbasketQueryImpl; -import pro.taskana.workbasket.internal.WorkbasketSummaryImpl; +import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl; /** This is the implementation of TaskService. */ @SuppressWarnings("checkstyle:OverloadMethodsDeclarationOrder") 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 9309d3f67..19d1ab374 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 @@ -20,14 +20,17 @@ import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.spi.history.api.events.task.TransferredEvent; import pro.taskana.spi.history.internal.HistoryEventProducer; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.internal.models.MinimalTaskSummary; +import pro.taskana.task.internal.models.TaskImpl; +import pro.taskana.task.internal.models.TaskSummaryImpl; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketSummary; import pro.taskana.workbasket.internal.WorkbasketQueryImpl; /** This class is responsible for the transfer of tasks. */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentImpl.java similarity index 93% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentImpl.java index 91f8e792f..c7bf6e9e2 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentImpl.java @@ -1,11 +1,11 @@ -package pro.taskana.task.internal; +package pro.taskana.task.internal.models; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import pro.taskana.task.api.Attachment; -import pro.taskana.task.api.AttachmentSummary; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.AttachmentSummary; /** * Attachment entity. diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentSummaryImpl.java similarity index 93% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentSummaryImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentSummaryImpl.java index 7de686407..ce42a66aa 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/AttachmentSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/AttachmentSummaryImpl.java @@ -1,12 +1,12 @@ -package pro.taskana.task.internal; +package pro.taskana.task.internal.models; import java.time.Instant; import java.util.Objects; -import pro.taskana.classification.api.ClassificationSummary; -import pro.taskana.classification.internal.ClassificationSummaryImpl; -import pro.taskana.task.api.AttachmentSummary; -import pro.taskana.task.api.ObjectReference; +import pro.taskana.classification.api.models.ClassificationSummary; +import pro.taskana.classification.internal.models.ClassificationSummaryImpl; +import pro.taskana.task.api.models.AttachmentSummary; +import pro.taskana.task.api.models.ObjectReference; /** The most important fields of the Attachment entity. */ public class AttachmentSummaryImpl implements AttachmentSummary { diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/MinimalTaskSummary.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/MinimalTaskSummary.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/MinimalTaskSummary.java rename to lib/taskana-core/src/main/java/pro/taskana/task/internal/models/MinimalTaskSummary.java index 67a19a60e..b3b311f30 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/MinimalTaskSummary.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/MinimalTaskSummary.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal; +package pro.taskana.task.internal.models; import pro.taskana.task.api.CallbackState; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskImpl.java similarity index 96% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskImpl.java index 827b3b4f9..c620099cc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskImpl.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal; +package pro.taskana.task.internal.models; import java.util.ArrayList; import java.util.Collections; @@ -7,14 +7,14 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import pro.taskana.classification.internal.ClassificationSummaryImpl; +import pro.taskana.classification.internal.models.ClassificationSummaryImpl; import pro.taskana.common.api.exceptions.InvalidArgumentException; -import pro.taskana.task.api.Attachment; -import pro.taskana.task.api.AttachmentSummary; import pro.taskana.task.api.CallbackState; -import pro.taskana.task.api.Task; -import pro.taskana.task.api.TaskSummary; -import pro.taskana.workbasket.internal.WorkbasketSummaryImpl; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.AttachmentSummary; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl; /** Task entity. */ public class TaskImpl extends TaskSummaryImpl implements Task { @@ -27,7 +27,7 @@ public class TaskImpl extends TaskSummaryImpl implements Task { private CallbackState callbackState; private List attachments = new ArrayList<>(); - TaskImpl() {} + public TaskImpl() {} public CallbackState getCallbackState() { return callbackState; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java similarity index 97% rename from lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskSummaryImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java index 3bc52e9f5..62ae20db5 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/models/TaskSummaryImpl.java @@ -1,19 +1,19 @@ -package pro.taskana.task.internal; +package pro.taskana.task.internal.models; import java.time.Instant; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import pro.taskana.classification.api.ClassificationSummary; -import pro.taskana.classification.internal.ClassificationSummaryImpl; +import pro.taskana.classification.api.models.ClassificationSummary; +import pro.taskana.classification.internal.models.ClassificationSummaryImpl; import pro.taskana.common.api.exceptions.InvalidArgumentException; -import pro.taskana.task.api.AttachmentSummary; -import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskSummary; -import pro.taskana.workbasket.api.WorkbasketSummary; -import pro.taskana.workbasket.internal.WorkbasketSummaryImpl; +import pro.taskana.task.api.models.AttachmentSummary; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.workbasket.api.models.WorkbasketSummary; +import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl; /** Entity which contains the most important informations about a Task. */ public class TaskSummaryImpl implements TaskSummary { @@ -62,7 +62,7 @@ public class TaskSummaryImpl implements TaskSummary { protected String custom15; protected String custom16; - TaskSummaryImpl() {} + public TaskSummaryImpl() {} /* * (non-Javadoc) diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/AbstractWorkbasketAccessItemQuery.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/AbstractWorkbasketAccessItemQuery.java index f26b2f1a4..1893f6c54 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/AbstractWorkbasketAccessItemQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/AbstractWorkbasketAccessItemQuery.java @@ -1,6 +1,7 @@ package pro.taskana.workbasket.api; import pro.taskana.common.api.BaseQuery; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** * AbstractWorkbasketAccessItemQuery for generating dynamic sql. diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItemQuery.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItemQuery.java index ffb4670c8..d07a05e4e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItemQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItemQuery.java @@ -1,6 +1,7 @@ package pro.taskana.workbasket.api; import pro.taskana.common.api.BaseQuery; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** WorkbasketAccessItemQuery for generating dynamic SQL. */ public interface WorkbasketAccessItemQuery diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQuery.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQuery.java index fca6e3067..882416fdc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketQuery.java @@ -4,6 +4,7 @@ import pro.taskana.common.api.BaseQuery; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** WorkitemQuery for generating dynamic sql. */ public interface WorkbasketQuery extends BaseQuery { diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketService.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketService.java index 920354709..9e60bda3f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketService.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketService.java @@ -13,6 +13,9 @@ import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistExc import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketInUseException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** This service manages Workbaskets. */ public interface WorkbasketService { diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAccessItemAlreadyExistException.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAccessItemAlreadyExistException.java index 3e494f0cd..0335c86ed 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAccessItemAlreadyExistException.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAccessItemAlreadyExistException.java @@ -1,7 +1,7 @@ package pro.taskana.workbasket.api.exceptions; import pro.taskana.common.api.exceptions.TaskanaException; -import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; public class WorkbasketAccessItemAlreadyExistException extends TaskanaException { private static final long serialVersionUID = 4716611657569005013L; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAlreadyExistException.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAlreadyExistException.java index 4cdcd1431..3d58efd0c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAlreadyExistException.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/exceptions/WorkbasketAlreadyExistException.java @@ -1,7 +1,7 @@ package pro.taskana.workbasket.api.exceptions; import pro.taskana.common.api.exceptions.TaskanaException; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.workbasket.api.models.Workbasket; /** Thrown, when a workbasket does already exits, but wanted to create with same ID. */ public class WorkbasketAlreadyExistException extends TaskanaException { diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/Workbasket.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/Workbasket.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/api/Workbasket.java rename to lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/Workbasket.java index cec412ea9..763c8d205 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/Workbasket.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/Workbasket.java @@ -1,9 +1,11 @@ -package pro.taskana.workbasket.api; +package pro.taskana.workbasket.api.models; import java.time.Instant; +import pro.taskana.workbasket.api.WorkbasketType; + /** Workbasket entity interface. */ -//@JsonDeserialize(as = WorkbasketImpl.class) +// @JsonDeserialize(as = WorkbasketImpl.class) public interface Workbasket extends WorkbasketSummary { /** diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItem.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/WorkbasketAccessItem.java similarity index 99% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItem.java rename to lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/WorkbasketAccessItem.java index caf8448b4..20a1d6d6c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketAccessItem.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/WorkbasketAccessItem.java @@ -1,4 +1,4 @@ -package pro.taskana.workbasket.api; +package pro.taskana.workbasket.api.models; /** * Interface for WorkbasketAccessItem. This interface is used to control access of users to diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketSummary.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/WorkbasketSummary.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketSummary.java rename to lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/WorkbasketSummary.java index 8257c00d4..9a63f0323 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketSummary.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/models/WorkbasketSummary.java @@ -1,4 +1,6 @@ -package pro.taskana.workbasket.api; +package pro.taskana.workbasket.api.models; + +import pro.taskana.workbasket.api.WorkbasketType; /** * Interface for WorkbasketSummary. This is a specific short model-object which only contains the diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/AbstractWorkbasketAccessItemQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/AbstractWorkbasketAccessItemQueryImpl.java index e45e3c77a..adccf14e8 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/AbstractWorkbasketAccessItemQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/AbstractWorkbasketAccessItemQueryImpl.java @@ -13,7 +13,7 @@ import pro.taskana.common.api.exceptions.TaskanaRuntimeException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.workbasket.api.AbstractWorkbasketAccessItemQuery; import pro.taskana.workbasket.api.AccessItemQueryColumnName; -import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** * AbstractWorkbasketAccessItemQueryImpl for generating dynamic SQL. diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java index ee76f60d6..fbcfce8e5 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java @@ -12,8 +12,9 @@ import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.exceptions.TaskanaRuntimeException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.workbasket.api.AccessItemQueryColumnName; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketAccessItemQuery; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; /** WorkbasketAccessItemQueryImpl for generating dynamic SQL. */ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery { diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessMapper.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessMapper.java index 296069b0a..b082080e7 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessMapper.java @@ -10,6 +10,8 @@ import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; + /** This class is the mybatis mapping of workbasket access items. */ @SuppressWarnings("checkstyle:LineLength") public interface WorkbasketAccessMapper { diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketMapper.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketMapper.java index 1fb8320c3..6ce923f60 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketMapper.java @@ -10,6 +10,9 @@ import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; +import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl; + /** This class is the mybatis mapping of workbaskets. */ @SuppressWarnings("checkstyle:LineLength") public interface WorkbasketMapper { diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java index d1574049a..7813cb335 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java @@ -10,18 +10,18 @@ import org.slf4j.LoggerFactory; import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.common.api.LoggerUtils; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaRuntimeException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.security.CurrentUserContext; -import pro.taskana.task.api.TaskanaRole; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketQuery; import pro.taskana.workbasket.api.WorkbasketQueryColumnName; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.WorkbasketType; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** * WorkbasketQuery for generating dynamic SQL. diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryMapper.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryMapper.java index 96e8b1010..727fdc284 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryMapper.java @@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import pro.taskana.workbasket.api.WorkbasketAccessItemQuery; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; +import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl; /** This class provides a mapper for all queries. */ @SuppressWarnings({"checkstyle:LineLength", "checkstyle:Indentation"}) diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java index 544c0e024..11cc62a14 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java @@ -15,6 +15,7 @@ import org.slf4j.LoggerFactory; import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.LoggerUtils; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; @@ -24,19 +25,21 @@ import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.common.internal.util.IdGenerator; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskanaRole; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketAccessItemQuery; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketQuery; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketInUseException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketSummary; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; +import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl; /** This is the implementation of WorkbasketService. */ public class WorkbasketServiceImpl implements WorkbasketService { diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketAccessItemImpl.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketAccessItemImpl.java index 10744cf27..ba8da98c1 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketAccessItemImpl.java @@ -1,8 +1,8 @@ -package pro.taskana.workbasket.internal; +package pro.taskana.workbasket.internal.models; import java.util.Objects; -import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** WorkbasketAccessItemImpl Entity. */ public class WorkbasketAccessItemImpl implements WorkbasketAccessItem { @@ -30,7 +30,7 @@ public class WorkbasketAccessItemImpl implements WorkbasketAccessItem { private boolean permCustom11; private boolean permCustom12; - WorkbasketAccessItemImpl() { + public WorkbasketAccessItemImpl() { super(); } diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketImpl.java similarity index 95% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketImpl.java index 33dcb4dbc..1cff2dd83 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketImpl.java @@ -1,10 +1,10 @@ -package pro.taskana.workbasket.internal; +package pro.taskana.workbasket.internal.models; import java.time.Instant; import java.util.Objects; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Workbasket entity. */ public class WorkbasketImpl extends WorkbasketSummaryImpl implements Workbasket { diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketSummaryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketSummaryImpl.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketSummaryImpl.java rename to lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketSummaryImpl.java index 2f50d3e7e..8af7e43d7 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketSummaryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketSummaryImpl.java @@ -1,9 +1,9 @@ -package pro.taskana.workbasket.internal; +package pro.taskana.workbasket.internal.models; import java.util.Objects; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.WorkbasketType; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** This entity contains the most important information about a workbasket. */ public class WorkbasketSummaryImpl implements WorkbasketSummary { diff --git a/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java b/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java index bea1543d6..f6b7114cb 100644 --- a/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java @@ -20,8 +20,8 @@ import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.internal.TaskanaEngineTestConfiguration; import pro.taskana.sampledata.SampleDataGenerator; -import pro.taskana.task.api.Attachment; -import pro.taskana.task.api.ObjectReference; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.ObjectReference; /** Base class for all acceptance tests. */ public abstract class AbstractAccTest { diff --git a/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java index 02a40ee0e..6c6c58c4f 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java @@ -7,11 +7,11 @@ import acceptance.AbstractAccTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; -import pro.taskana.classification.internal.ClassificationImpl; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; diff --git a/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java index 8e6dcb859..cd6ee5d8c 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java @@ -9,10 +9,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationInUseException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; diff --git a/lib/taskana-core/src/test/java/acceptance/classification/GetClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/GetClassificationAccTest.java index 7a3334dbd..7c3e46523 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/GetClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/GetClassificationAccTest.java @@ -8,10 +8,10 @@ import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.api.models.ClassificationSummary; /** Acceptance test for all "get classification" scenarios. */ class GetClassificationAccTest extends AbstractAccTest { diff --git a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java index 06f938333..30acd58a1 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.ConcurrencyException; diff --git a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java index dca0e12b8..ed35ad14d 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.security.JaasExtension; /** Acceptance test for all "query classifications with pagination" scenarios. */ diff --git a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java index d772903ca..3365a8caf 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java @@ -18,10 +18,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; @@ -30,10 +30,10 @@ import pro.taskana.common.internal.jobs.JobRunner; import pro.taskana.common.internal.util.DaysToWorkingDaysConverter; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.task.internal.TaskImpl; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.internal.models.TaskImpl; /** Acceptance test for all "update classification" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java b/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java index 6e54fbcdd..bbf2af997 100644 --- a/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java @@ -11,9 +11,9 @@ import org.h2.store.fs.FileUtils; import org.junit.jupiter.api.Test; import pro.taskana.TaskanaEngineConfiguration; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.internal.TaskanaEngineImpl; import pro.taskana.common.internal.TaskanaEngineTestConfiguration; -import pro.taskana.task.api.TaskanaRole; /** * Test taskana's role configuration. diff --git a/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java b/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java index d7603164a..65894cce3 100644 --- a/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java @@ -19,11 +19,11 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.jobs.TaskCleanupJob; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskSummary; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** Acceptance test for all "jobs tasks runner" scenarios. */ diff --git a/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java b/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java index 96c8bf0d0..5dfb8e23b 100644 --- a/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java @@ -19,7 +19,7 @@ import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Acceptance test for all "jobs workbasket runner" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectReferenceAccTest.java b/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectReferenceAccTest.java index 7f9035f61..b3ee44b0a 100644 --- a/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectReferenceAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectReferenceAccTest.java @@ -9,8 +9,8 @@ import acceptance.AbstractAccTest; import java.util.List; import org.junit.jupiter.api.Test; -import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.TaskQuery; +import pro.taskana.task.api.models.ObjectReference; /** Acceptance test for all "get classification" scenarios. */ class QueryObjectReferenceAccTest extends AbstractAccTest { diff --git a/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java index 883deb53b..efc915995 100644 --- a/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java @@ -10,10 +10,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.security.JaasExtension; -import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.ObjectReferenceQuery; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskService; +import pro.taskana.task.api.models.ObjectReference; /** Acceptance test for all "query classifications with pagination" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java b/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java index ad68bcb1b..144d2d0f3 100644 --- a/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java @@ -14,10 +14,10 @@ import java.util.TimeZone; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.JobService; import pro.taskana.common.api.ScheduledJob; import pro.taskana.common.api.exceptions.AttachmentPersistenceException; @@ -29,19 +29,19 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.JobServiceImpl; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.task.internal.TaskImpl; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** Acceptance test for access to timestamps from different timezones. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java index 4e903727a..4d718d356 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java @@ -140,10 +140,7 @@ class ProvideCategoryReportAccTest extends AbstractReportAccTest { List columnHeaders = getShortListOfColumnHeaders(); CategoryReport report = - monitorService - .createCategoryReportBuilder() - .withColumnHeaders(columnHeaders) - .buildReport(); + monitorService.createCategoryReportBuilder().withColumnHeaders(columnHeaders).buildReport(); if (LOGGER.isDebugEnabled()) { LOGGER.debug(reportToString(report, columnHeaders)); diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java index a62dae045..b99c84774 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java @@ -49,8 +49,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { throws InvalidArgumentException, NotAuthorizedException { MonitorService monitorService = taskanaEngine.getMonitorService(); - ClassificationReport report = - monitorService.createClassificationReportBuilder().buildReport(); + ClassificationReport report = monitorService.createClassificationReportBuilder().buildReport(); if (LOGGER.isDebugEnabled()) { LOGGER.debug(reportToString(report)); diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java index 145257dd1..ba3448de4 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java @@ -40,9 +40,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { Assertions.assertThrows( NotAuthorizedException.class, () -> - monitorService - .createCustomFieldValueReportBuilder(CustomField.CUSTOM_1) - .buildReport()); + monitorService.createCustomFieldValueReportBuilder(CustomField.CUSTOM_1).buildReport()); } @WithAccessId(userName = "monitor") @@ -52,9 +50,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { MonitorService monitorService = taskanaEngine.getMonitorService(); CustomFieldValueReport report = - monitorService - .createCustomFieldValueReportBuilder(CustomField.CUSTOM_1) - .buildReport(); + monitorService.createCustomFieldValueReportBuilder(CustomField.CUSTOM_1).buildReport(); if (LOGGER.isDebugEnabled()) { LOGGER.debug(reportToString(report)); @@ -80,9 +76,7 @@ class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { MonitorService monitorService = taskanaEngine.getMonitorService(); CustomFieldValueReport report = - monitorService - .createCustomFieldValueReportBuilder(CustomField.CUSTOM_2) - .buildReport(); + monitorService.createCustomFieldValueReportBuilder(CustomField.CUSTOM_2).buildReport(); if (LOGGER.isDebugEnabled()) { LOGGER.debug(reportToString(report)); diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java index 2119f29c2..3ece6bbe8 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java @@ -44,10 +44,7 @@ class ProvideTimestampReportAccTest extends AbstractReportAccTest { .mapToObj(TimeIntervalColumnHeader.Date::new) .collect(Collectors.toList()); TimestampReport timestampReport = - monitorService - .createTimestampReportBuilder() - .withColumnHeaders(headers) - .buildReport(); + monitorService.createTimestampReportBuilder().withColumnHeaders(headers).buildReport(); final HashSet org1Set = new HashSet<>(Arrays.asList("N/A", "org1")); final HashSet allOtherOrgLevelSet = new HashSet<>(Collections.singletonList("N/A")); diff --git a/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java index 54a4c2cb9..b0ec89078 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; diff --git a/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java index c7a9da0ed..895ba3590 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java @@ -8,11 +8,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.TaskanaEngineProxyForTest; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.TaskanaRole; /** Acceptance test for task queries and authorization. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java index fd1c2b812..0f9f9b077 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.TaskSummary; /** Acceptance test for task queries and authorization. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java index ef680bed5..72ebd1520 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java @@ -14,7 +14,7 @@ import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Acceptance test for workbasket queries and authorization. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java index 88222748b..e4695fb43 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java @@ -25,13 +25,13 @@ import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CallbackState; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskSummary; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.task.internal.TaskImpl; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** Acceptance test for all "create task" scenarios. */ diff --git a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java index 81a97a9c2..cd863b2b4 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java @@ -20,12 +20,12 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.task.internal.TaskImpl; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** Acceptance tests for all claim and complete scenarios. */ diff --git a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java index f0059004b..597fc5bad 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java @@ -22,9 +22,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.TaskanaEngineProxyForTest; @@ -32,18 +32,18 @@ import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.common.internal.util.DaysToWorkingDaysConverter; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Attachment; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; import pro.taskana.task.internal.AttachmentMapper; import pro.taskana.task.internal.TaskTestMapper; -import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; /** Acceptance test for all "create task" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java index 21ad968bc..aea0d65fc 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java @@ -20,9 +20,9 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskNotFoundException; +import pro.taskana.task.api.models.Task; /** Acceptance test for all "delete task" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java index 2a0af1395..551a3a8f5 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java @@ -15,10 +15,10 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.TaskNotFoundException; +import pro.taskana.task.api.models.Task; /** Acceptance test for all "get task" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java index 6bebec0ff..e265099cb 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java @@ -11,11 +11,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.AttachmentSummary; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskQueryColumnName; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.AttachmentSummary; +import pro.taskana.task.api.models.TaskSummary; /** * Acceptance test for the usecase of adding/removing an attachment of a task and update the result diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java index 119ebc6cd..1dae148cc 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java @@ -14,12 +14,12 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Attachment; -import pro.taskana.task.api.AttachmentSummary; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskSummary; import pro.taskana.task.api.exceptions.TaskNotFoundException; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.AttachmentSummary; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; /** * Acceptance test for the usecase of adding/removing an attachment of a task and update the result diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java index bad09367e..33de5748a 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java @@ -37,16 +37,16 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.TaskanaEngineProxyForTest; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Attachment; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskQueryColumnName; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskSummary; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.task.internal.TaskImpl; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; import pro.taskana.task.internal.TaskTestMapper; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** Acceptance test for all "query tasks with sorting" scenarios. */ diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java index b29f5f715..9372f77eb 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java @@ -11,7 +11,7 @@ import pro.taskana.common.api.exceptions.SystemException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.TaskSummary; /** Acceptance test for all "query tasks by object reference" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java index 0a7e85b02..8aa22f371 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java @@ -16,7 +16,7 @@ import pro.taskana.common.api.TimeInterval; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.TaskSummary; /** Acceptance test for all "query tasks with sorting" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java index 9c1b33443..c46e1fa98 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java @@ -15,7 +15,7 @@ import pro.taskana.common.api.KeyDomain; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.TaskSummary; import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException; /** Acceptance test for all "query tasks by workbasket" scenarios. */ diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java index 3f43686f0..bf5a3bc37 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java @@ -12,7 +12,7 @@ import pro.taskana.common.api.KeyDomain; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.TaskSummary; /** Acceptance test for all "query tasks by workbasket with pagination" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java index 548c391be..99a33ab24 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java @@ -20,7 +20,7 @@ import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.TaskSummary; /** Acceptance test for all "query tasks with sorting" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java index 23321a869..c7fc4914e 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java @@ -26,12 +26,12 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.task.api.models.Task; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; /** Acceptance test for all "transfer task" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java index 26061bd75..71b5aaca9 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java @@ -12,8 +12,8 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.classification.api.ClassificationSummary; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.exceptions.AttachmentPersistenceException; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.InvalidArgumentException; @@ -22,13 +22,13 @@ import pro.taskana.common.api.exceptions.InvalidStateException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.task.internal.TaskImpl; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** Acceptance test for all "update task" scenarios. */ @@ -386,7 +386,7 @@ class UpdateTaskAccTest extends AbstractAccTest { @Test void testSetOwnerOfClaimedTaskFails() throws TaskNotFoundException, NotAuthorizedException, InvalidStateException, - InvalidOwnerException { + InvalidOwnerException { TaskService taskService = taskanaEngine.getTaskService(); String taskClaimedId = "TKI:000000000000000000000000000000000026"; diff --git a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java index a8969ade0..71ccd18e0 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java @@ -17,9 +17,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.classification.api.Classification; -import pro.taskana.classification.api.ClassificationSummary; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.exceptions.AttachmentPersistenceException; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.InvalidArgumentException; @@ -29,13 +29,13 @@ import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.common.internal.util.DaysToWorkingDaysConverter; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Attachment; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.task.internal.AttachmentImpl; -import pro.taskana.task.internal.TaskImpl; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.internal.models.AttachmentImpl; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** @@ -75,10 +75,8 @@ class UpdateTaskAttachmentsAccTest extends AbstractAccTest { task.getAttachments().get(0).getClassificationSummary().getKey(), equalTo("DOCTYPE_DEFAULT")); assertThat( - task.getAttachments().get(0).getObjectReference().getCompany(), - equalTo("COMPANY_A")); - assertThat(task.getAttachments().get(0).getObjectReference().getSystem(), - equalTo("SYSTEM_B")); + task.getAttachments().get(0).getObjectReference().getCompany(), equalTo("COMPANY_A")); + assertThat(task.getAttachments().get(0).getObjectReference().getSystem(), equalTo("SYSTEM_B")); assertThat( task.getAttachments().get(0).getObjectReference().getSystemInstance(), equalTo("INSTANCE_B")); diff --git a/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java index 13acc82ac..ffa87574b 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java @@ -26,10 +26,10 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.TaskNotFoundException; +import pro.taskana.task.api.models.Task; /** Acceptance test for all "work on task" scenarios. This includes claim, complete... */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java b/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java index bdc0f547b..7b7663ecc 100644 --- a/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java @@ -12,11 +12,11 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.task.internal.TaskImpl; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** Acceptance test for all "create task" scenarios. */ diff --git a/lib/taskana-core/src/test/java/acceptance/taskrouting/TestTaskRoutingProviderForDomainA.java b/lib/taskana-core/src/test/java/acceptance/taskrouting/TestTaskRoutingProviderForDomainA.java index 79e5d4cc3..8b9ccb29d 100644 --- a/lib/taskana-core/src/test/java/acceptance/taskrouting/TestTaskRoutingProviderForDomainA.java +++ b/lib/taskana-core/src/test/java/acceptance/taskrouting/TestTaskRoutingProviderForDomainA.java @@ -2,7 +2,7 @@ package acceptance.taskrouting; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.spi.routing.api.TaskRoutingProvider; -import pro.taskana.task.api.Task; +import pro.taskana.task.api.models.Task; /** This is a sample implementation of TaskRouter. */ public class TestTaskRoutingProviderForDomainA implements TaskRoutingProvider { diff --git a/lib/taskana-core/src/test/java/acceptance/taskrouting/TestTaskRoutingProviderForDomainB.java b/lib/taskana-core/src/test/java/acceptance/taskrouting/TestTaskRoutingProviderForDomainB.java index b083e4558..d86c2ae4d 100644 --- a/lib/taskana-core/src/test/java/acceptance/taskrouting/TestTaskRoutingProviderForDomainB.java +++ b/lib/taskana-core/src/test/java/acceptance/taskrouting/TestTaskRoutingProviderForDomainB.java @@ -2,7 +2,7 @@ package acceptance.taskrouting; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.spi.routing.api.TaskRoutingProvider; -import pro.taskana.task.api.Task; +import pro.taskana.task.api.models.Task; /** This is a sample implementation of TaskRouter. */ public class TestTaskRoutingProviderForDomainB implements TaskRoutingProvider { diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java index 405d52c5c..58a2ff6fd 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java @@ -15,14 +15,14 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** Acceptance test for all "create workbasket" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java index 8fd818699..f81fd67b4 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java @@ -21,13 +21,13 @@ import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.task.internal.TaskImpl; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketInUseException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** Acceptance test which does test the deletion of a workbasket and all wanted failures. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java index 01cdb6970..2c6bfe094 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java @@ -17,10 +17,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Acceptance test for all "get workbasket" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java index 7b44db704..bd17bbf12 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java @@ -12,12 +12,12 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Acceptance test for all "get workbasket" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java index 9f05eff56..cb5fa73ca 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java @@ -20,8 +20,8 @@ import pro.taskana.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketQuery; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.WorkbasketType; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Acceptance test for all "query workbasket by permission" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java index bb2e95a4d..a97cf0a0e 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java @@ -18,9 +18,9 @@ import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketAccessItemQuery; import pro.taskana.workbasket.api.WorkbasketService; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** Acceptance test for all "query access items for workbaskets" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java index ee264b48e..015d63524 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java @@ -19,7 +19,7 @@ import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Acceptance test for all "query workbasket by permission" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java index 5e01bfadb..4faba749e 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Acceptance test for all "query classifications with pagination" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java index d49a62937..2dc513851 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java @@ -14,11 +14,11 @@ import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.workbasket.internal.WorkbasketImpl; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** Acceptance test for all "update workbasket" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java index 1636dd762..c7fe13120 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketService; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** Acceptance test for all "update workbasket" scenarios that need a fresh database. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java index d9ae1f329..498c2f73e 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java @@ -23,16 +23,16 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskSummary; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; -import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; /** Acceptance test for all "update workbasket" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java index db9ed0a52..a2550baa1 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java @@ -12,7 +12,7 @@ import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Acceptance test for all "query classifications with pagination" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationQueryImplTest.java index 8036c2f4c..dcc5a92c4 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationQueryImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationQueryImplTest.java @@ -13,7 +13,8 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import pro.taskana.classification.api.ClassificationSummary; +import pro.taskana.classification.api.models.ClassificationSummary; +import pro.taskana.classification.internal.models.ClassificationSummaryImpl; import pro.taskana.common.internal.InternalTaskanaEngine; /** diff --git a/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplIntAutoCommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplIntAutoCommitTest.java index 80e4d1532..ce104304b 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplIntAutoCommitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplIntAutoCommitTest.java @@ -17,11 +17,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import pro.taskana.TaskanaEngineConfiguration; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode; import pro.taskana.common.api.TimeInterval; diff --git a/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplIntExplicitTest.java index 134dda2a1..51de91a5f 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplIntExplicitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplIntExplicitTest.java @@ -22,11 +22,12 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import pro.taskana.TaskanaEngineConfiguration; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.api.models.ClassificationSummary; +import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode; import pro.taskana.common.api.TimeInterval; diff --git a/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplTest.java index 7a14f5bed..165d69541 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/classification/internal/ClassificationServiceImplTest.java @@ -13,7 +13,8 @@ import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import pro.taskana.classification.api.Classification; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.internal.InternalTaskanaEngine; diff --git a/lib/taskana-core/src/test/java/pro/taskana/classification/internal/TestClassificationQuery.java b/lib/taskana-core/src/test/java/pro/taskana/classification/internal/TestClassificationQuery.java index 9ce839a90..2d0233857 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/classification/internal/TestClassificationQuery.java +++ b/lib/taskana-core/src/test/java/pro/taskana/classification/internal/TestClassificationQuery.java @@ -5,7 +5,8 @@ import java.util.List; import pro.taskana.classification.api.ClassificationQuery; import pro.taskana.classification.api.ClassificationQueryColumnName; -import pro.taskana.classification.api.ClassificationSummary; +import pro.taskana.classification.api.models.ClassificationSummary; +import pro.taskana.classification.internal.models.ClassificationSummaryImpl; import pro.taskana.common.api.TimeInterval; /** Created by BV on 26.10.2017. */ diff --git a/lib/taskana-core/src/test/java/pro/taskana/common/internal/JunitHelper.java b/lib/taskana-core/src/test/java/pro/taskana/common/internal/JunitHelper.java index 30bb49d4e..3baa64557 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/common/internal/JunitHelper.java +++ b/lib/taskana-core/src/test/java/pro/taskana/common/internal/JunitHelper.java @@ -1,8 +1,8 @@ package pro.taskana.common.internal; -import pro.taskana.task.api.Attachment; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.internal.AttachmentImpl; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.internal.models.AttachmentImpl; /** * This class contains helper methods for Junit Tests. diff --git a/lib/taskana-core/src/test/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverterTest.java b/lib/taskana-core/src/test/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverterTest.java index eb16a6ef1..5a2050d56 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverterTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/common/internal/util/DaysToWorkingDaysConverterTest.java @@ -31,8 +31,7 @@ class DaysToWorkingDaysConverterTest { @Test void testConvertWorkingDaysToDaysForTasks() throws InvalidArgumentException { Instant thursday0201 = Instant.parse("2018-02-01T07:00:00.000Z"); - DaysToWorkingDaysConverter converter = - DaysToWorkingDaysConverter.initialize(thursday0201); + DaysToWorkingDaysConverter converter = DaysToWorkingDaysConverter.initialize(thursday0201); long days = converter.convertWorkingDaysToDays(thursday0201, -7); // = tuesday (sat + sun) assertEquals(-9, days); @@ -77,8 +76,7 @@ class DaysToWorkingDaysConverterTest { @Test void testConvertWorkingDaysToDaysForKarFreitag() throws InvalidArgumentException { Instant thursday0201 = Instant.parse("2018-02-01T07:00:00.000Z"); - DaysToWorkingDaysConverter converter = - DaysToWorkingDaysConverter.initialize(thursday0201); + DaysToWorkingDaysConverter converter = DaysToWorkingDaysConverter.initialize(thursday0201); Instant gruenDonnerstag2018 = Instant.parse("2018-03-29T01:00:00.000Z"); long days = converter.convertWorkingDaysToDays(gruenDonnerstag2018, 0); assertEquals(0, days); @@ -92,8 +90,7 @@ class DaysToWorkingDaysConverterTest { void testConvertWorkingDaysToDaysForHolidays() throws InvalidArgumentException { List reportItems = singletonList(new TimeIntervalColumnHeader(0)); Instant thursday0201 = Instant.parse("2018-02-01T07:00:00.000Z"); - DaysToWorkingDaysConverter converter = - DaysToWorkingDaysConverter.initialize(thursday0201); + DaysToWorkingDaysConverter converter = DaysToWorkingDaysConverter.initialize(thursday0201); Instant freitag0427 = Instant.parse("2018-04-27T19:00:00.000Z"); long days = converter.convertWorkingDaysToDays(freitag0427, 0); diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/ObjectReferenceQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/ObjectReferenceQueryImplTest.java index e0a1384db..e67c01323 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/ObjectReferenceQueryImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/ObjectReferenceQueryImplTest.java @@ -14,7 +14,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.common.internal.InternalTaskanaEngine; -import pro.taskana.task.api.ObjectReference; +import pro.taskana.task.api.models.ObjectReference; /** * Test for ObjectReferenceQueryImpl. diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskAttachmentTest.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskAttachmentTest.java index 76524d3a3..a89ccbb8a 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskAttachmentTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskAttachmentTest.java @@ -13,10 +13,12 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.junit.jupiter.MockitoExtension; -import pro.taskana.classification.internal.ClassificationImpl; -import pro.taskana.task.api.Attachment; -import pro.taskana.task.api.AttachmentSummary; -import pro.taskana.task.api.ObjectReference; +import pro.taskana.classification.internal.models.ClassificationImpl; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.AttachmentSummary; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.internal.models.AttachmentImpl; +import pro.taskana.task.internal.models.TaskImpl; /** * Unit Test for methods needed fot attachment at TaskImpl.
diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskQueryImplTest.java index 889fb1257..168bcf58d 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskQueryImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskQueryImplTest.java @@ -18,7 +18,8 @@ import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.configuration.DB; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.task.internal.models.TaskSummaryImpl; /** * Test for TaskQueryImpl. diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntAutocommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntAutocommitTest.java index 1267b99c6..74fa2d139 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntAutocommitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntAutocommitTest.java @@ -16,11 +16,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.TaskanaEngineConfiguration; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; -import pro.taskana.classification.internal.ClassificationImpl; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.common.api.KeyDomain; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode; @@ -37,21 +37,22 @@ import pro.taskana.common.internal.util.IdGenerator; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskSummary; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.workbasket.internal.WorkbasketImpl; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** * Integration Test for TaskServiceImpl transactions with connection management mode AUTOCOMMIT. diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntExplicitTest.java index 9d2d54e34..fc3ae9578 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntExplicitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntExplicitTest.java @@ -20,11 +20,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.TaskanaEngineConfiguration; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; -import pro.taskana.classification.internal.ClassificationImpl; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.common.api.KeyDomain; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode; @@ -42,21 +42,22 @@ import pro.taskana.common.internal.util.IdGenerator; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskSummary; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.workbasket.internal.WorkbasketImpl; -import pro.taskana.workbasket.internal.WorkbasketSummaryImpl; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; +import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl; /** * Integration Test for TaskServiceImpl transactions with connection management mode EXPLICIT. diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplTest.java index ba5e5a4ba..07f107b45 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplTest.java @@ -15,18 +15,19 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.TaskanaEngineConfiguration; -import pro.taskana.classification.api.Classification; -import pro.taskana.classification.internal.ClassificationImpl; +import pro.taskana.classification.api.models.Classification; import pro.taskana.classification.internal.ClassificationQueryImpl; import pro.taskana.classification.internal.ClassificationServiceImpl; +import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.common.internal.JunitHelper; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.TaskSummary; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.internal.WorkbasketImpl; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** * Unit Test for TaskServiceImpl. diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskStatusReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskStatusReportBuilderImplTest.java index f77557e3f..8c542b509 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskStatusReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskStatusReportBuilderImplTest.java @@ -20,6 +20,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.common.api.TaskanaEngine; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; @@ -28,7 +29,6 @@ import pro.taskana.monitor.api.reports.item.TaskQueryItem; import pro.taskana.monitor.internal.MonitorMapper; import pro.taskana.monitor.internal.MonitorServiceImpl; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskanaRole; /** Unit Test for TaskStatusReportBuilderImpl. */ @ExtendWith(MockitoExtension.class) @@ -66,8 +66,7 @@ class TaskStatusReportBuilderImplTest { final TaskStatusReport report = cut.createTaskStatusReportBuilder().buildReport(); // then - InOrder inOrder = - inOrder(taskanaEngineMock, internalTaskanaEngineMock, monitorMapperMock); + InOrder inOrder = inOrder(taskanaEngineMock, internalTaskanaEngineMock, monitorMapperMock); inOrder.verify(internalTaskanaEngineMock).getEngine(); inOrder.verify(taskanaEngineMock).checkRoleMembership(TaskanaRole.MONITOR, TaskanaRole.ADMIN); inOrder.verify(internalTaskanaEngineMock).openConnection(); @@ -105,14 +104,11 @@ class TaskStatusReportBuilderImplTest { cut.createTaskStatusReportBuilder().stateIn(Collections.emptyList()).buildReport(); // then - InOrder inOrder = - inOrder(taskanaEngineMock, monitorMapperMock, internalTaskanaEngineMock); + InOrder inOrder = inOrder(taskanaEngineMock, monitorMapperMock, internalTaskanaEngineMock); inOrder.verify(internalTaskanaEngineMock).getEngine(); inOrder.verify(taskanaEngineMock).checkRoleMembership(TaskanaRole.MONITOR, TaskanaRole.ADMIN); inOrder.verify(internalTaskanaEngineMock).openConnection(); - inOrder - .verify(monitorMapperMock) - .getTasksCountByState(eq(null), eq(Collections.emptyList())); + inOrder.verify(monitorMapperMock).getTasksCountByState(eq(null), eq(Collections.emptyList())); inOrder.verify(internalTaskanaEngineMock).returnConnection(); inOrder.verifyNoMoreInteractions(); verifyNoMoreInteractions(taskanaEngineMock, monitorMapperMock, internalTaskanaEngineMock); diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskTestMapper.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskTestMapper.java index 8b2c064f6..1881a2a83 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskTestMapper.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskTestMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Select; import org.apache.ibatis.type.ClobTypeHandler; import pro.taskana.common.internal.persistence.MapTypeHandler; +import pro.taskana.task.internal.models.TaskImpl; /** This class contains specific mybatis mappings for task tests. */ @SuppressWarnings({"checkstyle:LineLength"}) diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskTransferrerTest.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskTransferrerTest.java index e5c415ff4..4f7dd8569 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskTransferrerTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskTransferrerTest.java @@ -17,20 +17,21 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.TaskanaEngineConfiguration; -import pro.taskana.classification.api.Classification; +import pro.taskana.classification.api.models.Classification; import pro.taskana.classification.internal.ClassificationQueryImpl; import pro.taskana.classification.internal.ClassificationServiceImpl; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.InvalidStateException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; /** * Unit Test for TaskServiceImpl. diff --git a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImplTest.java index cd64cfdc2..38b4c4094 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImplTest.java @@ -14,7 +14,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.common.internal.InternalTaskanaEngine; -import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; /** * Test for WorkbasketAccessItemQueryImpl. diff --git a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketQueryImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketQueryImplTest.java index e9c606cdc..799139b03 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketQueryImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketQueryImplTest.java @@ -16,7 +16,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.internal.InternalTaskanaEngine; -import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.workbasket.api.models.WorkbasketSummary; +import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl; /** * Test for WorkbasketQueryImpl. diff --git a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketReportBuilderImplTest.java index 4ef5d1851..cb0c15d43 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketReportBuilderImplTest.java @@ -25,6 +25,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.common.api.TaskanaEngine; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; @@ -37,7 +38,6 @@ import pro.taskana.monitor.internal.MonitorMapper; import pro.taskana.monitor.internal.MonitorServiceImpl; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskanaRole; /** Unit Test for WorkbasketReportBuilderImpl. */ @ExtendWith(MockitoExtension.class) diff --git a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntAutocommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntAutocommitTest.java index 270b192df..64c7884fb 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntAutocommitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntAutocommitTest.java @@ -26,15 +26,16 @@ import pro.taskana.common.internal.util.IdGenerator; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketSummary; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** * Integration Test for workbasketServiceImpl with connection management mode AUTOCOMMIT. diff --git a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntExplicitTest.java index 599630f27..abe967d4a 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntExplicitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntExplicitTest.java @@ -27,15 +27,16 @@ import pro.taskana.common.internal.util.IdGenerator; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketSummary; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** * Integration Test for workbasketServiceImpl with connection mode EXPLICIT. diff --git a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplTest.java index 7d1cac610..6eef5679e 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplTest.java @@ -40,13 +40,15 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.InternalTaskanaEngine; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskService; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** * Unit Test for workbasketServiceImpl. diff --git a/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java b/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java index abc472d84..0f633c1ce 100644 --- a/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java +++ b/lib/taskana-spring-example/src/main/java/pro/taskana/ExampleBootstrap.java @@ -5,25 +5,25 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.InvalidOwnerException; import pro.taskana.common.api.exceptions.InvalidStateException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; /** TODO. */ @Component diff --git a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java index 958820c74..2268850dc 100644 --- a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java +++ b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaTestController.java @@ -12,11 +12,11 @@ import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.util.IdGenerator; -import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; -import pro.taskana.workbasket.internal.WorkbasketImpl; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** Rest Controller. */ @RestController diff --git a/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java b/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java index 9f50684b4..311a405ec 100644 --- a/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java +++ b/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java @@ -30,19 +30,19 @@ import pro.taskana.common.internal.jobs.TaskCleanupJob; import pro.taskana.common.internal.jobs.WorkbasketCleanupJob; import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; import pro.taskana.common.internal.util.IdGenerator; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; -import pro.taskana.task.api.TaskSummary; -import pro.taskana.task.internal.TaskImpl; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketInUseException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.workbasket.internal.WorkbasketImpl; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** Test for internal transaction management. */ @ExtendWith(SpringExtension.class) @@ -211,9 +211,10 @@ class TaskanaTransactionIntTest { new TaskCleanupJob(taskanaEngine, springTransactionProvider, null); taskCleanupJob.run(); - assertThatThrownBy(() -> - workbasketService.deleteWorkbasket( - workbasketService.getWorkbasket("key3", "DOMAIN_A").getId())) + assertThatThrownBy( + () -> + workbasketService.deleteWorkbasket( + workbasketService.getWorkbasket("key3", "DOMAIN_A").getId())) .isInstanceOf(WorkbasketInUseException.class) .hasMessageContaining("contains 1 non-completed tasks"); diff --git a/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java b/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java index ccdfc05bc..c83505674 100644 --- a/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java +++ b/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java @@ -7,10 +7,10 @@ import org.springframework.transaction.annotation.Transactional; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** TODO. */ diff --git a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/JobScheduler.java b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/JobScheduler.java index 186ca2fea..bc461add8 100644 --- a/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/JobScheduler.java +++ b/rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/JobScheduler.java @@ -14,12 +14,12 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import pro.taskana.common.api.TaskanaEngine; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.internal.jobs.JobRunner; import pro.taskana.common.internal.jobs.TaskCleanupJob; import pro.taskana.common.internal.jobs.WorkbasketCleanupJob; import pro.taskana.common.internal.security.UserPrincipal; import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; -import pro.taskana.task.api.TaskanaRole; /** This class invokes the JobRunner periodically to schedule long running jobs. */ @Component diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java index a2cbdaed3..c223db403 100644 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java +++ b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java @@ -22,7 +22,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.web.client.RestTemplate; import pro.taskana.RestHelper; -import pro.taskana.classification.api.Classification; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.rest.Mapping; import pro.taskana.rest.RestConfiguration; @@ -30,7 +30,7 @@ import pro.taskana.rest.resource.ClassificationResource; import pro.taskana.rest.resource.ClassificationResourceAssembler; import pro.taskana.rest.resource.TaskResource; import pro.taskana.rest.resource.TaskResourceAssembler; -import pro.taskana.task.api.Task; +import pro.taskana.task.api.models.Task; /** Test async updates. */ @ActiveProfiles({"test"}) diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AttachmentController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AttachmentController.java index e3698dc0d..d497b3f38 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AttachmentController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/AttachmentController.java @@ -1,6 +1,6 @@ package pro.taskana.rest; -import pro.taskana.task.api.Attachment; +import pro.taskana.task.api.models.Attachment; /** Controller for all {@link Attachment} related endpoints. */ public class AttachmentController {} diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java index a58c3b12b..f3903746f 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationController.java @@ -19,13 +19,13 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationQuery; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationInUseException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.DomainNotFoundException; @@ -323,4 +323,3 @@ public class ClassificationController extends AbstractPagingController { return query; } } - diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java index 62f66887f..4e6887eff 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/ClassificationDefinitionController.java @@ -23,12 +23,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationQuery; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; import pro.taskana.classification.api.exceptions.ClassificationAlreadyExistException; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.DomainNotFoundException; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java index 4027d5c3e..cc2e63650 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/RestConfiguration.java @@ -74,5 +74,4 @@ public class RestConfiguration { public HandlerInstantiator handlerInstantiator(ApplicationContext context) { return new SpringHandlerInstantiator(context.getAutowireCapableBeanFactory()); } - } diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java index c6a0ddd93..3733c5cd9 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java @@ -36,13 +36,13 @@ import pro.taskana.rest.resource.TaskResource; import pro.taskana.rest.resource.TaskResourceAssembler; import pro.taskana.rest.resource.TaskSummaryListResource; import pro.taskana.rest.resource.TaskSummaryResourceAssembler; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskSummary; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.api.models.TaskSummary; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; /** Controller for all {@link Task} related endpoints. */ diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java index 63187f796..d5021d5e2 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java @@ -11,10 +11,10 @@ import org.springframework.web.bind.annotation.RestController; import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.common.api.TaskanaEngine; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.common.internal.security.CurrentUserContext; import pro.taskana.rest.resource.TaskanaUserInfoResource; import pro.taskana.rest.resource.VersionResource; -import pro.taskana.task.api.TaskanaRole; /** Controller for TaskanaEngine related tasks. */ @RestController diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java index d1dbf8410..9c506e7c4 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketAccessItemController.java @@ -21,9 +21,9 @@ import pro.taskana.ldap.LdapClient; import pro.taskana.rest.resource.PagedResources.PageMetadata; import pro.taskana.rest.resource.WorkbasketAccessItemListResource; import pro.taskana.rest.resource.WorkbasketAccessItemResourceAssembler; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketAccessItemQuery; import pro.taskana.workbasket.api.WorkbasketService; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** Controller for Workbasket access. */ @RestController diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java index cdc16608c..34f37fe40 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java @@ -38,18 +38,18 @@ import pro.taskana.rest.resource.WorkbasketResource; import pro.taskana.rest.resource.WorkbasketResourceAssembler; import pro.taskana.rest.resource.WorkbasketSummaryListResource; import pro.taskana.rest.resource.WorkbasketSummaryResourceAssembler; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketQuery; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketInUseException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Controller for all {@link Workbasket} related endpoints. */ @RestController diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java index c60584ebf..588a1a4f4 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketDefinitionController.java @@ -31,17 +31,17 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.rest.resource.WorkbasketDefinitionResource; import pro.taskana.rest.resource.WorkbasketDefinitionResourceAssembler; import pro.taskana.rest.resource.WorkbasketResource; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketQuery; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; import pro.taskana.workbasket.api.exceptions.WorkbasketAccessItemAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; -import pro.taskana.workbasket.internal.WorkbasketImpl; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketSummary; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** Controller for all {@link WorkbasketDefinitionResource} related endpoints. */ @RestController diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResource.java index 31328e452..ee6dd5c93 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResource.java @@ -4,8 +4,8 @@ import java.util.HashMap; import java.util.Map; import org.springframework.hateoas.ResourceSupport; -import pro.taskana.task.api.Attachment; -import pro.taskana.task.api.ObjectReference; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.ObjectReference; /** Resource class for {@link Attachment}. */ public class AttachmentResource extends ResourceSupport { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResourceAssembler.java index f25ef41ea..db3a009f1 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentResourceAssembler.java @@ -10,9 +10,9 @@ import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; import pro.taskana.rest.AttachmentController; -import pro.taskana.task.api.Attachment; import pro.taskana.task.api.TaskService; -import pro.taskana.task.internal.AttachmentImpl; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.internal.models.AttachmentImpl; /** Resource assembler for {@link AttachmentResource}. */ @Component diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResource.java index 4fd6dbcb8..34683c161 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResource.java @@ -2,8 +2,8 @@ package pro.taskana.rest.resource; import org.springframework.hateoas.ResourceSupport; -import pro.taskana.task.api.AttachmentSummary; -import pro.taskana.task.api.ObjectReference; +import pro.taskana.task.api.models.AttachmentSummary; +import pro.taskana.task.api.models.ObjectReference; /** Resource class for {@link AttachmentSummary}. */ public class AttachmentSummaryResource extends ResourceSupport { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResourceAssembler.java index bbe930940..f7fa53423 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AttachmentSummaryResourceAssembler.java @@ -5,7 +5,7 @@ import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; import pro.taskana.rest.AttachmentController; -import pro.taskana.task.api.AttachmentSummary; +import pro.taskana.task.api.models.AttachmentSummary; /** Resource assembler for {@link AttachmentSummaryResource}. */ @Component diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResource.java index 6164710fa..6751e38f3 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResource.java @@ -3,7 +3,7 @@ package pro.taskana.rest.resource; import javax.validation.constraints.NotNull; import org.springframework.hateoas.ResourceSupport; -import pro.taskana.classification.api.Classification; +import pro.taskana.classification.api.models.Classification; /** Resource class for {@link Classification}. */ public class ClassificationResource extends ResourceSupport { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResourceAssembler.java index 4bc48daec..51f9dcb5c 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationResourceAssembler.java @@ -9,10 +9,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; -import pro.taskana.classification.internal.ClassificationImpl; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.common.api.exceptions.SystemException; import pro.taskana.rest.ClassificationController; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationSummaryResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationSummaryResource.java index 0dcab860f..9311e9c91 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationSummaryResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationSummaryResource.java @@ -2,7 +2,7 @@ package pro.taskana.rest.resource; import org.springframework.hateoas.ResourceSupport; -import pro.taskana.classification.api.ClassificationSummary; +import pro.taskana.classification.api.models.ClassificationSummary; /** Resource class for {@link ClassificationSummary}. */ public class ClassificationSummaryResource extends ResourceSupport { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationSummaryResourceAssembler.java index 30b9bd7fb..4321c9c7d 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationSummaryResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/ClassificationSummaryResourceAssembler.java @@ -7,8 +7,8 @@ import org.springframework.hateoas.mvc.ResourceAssemblerSupport; import org.springframework.stereotype.Component; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; -import pro.taskana.classification.internal.ClassificationImpl; +import pro.taskana.classification.api.models.ClassificationSummary; +import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.rest.ClassificationController; import pro.taskana.rest.Mapping; import pro.taskana.rest.resource.PagedResources.PageMetadata; diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResource.java index a32efff48..0bea4127f 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResource.java @@ -2,7 +2,7 @@ package pro.taskana.rest.resource; import org.springframework.hateoas.core.Relation; -import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Resource class for a distribution target based on {@link WorkbasketSummary}. */ @Relation(collectionRelation = "distributionTargets") diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResourceAssembler.java index 24895a1b8..9bff9b576 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/DistributionTargetResourceAssembler.java @@ -9,8 +9,8 @@ import org.springframework.stereotype.Component; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.rest.WorkbasketController; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** * Transforms WorkbasketSummary to its resource counterpart DistributionTargerResource and vice diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResource.java index 3e07d24a7..608dd310c 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResource.java @@ -7,9 +7,9 @@ import java.util.stream.Collectors; import org.springframework.hateoas.ResourceSupport; import pro.taskana.common.api.exceptions.InvalidArgumentException; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskState; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; /** Resource class for {@link Task}. */ public class TaskResource extends ResourceSupport { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResourceAssembler.java index 2fa2be999..bfb55db31 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskResourceAssembler.java @@ -15,10 +15,10 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.SystemException; import pro.taskana.rest.TaskController; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskNotFoundException; -import pro.taskana.task.internal.TaskImpl; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.internal.models.TaskImpl; /** Resource assembler for {@link TaskResource}. */ @Component diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java index a97397a75..604b962b7 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResource.java @@ -7,10 +7,10 @@ import org.springframework.hateoas.ResourceSupport; import org.springframework.hateoas.core.Relation; import pro.taskana.common.api.exceptions.InvalidArgumentException; -import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.TaskState; -import pro.taskana.task.api.TaskSummary; -import pro.taskana.workbasket.api.WorkbasketSummary; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.TaskSummary; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Resource class for {@link WorkbasketSummary}. */ @Relation(collectionRelation = "tasks") diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java index 758e29d88..d90d4726a 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskSummaryResourceAssembler.java @@ -10,7 +10,7 @@ import pro.taskana.rest.Mapping; import pro.taskana.rest.TaskController; import pro.taskana.rest.resource.PagedResources.PageMetadata; import pro.taskana.rest.resource.links.PageLinks; -import pro.taskana.task.api.TaskSummary; +import pro.taskana.task.api.models.TaskSummary; /** Resource assembler for {@link TaskSummaryResource}. */ @Component diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskanaUserInfoResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskanaUserInfoResource.java index cf9f8d4b9..3bcd681a0 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskanaUserInfoResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/TaskanaUserInfoResource.java @@ -5,7 +5,7 @@ import java.util.List; import org.springframework.hateoas.ResourceSupport; import pro.taskana.common.api.LoggerUtils; -import pro.taskana.task.api.TaskanaRole; +import pro.taskana.common.api.TaskanaRole; /** Resource class for user information. */ public class TaskanaUserInfoResource extends ResourceSupport { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java index a0a73d329..023603c60 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java @@ -4,7 +4,7 @@ import javax.validation.constraints.NotNull; import org.springframework.hateoas.ResourceSupport; import org.springframework.hateoas.core.Relation; -import pro.taskana.workbasket.api.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** Resource class for {@link WorkbasketAccessItem}. */ @Relation(collectionRelation = "accessItems") diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java index 0d36ee8e0..3679da347 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java @@ -14,10 +14,10 @@ import pro.taskana.rest.Mapping; import pro.taskana.rest.WorkbasketController; import pro.taskana.rest.resource.PagedResources.PageMetadata; import pro.taskana.rest.resource.links.PageLinks; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; /** * Transforms {@link WorkbasketAccessItem} to its resource counterpart {@link diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResource.java index 0b97ce4a2..445248a98 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResource.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Set; import pro.taskana.common.api.LoggerUtils; -import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; /** this class represents a workbasket including its distro targets and authorisations. */ public class WorkbasketDefinitionResource { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResourceAssembler.java index 2fcd5e37d..8ed37eb6d 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketDefinitionResourceAssembler.java @@ -10,13 +10,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.workbasket.api.Workbasket; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; -import pro.taskana.workbasket.internal.WorkbasketImpl; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.api.models.WorkbasketSummary; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** * Transforms {@link Workbasket} into a {@link WorkbasketDefinitionResource} containing all diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResource.java index 0e271c793..cabb4a0c6 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResource.java @@ -3,8 +3,8 @@ package pro.taskana.rest.resource; import javax.validation.constraints.NotNull; import org.springframework.hateoas.ResourceSupport; -import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketType; +import pro.taskana.workbasket.api.models.Workbasket; /** Resource class for {@link Workbasket}. */ public class WorkbasketResource extends ResourceSupport { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceAssembler.java index 0bb5c598a..25584db0b 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceAssembler.java @@ -14,10 +14,10 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.SystemException; import pro.taskana.rest.WorkbasketController; -import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; -import pro.taskana.workbasket.internal.WorkbasketImpl; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** * Transforms {@link Workbasket} to its resource counterpart {@link WorkbasketResource} and vice diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceWithoutLinks.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceWithoutLinks.java index 61b2c315a..158dcd233 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceWithoutLinks.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceWithoutLinks.java @@ -2,7 +2,7 @@ package pro.taskana.rest.resource; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.workbasket.api.models.Workbasket; /** Resource class for {@link Workbasket} but without links property. */ @JsonIgnoreProperties(value = {"links"}) diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResource.java index 71c91546b..5490cc096 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResource.java @@ -4,8 +4,8 @@ import javax.validation.constraints.NotNull; import org.springframework.hateoas.ResourceSupport; import org.springframework.hateoas.core.Relation; -import pro.taskana.workbasket.api.WorkbasketSummary; import pro.taskana.workbasket.api.WorkbasketType; +import pro.taskana.workbasket.api.models.WorkbasketSummary; /** Resource class for {@link WorkbasketSummary}. */ @Relation(collectionRelation = "workbaskets") diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResourceAssembler.java index ad546f882..51c5da266 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketSummaryResourceAssembler.java @@ -11,8 +11,8 @@ import pro.taskana.rest.WorkbasketController; import pro.taskana.rest.resource.PagedResources.PageMetadata; import pro.taskana.rest.resource.links.PageLinks; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.api.WorkbasketSummary; -import pro.taskana.workbasket.internal.WorkbasketImpl; +import pro.taskana.workbasket.api.models.WorkbasketSummary; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** Resource assembler for {@link WorkbasketSummaryResource}. */ @Component diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java index 3018299c7..7da5ec3eb 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetDeserializer.java @@ -14,9 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.context.support.SpringBeanAutowiringSupport; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; +import pro.taskana.workbasket.api.models.Workbasket; /** This class deserializes the string list to real workbaskets. */ public class DistributionTargetDeserializer extends StdDeserializer> { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java index 1cfbd65a6..a89626500 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/DistributionTargetSerializer.java @@ -7,7 +7,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.workbasket.api.models.Workbasket; /** This class serializes the distribution targets to an string array with ids. */ public class DistributionTargetSerializer extends StdSerializer> { diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java index 78636af9b..f3b483dc5 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/serialization/WorkbasketMixIn.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.List; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.workbasket.api.models.Workbasket; /** * This class is used to override the distributiontargets with non standard serialization classes. diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/AccessIdControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/AccessIdControllerIntTest.java index 51019b540..06f1117f8 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/AccessIdControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/AccessIdControllerIntTest.java @@ -75,19 +75,18 @@ class AccessIdControllerIntTest { void testBadRequestWhenSearchForIsTooShort() { assertThatThrownBy( () -> - template.exchange( - restHelper.toUrl(Mapping.URL_ACCESSID) + "?search-for=al", - HttpMethod.GET, - restHelper.defaultRequest(), - ParameterizedTypeReference.forType(List.class))) + template.exchange( + restHelper.toUrl(Mapping.URL_ACCESSID) + "?search-for=al", + HttpMethod.GET, + restHelper.defaultRequest(), + ParameterizedTypeReference.forType(List.class))) .isInstanceOf(HttpClientErrorException.class) .hasMessageContaining("Minimum searchFor length =") - .extracting(ex -> ((HttpClientErrorException)ex).getStatusCode()) - .isEqualTo(HttpStatus.BAD_REQUEST); + .extracting(ex -> ((HttpClientErrorException) ex).getStatusCode()) + .isEqualTo(HttpStatus.BAD_REQUEST); } - + static class AccessIdListResource extends ArrayList { private static final long serialVersionUID = 1L; } - } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java index caee9b3dd..d89a2e6f5 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java @@ -239,12 +239,12 @@ class ClassificationControllerIntTest { + "\"parentKey\":\"T2000\"}"; assertThatThrownBy( - () -> - template.exchange( - restHelper.toUrl(Mapping.URL_CLASSIFICATIONS), - HttpMethod.POST, - new HttpEntity<>(newClassification, restHelper.getHeaders()), - ParameterizedTypeReference.forType(ClassificationResource.class))) + () -> + template.exchange( + restHelper.toUrl(Mapping.URL_CLASSIFICATIONS), + HttpMethod.POST, + new HttpEntity<>(newClassification, restHelper.getHeaders()), + ParameterizedTypeReference.forType(ClassificationResource.class))) .isInstanceOf(HttpClientErrorException.class) .extracting(ex -> ((HttpClientErrorException) ex).getStatusCode()) .isEqualTo(HttpStatus.BAD_REQUEST); @@ -259,12 +259,12 @@ class ClassificationControllerIntTest { + "\"name\":\"new classification\",\"type\":\"TASK\"}"; assertThatThrownBy( - () -> - template.exchange( - restHelper.toUrl(Mapping.URL_CLASSIFICATIONS), - HttpMethod.POST, - new HttpEntity<>(newClassification, restHelper.getHeaders()), - ParameterizedTypeReference.forType(ClassificationResource.class))) + () -> + template.exchange( + restHelper.toUrl(Mapping.URL_CLASSIFICATIONS), + HttpMethod.POST, + new HttpEntity<>(newClassification, restHelper.getHeaders()), + ParameterizedTypeReference.forType(ClassificationResource.class))) .isInstanceOf(HttpClientErrorException.class) .extracting(ex -> ((HttpClientErrorException) ex).getStatusCode()) .isEqualTo(HttpStatus.BAD_REQUEST); @@ -300,13 +300,13 @@ class ClassificationControllerIntTest { assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); assertThatThrownBy( - () -> - template.exchange( - restHelper.toUrl( - Mapping.URL_CLASSIFICATIONS_ID, "CLI:200000000000000000000000000000000004"), - HttpMethod.GET, - request, - ParameterizedTypeReference.forType(ClassificationSummaryResource.class))) + () -> + template.exchange( + restHelper.toUrl( + Mapping.URL_CLASSIFICATIONS_ID, "CLI:200000000000000000000000000000000004"), + HttpMethod.GET, + request, + ParameterizedTypeReference.forType(ClassificationSummaryResource.class))) .isInstanceOf(HttpClientErrorException.class); } } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java index e40d4756a..48d7aa663 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java @@ -39,8 +39,8 @@ import pro.taskana.rest.resource.TaskResource; import pro.taskana.rest.resource.TaskSummaryListResource; import pro.taskana.rest.resource.WorkbasketSummaryResource; import pro.taskana.sampledata.SampleDataGenerator; -import pro.taskana.task.api.ObjectReference; import pro.taskana.task.api.TaskState; +import pro.taskana.task.api.models.ObjectReference; // import org.junit.jupiter.api.Assertions; @@ -166,17 +166,17 @@ class TaskControllerIntTest { void testGetAllTasksByWorkbasketIdWithInvalidPlannedParamsCombination() { assertThatThrownBy( () -> - template.exchange( - restHelper.toUrl(Mapping.URL_TASKS) - + "?workbasket-id=WBI:100000000000000000000000000000000001" - + "&planned=2020-01-22T09:44:47.453Z,," - + "2020-01-19T07:44:47.453Z,2020-01-19T19:44:47.453Z," - + ",2020-01-18T09:44:47.453Z" - + "&planned-from=2020-01-19T07:44:47.453Z" - + "&sort-by=planned", - HttpMethod.GET, - restHelper.defaultRequest(), - ParameterizedTypeReference.forType(TaskSummaryListResource.class))) + template.exchange( + restHelper.toUrl(Mapping.URL_TASKS) + + "?workbasket-id=WBI:100000000000000000000000000000000001" + + "&planned=2020-01-22T09:44:47.453Z,," + + "2020-01-19T07:44:47.453Z,2020-01-19T19:44:47.453Z," + + ",2020-01-18T09:44:47.453Z" + + "&planned-from=2020-01-19T07:44:47.453Z" + + "&sort-by=planned", + HttpMethod.GET, + restHelper.defaultRequest(), + ParameterizedTypeReference.forType(TaskSummaryListResource.class))) .isInstanceOf(HttpClientErrorException.class) .hasMessageContaining("400"); } @@ -255,17 +255,17 @@ class TaskControllerIntTest { void testGetAllTasksByWorkbasketIdWithInvalidDueParamsCombination() { assertThatThrownBy( () -> - template.exchange( - restHelper.toUrl(Mapping.URL_TASKS) - + "?workbasket-id=WBI:100000000000000000000000000000000001" - + "&due=2020-01-22T09:44:47.453Z,," - + "2020-01-19T07:44:47.453Z,2020-01-19T19:44:47.453Z," - + ",2020-01-18T09:44:47.453Z" - + "&due-from=2020-01-19T07:44:47.453Z" - + "&sort-by=planned", - HttpMethod.GET, - restHelper.defaultRequest(), - ParameterizedTypeReference.forType(TaskSummaryListResource.class))) + template.exchange( + restHelper.toUrl(Mapping.URL_TASKS) + + "?workbasket-id=WBI:100000000000000000000000000000000001" + + "&due=2020-01-22T09:44:47.453Z,," + + "2020-01-19T07:44:47.453Z,2020-01-19T19:44:47.453Z," + + ",2020-01-18T09:44:47.453Z" + + "&due-from=2020-01-19T07:44:47.453Z" + + "&sort-by=planned", + HttpMethod.GET, + restHelper.defaultRequest(), + ParameterizedTypeReference.forType(TaskSummaryListResource.class))) .isInstanceOf(HttpClientErrorException.class) .hasMessageContaining("400"); } @@ -295,11 +295,11 @@ class TaskControllerIntTest { assertThatThrownBy( () -> { ResponseEntity response = - template.exchange( - restHelper.toUrl(Mapping.URL_TASKS) + "?workbasket-key=USER_1_2", - HttpMethod.GET, - request, - ParameterizedTypeReference.forType(TaskSummaryListResource.class)); + template.exchange( + restHelper.toUrl(Mapping.URL_TASKS) + "?workbasket-key=USER_1_2", + HttpMethod.GET, + request, + ParameterizedTypeReference.forType(TaskSummaryListResource.class)); }) .isInstanceOf(HttpClientErrorException.class) .hasMessageContaining("400"); @@ -587,11 +587,11 @@ class TaskControllerIntTest { assertThatThrownBy( () -> - template.exchange( - restHelper.toUrl(Mapping.URL_TASKS), - HttpMethod.POST, - new HttpEntity<>(taskResource, restHelper.getHeaders()), - ParameterizedTypeReference.forType(TaskResource.class))) + template.exchange( + restHelper.toUrl(Mapping.URL_TASKS), + HttpMethod.POST, + new HttpEntity<>(taskResource, restHelper.getHeaders()), + ParameterizedTypeReference.forType(TaskResource.class))) .isInstanceOf(HttpClientErrorException.class); } @@ -701,11 +701,11 @@ class TaskControllerIntTest { assertThatThrownBy( () -> - template.exchange( - taskUrlString, - HttpMethod.PUT, - new HttpEntity<>(theTaskResource, getHeadersForUser_1_2()), - ParameterizedTypeReference.forType(TaskResource.class))) + template.exchange( + taskUrlString, + HttpMethod.PUT, + new HttpEntity<>(theTaskResource, getHeadersForUser_1_2()), + ParameterizedTypeReference.forType(TaskResource.class))) .isInstanceOf(HttpClientErrorException.class) .hasMessageContaining("409"); } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java index c96bdbe2a..fd5716435 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java @@ -15,8 +15,8 @@ import org.springframework.web.client.RestTemplate; import pro.taskana.RestHelper; import pro.taskana.TaskanaSpringBootTest; +import pro.taskana.common.api.TaskanaRole; import pro.taskana.rest.resource.TaskanaUserInfoResource; -import pro.taskana.task.api.TaskanaRole; /** Test TaskanaEngineController. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java index 78cc95a19..d17e980cd 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java @@ -115,11 +115,11 @@ class WorkbasketAccessItemControllerIntTest { String parameters = "?access-id=cn=DevelopersGroup,ou=groups,o=TaskanaTest"; assertThatThrownBy( () -> - template.exchange( - restHelper.toUrl(Mapping.URL_WORKBASKETACCESSITEMS) + parameters, - HttpMethod.DELETE, - restHelper.defaultRequest(), - ParameterizedTypeReference.forType(Void.class))) + template.exchange( + restHelper.toUrl(Mapping.URL_WORKBASKETACCESSITEMS) + parameters, + HttpMethod.DELETE, + restHelper.defaultRequest(), + ParameterizedTypeReference.forType(Void.class))) .isInstanceOf(HttpClientErrorException.class) .extracting(ex -> ((HttpClientErrorException) ex).getStatusCode()) .isEqualTo(HttpStatus.BAD_REQUEST); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java index 40b1bb9ac..ece58c145 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java @@ -45,8 +45,7 @@ class WorkbasketControllerIntTest { void testGetWorkbasket() { ResponseEntity response = template.exchange( - restHelper.toUrl( - Mapping.URL_WORKBASKET_ID, "WBI:100000000000000000000000000000000006"), + restHelper.toUrl(Mapping.URL_WORKBASKET_ID, "WBI:100000000000000000000000000000000006"), HttpMethod.GET, restHelper.defaultRequest(), ParameterizedTypeReference.forType(WorkbasketResource.class)); @@ -54,7 +53,7 @@ class WorkbasketControllerIntTest { assertThat(response.getHeaders().getContentType().toString()) .isEqualTo(MediaTypes.HAL_JSON_UTF8_VALUE); } - + @Test void testGetAllWorkbaskets() { ResponseEntity response = @@ -129,13 +128,14 @@ class WorkbasketControllerIntTest { workbasketResource.setOwner("Joerg"); workbasketResource.setModified(String.valueOf(Instant.now())); - assertThatThrownBy(() -> - template.exchange( - restHelper.toUrl(Mapping.URL_WORKBASKET_ID, workbasketId), - HttpMethod.PUT, - new HttpEntity<>( - mapper.writeValueAsString(workbasketResource), restHelper.getHeaders()), - ParameterizedTypeReference.forType(WorkbasketResource.class))) + assertThatThrownBy( + () -> + template.exchange( + restHelper.toUrl(Mapping.URL_WORKBASKET_ID, workbasketId), + HttpMethod.PUT, + new HttpEntity<>( + mapper.writeValueAsString(workbasketResource), restHelper.getHeaders()), + ParameterizedTypeReference.forType(WorkbasketResource.class))) .extracting(ex -> ((HttpClientErrorException) ex).getStatusCode()) .isEqualTo(HttpStatus.CONFLICT); } @@ -145,12 +145,13 @@ class WorkbasketControllerIntTest { String workbasketId = "WBI:100004857400039500000999999999999999"; - assertThatThrownBy(() -> - template.exchange( - restHelper.toUrl(Mapping.URL_WORKBASKET_ID, workbasketId), - HttpMethod.GET, - new HttpEntity(restHelper.getHeaders()), - ParameterizedTypeReference.forType(WorkbasketResource.class))) + assertThatThrownBy( + () -> + template.exchange( + restHelper.toUrl(Mapping.URL_WORKBASKET_ID, workbasketId), + HttpMethod.GET, + new HttpEntity(restHelper.getHeaders()), + ParameterizedTypeReference.forType(WorkbasketResource.class))) .isInstanceOf(HttpClientErrorException.class) .extracting(ex -> ((HttpClientErrorException) ex).getStatusCode()) .isEqualTo(HttpStatus.NOT_FOUND); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java index f4011ccb5..1fee925e5 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationAssemblerTest.java @@ -7,9 +7,9 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.TaskanaSpringBootTest; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.internal.ClassificationImpl; +import pro.taskana.classification.api.models.Classification; +import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.rest.Mapping; /** Test for {@link ClassificationResourceAssembler}. */ diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationSummaryAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationSummaryAssemblerTest.java index 2833b288a..1b17719b7 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationSummaryAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/ClassificationSummaryAssemblerTest.java @@ -8,8 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.TaskanaSpringBootTest; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.classification.api.ClassificationSummary; -import pro.taskana.classification.internal.ClassificationImpl; +import pro.taskana.classification.api.models.ClassificationSummary; +import pro.taskana.classification.internal.models.ClassificationImpl; /** Test for {@link ClassificationSummaryResourceAssembler}. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java index 8a795f930..f525db741 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskResourceAssemberTest.java @@ -10,19 +10,19 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.TaskanaSpringBootTest; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; +import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.rest.Mapping; -import pro.taskana.task.api.Attachment; -import pro.taskana.task.api.ObjectReference; -import pro.taskana.task.api.Task; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; -import pro.taskana.task.internal.AttachmentImpl; -import pro.taskana.task.internal.TaskImpl; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.task.api.models.Attachment; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.api.models.Task; +import pro.taskana.task.internal.models.AttachmentImpl; +import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.WorkbasketService; +import pro.taskana.workbasket.api.models.Workbasket; /** Test for {@link TaskResourceAssembler}. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskSummaryAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskSummaryAssemblerTest.java index cd60e75c9..6789d8c39 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskSummaryAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/TaskSummaryAssemblerTest.java @@ -8,17 +8,17 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.TaskanaSpringBootTest; -import pro.taskana.classification.api.Classification; import pro.taskana.classification.api.ClassificationService; -import pro.taskana.task.api.AttachmentSummary; -import pro.taskana.task.api.ObjectReference; +import pro.taskana.classification.api.models.Classification; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; -import pro.taskana.task.internal.AttachmentImpl; -import pro.taskana.task.internal.TaskImpl; -import pro.taskana.task.internal.TaskSummaryImpl; -import pro.taskana.workbasket.api.Workbasket; +import pro.taskana.task.api.models.AttachmentSummary; +import pro.taskana.task.api.models.ObjectReference; +import pro.taskana.task.internal.models.AttachmentImpl; +import pro.taskana.task.internal.models.TaskImpl; +import pro.taskana.task.internal.models.TaskSummaryImpl; import pro.taskana.workbasket.api.WorkbasketService; +import pro.taskana.workbasket.api.models.Workbasket; @TaskanaSpringBootTest class TaskSummaryAssemblerTest { diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java index bc86171af..1a0587357 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java @@ -6,9 +6,9 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.TaskanaSpringBootTest; -import pro.taskana.workbasket.api.WorkbasketAccessItem; import pro.taskana.workbasket.api.WorkbasketService; -import pro.taskana.workbasket.internal.WorkbasketAccessItemImpl; +import pro.taskana.workbasket.api.models.WorkbasketAccessItem; +import pro.taskana.workbasket.internal.models.WorkbasketAccessItemImpl; /** Test for {@link WorkbasketAccessItemResourceAssembler}. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java index 66dd9f99d..d2ec6632d 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java @@ -8,10 +8,10 @@ import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.TaskanaSpringBootTest; import pro.taskana.rest.Mapping; -import pro.taskana.workbasket.api.Workbasket; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; -import pro.taskana.workbasket.internal.WorkbasketImpl; +import pro.taskana.workbasket.api.models.Workbasket; +import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** Test for {@link WorkbasketResourceAssembler}. */ @TaskanaSpringBootTest diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketSummaryAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketSummaryAssemblerTest.java index 005136ecb..9b32c5823 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketSummaryAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketSummaryAssemblerTest.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import pro.taskana.TaskanaSpringBootTest; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; -import pro.taskana.workbasket.internal.WorkbasketSummaryImpl; +import pro.taskana.workbasket.internal.models.WorkbasketSummaryImpl; /** Test for {@link WorkbasketSummaryResourceAssembler}. */ @TaskanaSpringBootTest