From 3ce41b224efde509aea998be3ace278832b1d562 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Fri, 10 Apr 2020 13:19:11 +0200 Subject: [PATCH] TSK-1182: refined architecture tests --- .../internal/ClassificationServiceImpl.java | 2 +- .../jobs/ClassificationChangedJob.java | 3 +- .../internal/jobs/AbstractTaskanaJob.java | 6 +- .../internal/jobs/TaskCleanupJob.java | 3 +- .../internal/jobs/TaskRefreshJob.java | 4 +- .../internal/jobs/WorkbasketCleanupJob.java | 3 +- .../CreateClassificationAccTest.java | 4 +- .../DeleteClassificationAccTest.java | 4 +- .../QueryClassificationAccTest.java | 4 +- ...ryClassificationWithPaginationAccTest.java | 2 +- .../UpdateClassificationAccTest.java | 4 +- .../jobs/TaskCleanupJobAccTest.java | 6 +- .../jobs/WorkbasketCleanupJobAccTest.java | 8 +- ...ObjectreferencesWithPaginationAccTest.java | 2 +- .../UpdateObjectsUseUtcTimeStampsAccTest.java | 4 +- ...CustomAttributeValuesForReportAccTest.java | 4 +- .../GetTaskIdsOfCategoryReportAccTest.java | 4 +- ...tTaskIdsOfClassificationReportAccTest.java | 4 +- ...askIdsOfCustomFieldValueReportAccTest.java | 4 +- .../GetTaskIdsOfWorkbasketReportAccTest.java | 4 +- .../report/ProvideCategoryReportAccTest.java | 4 +- .../ProvideClassificationReportAccTest.java | 4 +- .../ProvideCustomFieldValueReportAccTest.java | 4 +- ...deDetailedClassificationReportAccTest.java | 4 +- .../ProvideTaskStatusReportAccTest.java | 4 +- .../report/ProvideTimestampReportAccTest.java | 4 +- .../ProvideWorkbasketReportAccTest.java | 4 +- .../security/ClassificationQueryAccTest.java | 4 +- .../security/TaskEngineAccTest.java | 4 +- .../acceptance/security/TaskQueryAccTest.java | 4 +- .../security/WorkbasketQueryAccTest.java | 4 +- .../acceptance/task/CallbackStateAccTest.java | 4 +- .../acceptance/task/CancelTaskAccTest.java | 4 +- .../acceptance/task/CompleteTaskAccTest.java | 4 +- .../acceptance/task/CreateTaskAccTest.java | 4 +- .../task/CreateTaskCommentAccTest.java | 4 +- .../acceptance/task/DeleteTaskAccTest.java | 4 +- .../task/DeleteTaskCommentAccTest.java | 4 +- .../java/acceptance/task/GetTaskAccTest.java | 4 +- .../task/GetTaskCommentAccTest.java | 4 +- .../QueryTaskByClassificationNameAccTest.java | 4 +- .../task/QueryTaskWithAttachmentAccTest.java | 4 +- .../acceptance/task/QueryTasksAccTest.java | 4 +- .../QueryTasksByObjectReferenceAccTest.java | 4 +- .../QueryTasksByTimeIntervalsAccTest.java | 4 +- .../QueryTasksByWildcardSearchAccTest.java | 4 +- .../task/QueryTasksByWorkbasketAccTest.java | 4 +- .../task/QueryTasksWithPaginationAccTest.java | 4 +- .../task/QueryTasksWithSortingAccTest.java | 4 +- .../task/ServiceLevelOfAllTasksAccTest.java | 4 +- .../task/ServiceLevelPriorityAccTest.java | 4 +- .../java/acceptance/task/SetOwnerAccTest.java | 4 +- .../acceptance/task/TerminateTaskAccTest.java | 4 +- .../acceptance/task/TransferTaskAccTest.java | 4 +- .../acceptance/task/UpdateTaskAccTest.java | 4 +- .../task/UpdateTaskAttachmentsAccTest.java | 4 +- .../task/UpdateTaskCommentAccTest.java | 4 +- .../acceptance/task/WorkOnTaskAccTest.java | 4 +- .../taskrouting/TaskRoutingAccTest.java | 4 +- .../workbasket/CreateWorkbasketAccTest.java | 4 +- .../workbasket/DeleteWorkbasketAccTest.java | 4 +- .../DistributionTargetsAccTest.java | 4 +- .../workbasket/GetWorkbasketAccTest.java | 4 +- .../workbasket/QueryWorkbasketAccTest.java | 4 +- .../QueryWorkbasketAccessItemsAccTest.java | 4 +- .../QueryWorkbasketByPermissionAccTest.java | 4 +- ...QueryWorkbasketsWithPaginationAccTest.java | 4 +- .../workbasket/UpdateWorkbasketAccTest.java | 4 +- ...pdateWorkbasketAuthorizations2AccTest.java | 4 +- ...UpdateWorkbasketAuthorizationsAccTest.java | 4 +- ...sketQueryWithOrderedPaginationAccTest.java | 4 +- .../java/pro/taskana/ArchitectureTest.java | 178 +++++++++++------- .../internal}/security/JaasExtension.java | 4 +- .../internal}/security/JaasExtensionTest.java | 4 +- .../internal}/security/WithAccessId.java | 2 +- .../internal}/security/WithAccessIds.java | 2 +- .../TaskStatusReportBuilderImplTest.java | 4 +- .../WorkbasketReportBuilderImplTest.java | 4 +- .../internal/JunitHelper.java | 2 +- .../TaskServiceImplIntAutocommitTest.java | 5 +- .../TaskServiceImplIntExplicitTest.java | 5 +- .../task/internal/TaskServiceImplTest.java | 21 --- ...orkbasketServiceImplIntAutocommitTest.java | 4 +- .../WorkbasketServiceImplIntExplicitTest.java | 4 +- .../taskana/TaskanaTransactionIntTest.java | 4 +- .../java/pro/taskana/jobs/JobScheduler.java | 4 +- 86 files changed, 271 insertions(+), 259 deletions(-) rename lib/taskana-core/src/main/java/pro/taskana/{common => classification}/internal/jobs/ClassificationChangedJob.java (96%) rename lib/taskana-core/src/main/java/pro/taskana/{common => task}/internal/jobs/TaskCleanupJob.java (98%) rename lib/taskana-core/src/main/java/pro/taskana/{common => task}/internal/jobs/TaskRefreshJob.java (92%) rename lib/taskana-core/src/main/java/pro/taskana/{common => workbasket}/internal/jobs/WorkbasketCleanupJob.java (98%) rename lib/taskana-core/src/test/java/pro/taskana/{ => common/internal}/security/JaasExtension.java (98%) rename lib/taskana-core/src/test/java/pro/taskana/{ => common/internal}/security/JaasExtensionTest.java (99%) rename lib/taskana-core/src/test/java/pro/taskana/{ => common/internal}/security/WithAccessId.java (89%) rename lib/taskana-core/src/test/java/pro/taskana/{ => common/internal}/security/WithAccessIds.java (86%) rename lib/taskana-core/src/test/java/pro/taskana/{task => monitor}/internal/TaskStatusReportBuilderImplTest.java (97%) rename lib/taskana-core/src/test/java/pro/taskana/{workbasket => monitor}/internal/WorkbasketReportBuilderImplTest.java (99%) rename lib/taskana-core/src/test/java/pro/taskana/{common => task}/internal/JunitHelper.java (97%) 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 a64ff9297..a7233d96e 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 @@ -20,6 +20,7 @@ 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.jobs.ClassificationChangedJob; import pro.taskana.classification.internal.models.ClassificationImpl; import pro.taskana.common.api.ScheduledJob; import pro.taskana.common.api.TaskanaRole; @@ -28,7 +29,6 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; 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.common.internal.util.LogSanitizer; import pro.taskana.task.api.models.TaskSummary; diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/ClassificationChangedJob.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/jobs/ClassificationChangedJob.java similarity index 96% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/ClassificationChangedJob.java rename to lib/taskana-core/src/main/java/pro/taskana/classification/internal/jobs/ClassificationChangedJob.java index b2e46bf7b..d62879dc6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/ClassificationChangedJob.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/jobs/ClassificationChangedJob.java @@ -1,4 +1,4 @@ -package pro.taskana.common.internal.jobs; +package pro.taskana.classification.internal.jobs; import java.util.HashMap; import java.util.List; @@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.ScheduledJob; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.TaskanaException; +import pro.taskana.common.internal.jobs.AbstractTaskanaJob; import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; import pro.taskana.task.internal.TaskServiceImpl; diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/AbstractTaskanaJob.java b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/AbstractTaskanaJob.java index 805241501..d16af6bba 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/AbstractTaskanaJob.java +++ b/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/AbstractTaskanaJob.java @@ -4,11 +4,15 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import pro.taskana.classification.internal.jobs.ClassificationChangedJob; import pro.taskana.common.api.ScheduledJob; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.internal.TaskanaEngineImpl; import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; +import pro.taskana.task.internal.jobs.TaskCleanupJob; +import pro.taskana.task.internal.jobs.TaskRefreshJob; +import pro.taskana.workbasket.internal.jobs.WorkbasketCleanupJob; /** Abstract base for all background jobs of TASKANA. */ public abstract class AbstractTaskanaJob implements TaskanaJob { @@ -48,7 +52,7 @@ public abstract class AbstractTaskanaJob implements TaskanaJob { } } - List> partition(Collection members, int maxSize) { + protected List> partition(Collection members, int maxSize) { List> result = new ArrayList<>(); List internal = new ArrayList<>(); for (T member : members) { 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/task/internal/jobs/TaskCleanupJob.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskCleanupJob.java rename to lib/taskana-core/src/main/java/pro/taskana/task/internal/jobs/TaskCleanupJob.java index ff1ba8cef..54cec186e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskCleanupJob.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/jobs/TaskCleanupJob.java @@ -1,4 +1,4 @@ -package pro.taskana.common.internal.jobs; +package pro.taskana.task.internal.jobs; import java.time.Duration; import java.time.Instant; @@ -18,6 +18,7 @@ import pro.taskana.common.api.TaskanaEngine; 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.jobs.AbstractTaskanaJob; import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; import pro.taskana.common.internal.util.LogSanitizer; import pro.taskana.task.api.models.TaskSummary; diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskRefreshJob.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/jobs/TaskRefreshJob.java similarity index 92% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskRefreshJob.java rename to lib/taskana-core/src/main/java/pro/taskana/task/internal/jobs/TaskRefreshJob.java index 9c0423fd5..3d0c1a3aa 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/TaskRefreshJob.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/jobs/TaskRefreshJob.java @@ -1,4 +1,4 @@ -package pro.taskana.common.internal.jobs; +package pro.taskana.task.internal.jobs; import java.util.Arrays; import java.util.List; @@ -6,10 +6,12 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import pro.taskana.classification.internal.jobs.ClassificationChangedJob; import pro.taskana.common.api.LoggerUtils; import pro.taskana.common.api.ScheduledJob; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.TaskanaException; +import pro.taskana.common.internal.jobs.AbstractTaskanaJob; import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; import pro.taskana.task.internal.TaskServiceImpl; diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/WorkbasketCleanupJob.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/jobs/WorkbasketCleanupJob.java similarity index 98% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/WorkbasketCleanupJob.java rename to lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/jobs/WorkbasketCleanupJob.java index 4633cb126..3c5c724c6 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/WorkbasketCleanupJob.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/jobs/WorkbasketCleanupJob.java @@ -1,4 +1,4 @@ -package pro.taskana.common.internal.jobs; +package pro.taskana.workbasket.internal.jobs; import java.time.Duration; import java.time.Instant; @@ -13,6 +13,7 @@ import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; +import pro.taskana.common.internal.jobs.AbstractTaskanaJob; import pro.taskana.common.internal.transaction.TaskanaTransactionProvider; import pro.taskana.workbasket.api.WorkbasketQueryColumnName; 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 b458f894b..28409ad32 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java @@ -16,8 +16,8 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; /** Acceptance test for all "create classification" scenarios. */ @ExtendWith(JaasExtension.class) 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 95a3da813..9f0e93780 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java @@ -13,8 +13,8 @@ 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; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; /** Acceptance test for all "delete classification" scenarios. */ @ExtendWith(JaasExtension.class) 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 0c17e24b5..c808d9488 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java @@ -27,8 +27,8 @@ import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.ConcurrencyException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; /** Acceptance test for all "get classification" scenarios. */ @ExtendWith(JaasExtension.class) 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 5cc672bd8..4fe8f0855 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.extension.ExtendWith; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.ClassificationSummary; -import pro.taskana.security.JaasExtension; +import pro.taskana.common.internal.security.JaasExtension; /** Acceptance test for all "query classifications with pagination" scenarios. */ @ExtendWith(JaasExtension.class) 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 fdcc8fca6..f15ab068a 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java @@ -22,9 +22,9 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.jobs.JobRunner; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.internal.util.WorkingDaysToDaysConverter; -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.api.models.Task; 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 10de7421a..ddc60e5df 100644 --- a/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java @@ -13,9 +13,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.InvalidOwnerException; import pro.taskana.task.api.exceptions.InvalidStateException; @@ -23,6 +22,7 @@ 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.task.internal.jobs.TaskCleanupJob; 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 c98c4c5f1..923e964db 100644 --- a/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java @@ -11,14 +11,14 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.BaseQuery; import pro.taskana.common.api.exceptions.TaskanaException; -import pro.taskana.common.internal.jobs.TaskCleanupJob; -import pro.taskana.common.internal.jobs.WorkbasketCleanupJob; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; +import pro.taskana.task.internal.jobs.TaskCleanupJob; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; +import pro.taskana.workbasket.internal.jobs.WorkbasketCleanupJob; /** Acceptance test for all "jobs workbasket runner" scenarios. */ @ExtendWith(JaasExtension.class) 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 7c0d0fe4b..4182e3693 100644 --- a/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.security.JaasExtension; +import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.task.api.ObjectReferenceQuery; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskService; 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 e8f52d21c..8cfa7c240 100644 --- a/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java @@ -23,9 +23,9 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.JobServiceImpl; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.internal.util.WorkingDaysToDaysConverter; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.AttachmentPersistenceException; import pro.taskana.task.api.exceptions.InvalidStateException; diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java index 049f36498..1617061cd 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java @@ -13,9 +13,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; /** Acceptance test for all "classification report" scenarios. */ diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java index 112a705ce..79d6b9744 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java @@ -15,11 +15,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java index cac7a6598..4077a1575 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java @@ -11,11 +11,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; /** Acceptance test for all "get task ids of classification report" scenarios. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java index 67b3bd654..fe6b1d8f4 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java @@ -15,11 +15,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java index f15a165be..df1269e8e 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java @@ -12,11 +12,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; /** Acceptance test for all "get task ids of workbasket report" scenarios. */ @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 7af1fc438..c8e7349b4 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java @@ -18,11 +18,11 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.reports.CategoryReport; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; 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 c38013e9e..2f2146c56 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java @@ -18,11 +18,11 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.reports.ClassificationReport; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; 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 9920c622e..6a2c55acd 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java @@ -17,11 +17,11 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.reports.CustomFieldValueReport; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java index 44a940a29..d4ef58003 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java @@ -17,14 +17,14 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.reports.ClassificationReport.DetailedClassificationReport; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; import pro.taskana.monitor.api.reports.item.DetailedMonitorQueryItem; import pro.taskana.monitor.api.reports.row.FoldableRow; import pro.taskana.monitor.api.reports.row.Row; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java index ceb5dcc25..7dd6b49f2 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java @@ -16,13 +16,13 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.reports.TaskStatusReport; import pro.taskana.monitor.api.reports.header.TaskStatusColumnHeader; import pro.taskana.monitor.api.reports.item.TaskQueryItem; import pro.taskana.monitor.api.reports.row.Row; -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.exceptions.InvalidStateException; 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 2589914d2..050120268 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java @@ -11,14 +11,14 @@ import java.util.stream.IntStream; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.reports.TimestampReport; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; import pro.taskana.monitor.api.reports.item.TimestampQueryItem; import pro.taskana.monitor.api.reports.row.SingleRow; import pro.taskana.monitor.api.reports.row.TimestampRow; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; /** Test class for {@link TimestampReport}. */ @ExtendWith(JaasExtension.class) diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java index ef39e6a55..2349eb6b0 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java @@ -18,12 +18,12 @@ import org.slf4j.LoggerFactory; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.monitor.api.CombinedClassificationFilter; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.reports.WorkbasketReport; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; 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 d6ce87ac1..1232337ef 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java @@ -9,8 +9,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.ClassificationSummary; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; /** * Acceptance test for classification queries and authorization. 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 bd1581c92..9ac02a2ca 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java @@ -11,8 +11,8 @@ 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; /** 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 f5fa0edab..8f2ed4f1c 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java @@ -7,8 +7,8 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.TaskSummary; 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 fafc87651..cc115b00f 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; 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 61736ff03..5f80e725e 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java @@ -19,8 +19,8 @@ import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.exceptions.InvalidArgumentException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.CallbackState; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/test/java/acceptance/task/CancelTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CancelTaskAccTest.java index 631ad4817..bb6d38214 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CancelTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CancelTaskAccTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.InvalidStateException; 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 b7b88055b..08819b991 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java @@ -13,8 +13,8 @@ import pro.taskana.classification.api.exceptions.ClassificationNotFoundException import pro.taskana.common.api.exceptions.InvalidArgumentException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.InvalidOwnerException; 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 70163005f..408c5e7d4 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java @@ -26,9 +26,9 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.TaskanaEngineProxyForTest; import pro.taskana.common.internal.security.CurrentUserContext; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.internal.util.WorkingDaysToDaysConverter; -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.exceptions.InvalidStateException; diff --git a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskCommentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskCommentAccTest.java index a196cf3a6..a481db2a7 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskCommentAccTest.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.extension.ExtendWith; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskNotFoundException; import pro.taskana.task.api.models.TaskComment; 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 f7c44eabb..cf4e5824d 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java @@ -14,8 +14,8 @@ import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.exceptions.InvalidArgumentException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.InvalidStateException; import pro.taskana.task.api.exceptions.TaskNotFoundException; diff --git a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java index 05a4059fb..09610c41a 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskCommentNotFoundException; import pro.taskana.task.api.exceptions.TaskNotFoundException; 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 c8862c126..3edd3b8a2 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.TaskNotFoundException; diff --git a/lib/taskana-core/src/test/java/acceptance/task/GetTaskCommentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/GetTaskCommentAccTest.java index 55eb7287e..9859f4b15 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/GetTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/GetTaskCommentAccTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskCommentNotFoundException; import pro.taskana.task.api.exceptions.TaskNotFoundException; 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 6951e530a..440a0a3b8 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskQueryColumnName; import pro.taskana.task.api.TaskService; diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java index 060d96e45..38f7b3658 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java @@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskNotFoundException; import pro.taskana.task.api.models.Attachment; 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 39362063b..0cbaffa4a 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java @@ -42,9 +42,9 @@ import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.TaskanaEngineProxyForTest; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.internal.util.Triplet; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskQueryColumnName; import pro.taskana.task.api.TaskService; 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 54806a9b2..6063d2c2d 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.SystemException; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.TaskSummary; 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 b6ee76b33..ddfb00d67 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.TimeInterval; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.TaskSummary; diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWildcardSearchAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWildcardSearchAccTest.java index 20a2d134f..4e096e362 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWildcardSearchAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWildcardSearchAccTest.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.WildcardSearchField; import pro.taskana.task.api.models.TaskSummary; 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 8883c1d22..d6f420dd9 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java @@ -12,8 +12,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.KeyDomain; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.TaskSummary; import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException; 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 543725719..aea129f46 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.KeyDomain; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.TaskSummary; 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 969010e96..8b854e20c 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java @@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.KeyDomain; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.models.TaskSummary; diff --git a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java index 75a9ea680..559e79c06 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java @@ -14,8 +14,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.exceptions.TaskanaException; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.Task; import pro.taskana.task.api.models.TaskSummary; diff --git a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java index cd274d024..015ba4d1a 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java @@ -21,9 +21,9 @@ import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.internal.util.WorkingDaysToDaysConverter; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.AttachmentPersistenceException; import pro.taskana.task.api.exceptions.InvalidStateException; diff --git a/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java index e235f35d5..6aae4dc18 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java @@ -22,8 +22,8 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.internal.TaskanaEngineProxyForTest; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.AttachmentPersistenceException; diff --git a/lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java index 6ffd9afb1..ff9f3ed40 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java @@ -12,8 +12,8 @@ import org.junit.jupiter.api.Test; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.InvalidStateException; 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 c6c25f35e..3f988ac69 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java @@ -17,8 +17,8 @@ import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.exceptions.InvalidArgumentException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.InvalidOwnerException; 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 405602dfc..57c620685 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java @@ -18,8 +18,8 @@ import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.exceptions.ConcurrencyException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.AttachmentPersistenceException; 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 c69b53522..10f32b674 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java @@ -21,9 +21,9 @@ import pro.taskana.common.api.exceptions.ConcurrencyException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.security.CurrentUserContext; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.internal.util.WorkingDaysToDaysConverter; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.AttachmentPersistenceException; import pro.taskana.task.api.exceptions.InvalidStateException; diff --git a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskCommentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskCommentAccTest.java index e0de52e60..a205b17f5 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskCommentAccTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.ConcurrencyException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskCommentNotFoundException; import pro.taskana.task.api.exceptions.TaskNotFoundException; 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 174f1ab33..ac0ce08b2 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java @@ -16,8 +16,8 @@ import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.exceptions.InvalidArgumentException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.api.exceptions.InvalidOwnerException; 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 b259db5a2..7edce3b57 100644 --- a/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.classification.api.exceptions.ClassificationNotFoundException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.exceptions.TaskNotFoundException; 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 0e34cdd9c..98296df55 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java @@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.DomainNotFoundException; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; 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 17e9c8532..c9a892c51 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java @@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.InvalidOwnerException; import pro.taskana.task.api.exceptions.InvalidStateException; 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 c093c478e..d0e722656 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java @@ -16,8 +16,8 @@ import org.junit.jupiter.api.Test; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; import pro.taskana.workbasket.api.models.Workbasket; 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 7569c4f5e..2d1e14571 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; 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 80bf63023..221632b43 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java @@ -17,8 +17,8 @@ import org.junit.jupiter.api.extension.ExtendWith; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketQuery; import pro.taskana.workbasket.api.WorkbasketService; 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 afd4fc5c4..9445d8365 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.extension.ExtendWith; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketAccessItemQuery; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketAccessItem; 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 79e8d54eb..6384fddaf 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java @@ -15,8 +15,8 @@ import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.SystemException; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; 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 9e350f0be..fff59c360 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java @@ -7,8 +7,8 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; 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 fde666fc8..36c8ca0f3 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java @@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException; 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 565c0a442..29d996116 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java @@ -8,8 +8,8 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.security.JaasExtension; -import pro.taskana.security.WithAccessId; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketAccessItem; 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 270446f40..9fd4323ac 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java @@ -15,8 +15,8 @@ import pro.taskana.classification.api.exceptions.ClassificationNotFoundException import pro.taskana.common.api.KeyDomain; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; import pro.taskana.task.api.models.Task; 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 7a6633b7d..4b1c5995f 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; 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.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketSummary; diff --git a/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java b/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java index 27d9634a0..95308887c 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java @@ -5,28 +5,51 @@ import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; import static com.tngtech.archunit.library.GeneralCodingRules.NO_CLASSES_SHOULD_ACCESS_STANDARD_STREAMS; import static com.tngtech.archunit.library.GeneralCodingRules.NO_CLASSES_SHOULD_THROW_GENERIC_EXCEPTIONS; import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices; -import static org.junit.jupiter.api.DynamicTest.dynamicTest; +import static org.assertj.core.api.Assertions.assertThat; +import com.tngtech.archunit.core.domain.JavaClass; import com.tngtech.archunit.core.domain.JavaClasses; import com.tngtech.archunit.core.importer.ClassFileImporter; +import com.tngtech.archunit.lang.ArchCondition; import com.tngtech.archunit.lang.ArchRule; +import com.tngtech.archunit.lang.ConditionEvents; +import com.tngtech.archunit.lang.SimpleConditionEvent; +import java.util.Arrays; +import java.util.List; import java.util.regex.Pattern; +import java.util.stream.Collectors; import java.util.stream.Stream; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestFactory; +import org.junit.jupiter.api.function.ThrowingConsumer; /** * Test architecture of classes in taskana. For more info and examples see * https://www.archunit.org/userguide/html/000_Index.html */ class ArchitectureTest { + private static final List TASKANA_SUB_PACKAGES = + Arrays.asList( + "pro.taskana.sampledata", + "pro.taskana.common.internal", + "pro.taskana.common.api", + "pro.taskana.classification.api", + "pro.taskana.classification.internal", + "pro.taskana.spi.history.api", + "pro.taskana.spi.history.internal", + "pro.taskana.monitor.api", + "pro.taskana.monitor.internal", + "pro.taskana.task.api", + "pro.taskana.task.internal", + "pro.taskana.workbasket.api", + "pro.taskana.workbasket.internal", + "pro.taskana.spi.routing.api"); private static JavaClasses importedClasses; @BeforeAll - static void init() throws ClassNotFoundException { + static void init() { // time intensive operation should only be done once importedClasses = new ClassFileImporter().importPackages("pro.taskana", "acceptance"); } @@ -74,95 +97,106 @@ class ArchitectureTest { NO_CLASSES_SHOULD_ACCESS_STANDARD_STREAMS.check(importedClasses); } - /** - * Solution would be nice, but is not achievable without big changes - * https://www.archunit.org/userguide/html/000_Index.html#_cycle_checks - */ - @Disabled @Test - void freeOfCycles() { - ArchRule myRule = slices().matching("pro.taskana.(*)..").should().beFreeOfCycles(); + void everySubpackageShouldBeTestsForCyclicDependencies() { + List excludePackages = + Stream.of( + "pro.taskana", // from TaskanaEngineConfiguration + "acceptance.*" // all our acceptance tests + ) + .map(Pattern::compile) + .collect(Collectors.toList()); + ArchCondition condition = + new ArchCondition("all be defined in TASKANA_SUB_PACKAGES") { + @Override + public void check(JavaClass item, ConditionEvents events) { + if (TASKANA_SUB_PACKAGES.stream().noneMatch(p -> item.getPackageName().startsWith(p)) + && excludePackages.stream() + .noneMatch(p -> p.matcher(item.getPackageName()).matches())) { + String message = + String.format( + "Package '%s' was not declared in TASKANA_SUB_PACKAGES", + item.getPackageName()); + events.add(SimpleConditionEvent.violated(item, message)); + } + } + }; + ArchRule myRule = classes().should(condition); myRule.check(importedClasses); } + @TestFactory + Stream everyPackageWhichIsTestedForCyclicDependenciesShouldExist() { + return DynamicTest.stream( + TASKANA_SUB_PACKAGES.iterator(), + p -> String.format("package '%s' exists", p), + p -> assertThat(importedClasses.containPackage(p)).isTrue()); + } + /** * Test for cycles with subpackages * https://www.archunit.org/userguide/html/000_Index.html#_cycle_checks */ @TestFactory - Stream freeOfCycles_subpackages() { - - Stream packagesToTest = - Stream.of( - "pro.taskana.common.internal.(*)..", - "pro.taskana.common.api.(*)..", - "pro.taskana.classification.api.(*)..", - "pro.taskana.classification.internal.(*)..", - "pro.taskana.history.api.(*)..", - "pro.taskana.history.internal.(*)..", - "pro.taskana.report.api.(*)..", - "pro.taskana.report.internal.(*)..", - "pro.taskana.task.api.(*)..", - "pro.taskana.task.internal.(*)..", - "pro.taskana.workbasket.api.(*)..", - "pro.taskana.workbasket.internal.(*).."); - return packagesToTest.map( - p -> - dynamicTest( - p.replaceAll(Pattern.quote("pro.taskana."), "") + " is free of cycles", - () -> slices().matching(p).should().beFreeOfCycles().check(importedClasses))); + Stream everySubPackageShouldBeFreeOfCyclicDependencies() { + Stream packagesToTest = TASKANA_SUB_PACKAGES.stream().map(s -> s + ".(*).."); + ThrowingConsumer testMethod = + p -> slices().matching(p).should().beFreeOfCycles().check(importedClasses); + return DynamicTest.stream( + packagesToTest.iterator(), + p -> p.replaceAll(Pattern.quote("pro.taskana."), "") + " is free of cycles", + testMethod); } - @Disabled("TBD") @TestFactory Stream commonClassesShouldNotDependOnOtherDomainClasses() { - Stream packagesToTest = - Stream.of("..workbasket..", "..report..", "..history..", "..task..", "..classification.."); - return packagesToTest.map( + TASKANA_SUB_PACKAGES.stream() + .map(p -> p.split("\\.")[2]) + .distinct() + .filter(d -> !"common".equals(d)) + .map(d -> ".." + d + ".."); + ThrowingConsumer testMethod = p -> - dynamicTest( - p.replaceAll(Pattern.quote("."), "") + " should not be used by common", - () -> - noClasses() - .that() - .resideInAPackage("..common..") - .should() - .dependOnClassesThat() - .resideInAPackage(p) - .check(importedClasses))); + noClasses() + .that() + .haveNameNotMatching(".*TaskanaEngine.*") + .and() + .haveSimpleNameNotEndingWith("AbstractTaskanaJob") + .and() + .resideInAPackage("..common..") + .should() + .dependOnClassesThat() + .resideInAPackage(p) + .check(importedClasses); + return DynamicTest.stream( + packagesToTest.iterator(), p -> p + " should not be used by common", testMethod); } @TestFactory - Stream classesShouldNotDependOnReportDomainClasses() { - + Stream classesShouldNotDependOnMonitorDomainClasses() { Stream packagesToTest = - Stream.of( - "..workbasket..", - "..history..", - "..task..", - // TBD - // "..common..", - "..classification.."); - return packagesToTest.map( - p -> - dynamicTest( - "Domain " + p.replaceAll(Pattern.quote("."), "") + " should not depend on reports", - () -> - noClasses() - .that() - .resideInAPackage(p) - .should() - .dependOnClassesThat() - .resideInAnyPackage("..report..") - .check(importedClasses))); - } + TASKANA_SUB_PACKAGES.stream() + .map(p -> p.split("\\.")[2]) + .distinct() + .filter(d -> !"monitor".equals(d)) + .map(d -> ".." + d + ".."); - @Disabled - @Test - void freeOfCyclicDependencies() { - ArchRule myRule = slices().matching("pro.taskana.(*)..").should().notDependOnEachOther(); - myRule.check(importedClasses); + ThrowingConsumer testMethod = + p -> + noClasses() + .that() + .resideInAPackage(p) + .and() + .haveNameNotMatching(".*TaskanaEngine.*") + .should() + .dependOnClassesThat() + .resideInAnyPackage("..monitor..") + .check(importedClasses); + return DynamicTest.stream( + packagesToTest.iterator(), + p -> String.format("Domain %s should not depend on monitor", p), + testMethod); } @Test diff --git a/lib/taskana-core/src/test/java/pro/taskana/security/JaasExtension.java b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtension.java similarity index 98% rename from lib/taskana-core/src/test/java/pro/taskana/security/JaasExtension.java rename to lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtension.java index 92114aeeb..027da3ee0 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/security/JaasExtension.java +++ b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtension.java @@ -1,4 +1,4 @@ -package pro.taskana.security; +package pro.taskana.common.internal.security; import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated; import static pro.taskana.common.internal.util.CheckedFunction.wrap; @@ -36,8 +36,6 @@ import org.junit.platform.commons.JUnitException; import org.junit.platform.commons.support.AnnotationSupport; import pro.taskana.common.api.exceptions.SystemException; -import pro.taskana.common.internal.security.GroupPrincipal; -import pro.taskana.common.internal.security.UserPrincipal; /** Runner for integration tests that enables JAAS subject. */ public class JaasExtension implements InvocationInterceptor, TestTemplateInvocationContextProvider { diff --git a/lib/taskana-core/src/test/java/pro/taskana/security/JaasExtensionTest.java b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtensionTest.java similarity index 99% rename from lib/taskana-core/src/test/java/pro/taskana/security/JaasExtensionTest.java rename to lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtensionTest.java index 712e1c8df..c356f80e6 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/security/JaasExtensionTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtensionTest.java @@ -1,4 +1,4 @@ -package pro.taskana.security; +package pro.taskana.common.internal.security; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.DynamicContainer.dynamicContainer; @@ -23,8 +23,6 @@ import org.junit.jupiter.api.TestFactory; import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.common.internal.security.CurrentUserContext; - @ExtendWith(JaasExtension.class) public class JaasExtensionTest { diff --git a/lib/taskana-core/src/test/java/pro/taskana/security/WithAccessId.java b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessId.java similarity index 89% rename from lib/taskana-core/src/test/java/pro/taskana/security/WithAccessId.java rename to lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessId.java index 2bcfce2e1..15ff8b785 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/security/WithAccessId.java +++ b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessId.java @@ -1,4 +1,4 @@ -package pro.taskana.security; +package pro.taskana.common.internal.security; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/lib/taskana-core/src/test/java/pro/taskana/security/WithAccessIds.java b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessIds.java similarity index 86% rename from lib/taskana-core/src/test/java/pro/taskana/security/WithAccessIds.java rename to lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessIds.java index 32116051c..b28ba34da 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/security/WithAccessIds.java +++ b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessIds.java @@ -1,4 +1,4 @@ -package pro.taskana.security; +package pro.taskana.common.internal.security; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskStatusReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskStatusReportBuilderImplTest.java similarity index 97% rename from lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskStatusReportBuilderImplTest.java rename to lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskStatusReportBuilderImplTest.java index ef3778d9b..0088af899 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskStatusReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskStatusReportBuilderImplTest.java @@ -1,4 +1,4 @@ -package pro.taskana.task.internal; +package pro.taskana.monitor.internal; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -24,8 +24,6 @@ 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.monitor.internal.MonitorServiceImpl; import pro.taskana.task.api.TaskState; /** Unit Test for TaskStatusReportBuilderImpl. */ diff --git a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkbasketReportBuilderImplTest.java similarity index 99% rename from lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketReportBuilderImplTest.java rename to lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkbasketReportBuilderImplTest.java index 2374acf3f..47d8be8c0 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkbasketReportBuilderImplTest.java @@ -1,4 +1,4 @@ -package pro.taskana.workbasket.internal; +package pro.taskana.monitor.internal; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -34,8 +34,6 @@ import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.reports.WorkbasketReport; 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.MonitorServiceImpl; import pro.taskana.task.api.CustomField; import pro.taskana.task.api.TaskState; diff --git a/lib/taskana-core/src/test/java/pro/taskana/common/internal/JunitHelper.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/JunitHelper.java similarity index 97% rename from lib/taskana-core/src/test/java/pro/taskana/common/internal/JunitHelper.java rename to lib/taskana-core/src/test/java/pro/taskana/task/internal/JunitHelper.java index 3baa64557..8d77bfbd4 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/common/internal/JunitHelper.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/JunitHelper.java @@ -1,4 +1,4 @@ -package pro.taskana.common.internal; +package pro.taskana.task.internal; import pro.taskana.task.api.models.Attachment; import pro.taskana.task.api.models.ObjectReference; 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 b5d04eddc..acb91523d 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 @@ -27,14 +27,13 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.SystemException; -import pro.taskana.common.internal.JunitHelper; import pro.taskana.common.internal.TaskanaEngineImpl; import pro.taskana.common.internal.TaskanaEngineTestConfiguration; import pro.taskana.common.internal.security.CurrentUserContext; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; 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.TaskState; import pro.taskana.task.api.exceptions.InvalidStateException; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; 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 1578e4a0c..b43092883 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 @@ -29,15 +29,14 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.SystemException; -import pro.taskana.common.internal.JunitHelper; import pro.taskana.common.internal.TaskanaEngineImpl; import pro.taskana.common.internal.TaskanaEngineTestConfiguration; import pro.taskana.common.internal.configuration.DbSchemaCreator; import pro.taskana.common.internal.security.CurrentUserContext; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; 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.TaskState; import pro.taskana.task.api.exceptions.InvalidStateException; import pro.taskana.task.api.exceptions.TaskAlreadyExistException; 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 77f45b582..6a8a3b3e5 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 @@ -19,17 +19,14 @@ import pro.taskana.TaskanaEngineConfiguration; 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.CallbackState; 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.api.models.Workbasket; -import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** * Unit Test for TaskServiceImpl. @@ -186,22 +183,4 @@ class TaskServiceImplTest { assertThat(summaryAfter).isEqualTo(summaryBefore); assertThat(summaryAfter.hashCode()).isEqualTo(summaryBefore.hashCode()); } - - static Classification createDummyClassification() { - ClassificationImpl classification = new ClassificationImpl(); - classification.setName("dummy-classification"); - classification.setDomain("dummy-domain"); - classification.setKey("dummy-classification-key"); - classification.setId("DummyClassificationId"); - return classification; - } - - static WorkbasketImpl createWorkbasket(String id, String key) { - WorkbasketImpl workbasket = new WorkbasketImpl(); - workbasket.setId(id); - workbasket.setDomain("Domain1"); - workbasket.setKey(key); - workbasket.setName("Workbasket " + id); - return workbasket; - } } 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 00cd0e367..f6216dd90 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 @@ -21,10 +21,10 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.TaskanaEngineTestConfiguration; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; 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.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; 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 24d0e4752..4f5254f7a 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 @@ -22,10 +22,10 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.TaskanaEngineImpl; import pro.taskana.common.internal.TaskanaEngineTestConfiguration; +import pro.taskana.common.internal.security.JaasExtension; +import pro.taskana.common.internal.security.WithAccessId; 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.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException; 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 ac762db2a..8804171cc 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 @@ -27,14 +27,13 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.internal.TaskanaEngineImpl; -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.TaskService; 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.jobs.TaskCleanupJob; import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; @@ -43,6 +42,7 @@ 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.internal.jobs.WorkbasketCleanupJob; import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** Test for internal transaction management. */ 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 bc461add8..a1ed7964c 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 @@ -16,10 +16,10 @@ 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.internal.jobs.TaskCleanupJob; +import pro.taskana.workbasket.internal.jobs.WorkbasketCleanupJob; /** This class invokes the JobRunner periodically to schedule long running jobs. */ @Component