From 47aa60033faf81caaab930410972bdc7bf7d6e05 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Tue, 6 Oct 2020 17:18:06 +0200 Subject: [PATCH] TSK-1277: moved JaasExtension and all its necessary classes to common modules --- common/taskana-common-test/pom.xml | 18 + .../common/test}/security/JaasExtension.java | 2 +- .../common/test}/security/WithAccessId.java | 2 +- .../common/test}/security/WithAccessIds.java | 2 +- .../test}/security/JaasExtensionTest.java | 4 +- common/taskana-common/pom.xml | 11 + .../exceptions/AutocommitFailedException.java | 0 .../api/exceptions/ConcurrencyException.java | 0 .../exceptions/ConnectionNotSetException.java | 0 .../exceptions/DomainNotFoundException.java | 0 .../exceptions/InvalidArgumentException.java | 0 .../exceptions/NotAuthorizedException.java | 0 .../api/exceptions/NotFoundException.java | 0 .../api/exceptions/SystemException.java | 0 .../api/exceptions/TaskanaException.java | 0 .../exceptions/TaskanaRuntimeException.java | 0 .../UnsupportedDatabaseException.java | 0 .../WrongCustomHolidayFormatException.java | 0 .../internal/security/CurrentUserContext.java | 8 +- .../internal/security/GroupPrincipal.java | 0 .../internal/security/UserPrincipal.java | 0 .../internal/util/CheckedBiConsumer.java | 0 .../common/internal/util/CheckedConsumer.java | 0 .../common/internal/util/CheckedFunction.java | 0 .../common/internal/util/IdGenerator.java | 0 .../common/internal/util/LogSanitizer.java | 0 .../util/ObjectAttributeChangeDetector.java | 0 .../taskana/common/internal/util/Pair.java | 0 .../taskana/common/internal/util/Triplet.java | 0 .../taskana-simplehistory-provider/pom.xml | 6 + ...yEventOnClassificationDeletionAccTest.java | 4 +- ...EventOnClassificationsCreationAccTest.java | 4 +- ...ryEventOnClassificationsUpdateAccTest.java | 4 +- ...eHistoryEventOnTaskCancelClaimAccTest.java | 4 +- ...HistoryEventOnTaskCancellationAccTest.java | 4 +- .../CreateHistoryEventOnTaskClaimAccTest.java | 4 +- ...teHistoryEventOnTaskCompletionAccTest.java | 4 +- ...eateHistoryEventOnTaskCreationAccTest.java | 4 +- ...eHistoryEventOnTaskTerminationAccTest.java | 4 +- ...eateHistoryEventOnTaskTransferAccTest.java | 4 +- ...CreateHistoryEventOnTaskUpdateAccTest.java | 4 +- ...eteHistoryEventsOnTaskDeletionAccTest.java | 4 +- ...OnWorkbasketAccessItemCreationAccTest.java | 4 +- ...OnWorkbasketAccessItemDeletionAccTest.java | 4 +- ...nWorkbasketAccessItemsDeletionAccTest.java | 4 +- ...ventOnWorkbasketAccessItemsSetAccTest.java | 4 +- ...storyEventOnWorkbasketCreationAccTest.java | 4 +- ...storyEventOnWorkbasketDeletionAccTest.java | 4 +- ...kbasketDistributionTargetAddedAccTest.java | 4 +- ...asketDistributionTargetRemovedAccTest.java | 4 +- ...rkbasketDistributionTargetsSetAccTest.java | 4 +- ...tOnWorkbasketMarkedForDeletionAccTest.java | 4 +- ...HistoryEventOnWorkbasketUpdateAccTest.java | 4 +- .../jobs/HistoryCleanupJobAccTest.java | 4 +- lib/taskana-core/pom.xml | 13 +- .../CreateClassificationAccTest.java | 108 +++--- .../DeleteClassificationAccTest.java | 4 +- .../QueryClassificationAccTest.java | 4 +- ...ryClassificationWithPaginationAccTest.java | 2 +- .../UpdateClassificationAccTest.java | 4 +- .../jobs/TaskCleanupJobAccTest.java | 4 +- .../jobs/WorkbasketCleanupJobAccTest.java | 4 +- ...ObjectreferencesWithPaginationAccTest.java | 2 +- .../UpdateObjectsUseUtcTimeStampsAccTest.java | 4 +- ...CustomAttributeValuesForReportAccTest.java | 4 +- ...OfClassificationCategoryReportAccTest.java | 4 +- ...tTaskIdsOfClassificationReportAccTest.java | 4 +- ...dsOfTaskCustomFieldValueReportAccTest.java | 4 +- .../GetTaskIdsOfWorkbasketReportAccTest.java | 4 +- ...deClassificationCategoryReportAccTest.java | 4 +- .../ProvideClassificationReportAccTest.java | 4 +- ...deDetailedClassificationReportAccTest.java | 4 +- ...videTaskCustomFieldValueReportAccTest.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/SelectAndClaimTaskAccTest.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 +- .../CreateTaskPreprocessingAccTest.java | 4 +- .../taskrouting/TaskRoutingAccTest.java | 4 +- .../workbasket/CreateWorkbasketAccTest.java | 4 +- ...CreateWorkbasketAuthorizationsAccTest.java | 4 +- .../workbasket/DeleteWorkbasketAccTest.java | 4 +- ...DeleteWorkbasketAuthorizationsAccTest.java | 4 +- .../DistributionTargetsAccTest.java | 4 +- .../workbasket/GetWorkbasketAccTest.java | 4 +- .../GetWorkbasketAuthorizationsAccTest.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 | 1 + .../internal/security/JaasExtension.java | 322 ------------------ .../internal/security/WithAccessId.java | 17 - .../internal/security/WithAccessIds.java | 12 - .../TaskServiceImplIntAutocommitTest.java | 4 +- .../TaskServiceImplIntExplicitTest.java | 4 +- ...orkbasketServiceImplIntAutocommitTest.java | 4 +- .../WorkbasketServiceImplIntExplicitTest.java | 4 +- 133 files changed, 302 insertions(+), 608 deletions(-) rename {history/taskana-simplehistory-provider/src/test/java/acceptance => common/taskana-common-test/src/main/java/pro/taskana/common/test}/security/JaasExtension.java (99%) rename {history/taskana-simplehistory-provider/src/test/java/acceptance => common/taskana-common-test/src/main/java/pro/taskana/common/test}/security/WithAccessId.java (90%) rename {history/taskana-simplehistory-provider/src/test/java/acceptance => common/taskana-common-test/src/main/java/pro/taskana/common/test}/security/WithAccessIds.java (87%) rename {lib/taskana-core/src/test/java/pro/taskana/common/internal => common/taskana-common-test/src/test/java/pro/taskana/common/test}/security/JaasExtensionTest.java (99%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/AutocommitFailedException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/ConcurrencyException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/ConnectionNotSetException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/DomainNotFoundException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/InvalidArgumentException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/NotAuthorizedException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/NotFoundException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/SystemException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/TaskanaException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/TaskanaRuntimeException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/UnsupportedDatabaseException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/api/exceptions/WrongCustomHolidayFormatException.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/internal/security/CurrentUserContext.java (96%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/internal/security/GroupPrincipal.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/internal/security/UserPrincipal.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/internal/util/CheckedBiConsumer.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/internal/util/CheckedConsumer.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/internal/util/CheckedFunction.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/internal/util/IdGenerator.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/internal/util/LogSanitizer.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/internal/util/Pair.java (100%) rename {lib/taskana-core => common/taskana-common}/src/main/java/pro/taskana/common/internal/util/Triplet.java (100%) delete mode 100644 lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtension.java delete mode 100644 lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessId.java delete mode 100644 lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessIds.java diff --git a/common/taskana-common-test/pom.xml b/common/taskana-common-test/pom.xml index d6d61bd3e..8f41a5f90 100644 --- a/common/taskana-common-test/pom.xml +++ b/common/taskana-common-test/pom.xml @@ -15,5 +15,23 @@ ../pom.xml + + + org.junit.jupiter + junit-jupiter + + + pro.taskana + taskana-common + ${project.version} + + + + + org.assertj + assertj-core + test + + \ No newline at end of file diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/security/JaasExtension.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/JaasExtension.java similarity index 99% rename from history/taskana-simplehistory-provider/src/test/java/acceptance/security/JaasExtension.java rename to common/taskana-common-test/src/main/java/pro/taskana/common/test/security/JaasExtension.java index 3413389d6..2c6afd9ed 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/security/JaasExtension.java +++ b/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/JaasExtension.java @@ -1,4 +1,4 @@ -package acceptance.security; +package pro.taskana.common.test.security; import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated; import static pro.taskana.common.internal.util.CheckedFunction.wrap; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/security/WithAccessId.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessId.java similarity index 90% rename from history/taskana-simplehistory-provider/src/test/java/acceptance/security/WithAccessId.java rename to common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessId.java index 9370896f6..362f37035 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/security/WithAccessId.java +++ b/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessId.java @@ -1,4 +1,4 @@ -package acceptance.security; +package pro.taskana.common.test.security; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/security/WithAccessIds.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessIds.java similarity index 87% rename from history/taskana-simplehistory-provider/src/test/java/acceptance/security/WithAccessIds.java rename to common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessIds.java index 65fd66bbf..2cb32fcbf 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/security/WithAccessIds.java +++ b/common/taskana-common-test/src/main/java/pro/taskana/common/test/security/WithAccessIds.java @@ -1,4 +1,4 @@ -package acceptance.security; +package pro.taskana.common.test.security; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtensionTest.java b/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java similarity index 99% rename from lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtensionTest.java rename to common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java index adb1dbae9..efc03ebea 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtensionTest.java +++ b/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java @@ -1,4 +1,4 @@ -package pro.taskana.common.internal.security; +package pro.taskana.common.test.security; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.DynamicContainer.dynamicContainer; @@ -23,6 +23,8 @@ 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) class JaasExtensionTest { diff --git a/common/taskana-common/pom.xml b/common/taskana-common/pom.xml index fe33ad3b3..a3b4eee1d 100644 --- a/common/taskana-common/pom.xml +++ b/common/taskana-common/pom.xml @@ -14,5 +14,16 @@ 4.1.1-SNAPSHOT + + + org.json + json + ${version.json} + + + org.slf4j + slf4j-api + + \ No newline at end of file diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/AutocommitFailedException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/AutocommitFailedException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/AutocommitFailedException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/AutocommitFailedException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/ConcurrencyException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ConcurrencyException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/ConcurrencyException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ConcurrencyException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/ConnectionNotSetException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ConnectionNotSetException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/ConnectionNotSetException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/ConnectionNotSetException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/DomainNotFoundException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/DomainNotFoundException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/DomainNotFoundException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/DomainNotFoundException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/InvalidArgumentException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/InvalidArgumentException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/InvalidArgumentException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/InvalidArgumentException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/NotAuthorizedException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/NotAuthorizedException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/NotAuthorizedException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/NotAuthorizedException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/NotFoundException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/NotFoundException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/NotFoundException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/NotFoundException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/SystemException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/SystemException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/SystemException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/SystemException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/TaskanaException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/TaskanaException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/TaskanaException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/TaskanaException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/TaskanaRuntimeException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/TaskanaRuntimeException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/TaskanaRuntimeException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/TaskanaRuntimeException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/UnsupportedDatabaseException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/UnsupportedDatabaseException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/UnsupportedDatabaseException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/UnsupportedDatabaseException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/WrongCustomHolidayFormatException.java b/common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/WrongCustomHolidayFormatException.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/api/exceptions/WrongCustomHolidayFormatException.java rename to common/taskana-common/src/main/java/pro/taskana/common/api/exceptions/WrongCustomHolidayFormatException.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/security/CurrentUserContext.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/security/CurrentUserContext.java similarity index 96% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/security/CurrentUserContext.java rename to common/taskana-common/src/main/java/pro/taskana/common/internal/security/CurrentUserContext.java index 764a7eb21..ff452964b 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/common/internal/security/CurrentUserContext.java +++ b/common/taskana-common/src/main/java/pro/taskana/common/internal/security/CurrentUserContext.java @@ -1,6 +1,5 @@ package pro.taskana.common.internal.security; -import static pro.taskana.TaskanaEngineConfiguration.shouldUseLowerCaseForAccessIds; import static pro.taskana.common.internal.util.CheckedFunction.wrap; import java.lang.reflect.Method; @@ -148,9 +147,10 @@ public final class CurrentUserContext { private static String convertAccessId(String accessId) { String toReturn = accessId; - if (shouldUseLowerCaseForAccessIds()) { - toReturn = accessId.toLowerCase(); - } + // TODO: DAS IST DOOF + // if (shouldUseLowerCaseForAccessIds()) { + // toReturn = accessId.toLowerCase(); + // } LOGGER.trace("Found AccessId '{}'. Returning AccessId '{}' ", accessId, toReturn); return toReturn; } diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/security/GroupPrincipal.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/security/GroupPrincipal.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/security/GroupPrincipal.java rename to common/taskana-common/src/main/java/pro/taskana/common/internal/security/GroupPrincipal.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/security/UserPrincipal.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/security/UserPrincipal.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/security/UserPrincipal.java rename to common/taskana-common/src/main/java/pro/taskana/common/internal/security/UserPrincipal.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/CheckedBiConsumer.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedBiConsumer.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/util/CheckedBiConsumer.java rename to common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedBiConsumer.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/CheckedConsumer.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedConsumer.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/util/CheckedConsumer.java rename to common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedConsumer.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/CheckedFunction.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedFunction.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/util/CheckedFunction.java rename to common/taskana-common/src/main/java/pro/taskana/common/internal/util/CheckedFunction.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/IdGenerator.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/IdGenerator.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/util/IdGenerator.java rename to common/taskana-common/src/main/java/pro/taskana/common/internal/util/IdGenerator.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/LogSanitizer.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/LogSanitizer.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/util/LogSanitizer.java rename to common/taskana-common/src/main/java/pro/taskana/common/internal/util/LogSanitizer.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java rename to common/taskana-common/src/main/java/pro/taskana/common/internal/util/ObjectAttributeChangeDetector.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/Pair.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/Pair.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/util/Pair.java rename to common/taskana-common/src/main/java/pro/taskana/common/internal/util/Pair.java diff --git a/lib/taskana-core/src/main/java/pro/taskana/common/internal/util/Triplet.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/util/Triplet.java similarity index 100% rename from lib/taskana-core/src/main/java/pro/taskana/common/internal/util/Triplet.java rename to common/taskana-common/src/main/java/pro/taskana/common/internal/util/Triplet.java diff --git a/history/taskana-simplehistory-provider/pom.xml b/history/taskana-simplehistory-provider/pom.xml index 41207ab55..3c427c35b 100644 --- a/history/taskana-simplehistory-provider/pom.xml +++ b/history/taskana-simplehistory-provider/pom.xml @@ -38,6 +38,12 @@ ${project.version} test + + pro.taskana + taskana-common-test + ${project.version} + test + org.assertj assertj-core diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationDeletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationDeletionAccTest.java index 67dfb724d..35648cbe2 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationDeletionAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationDeletionAccTest.java @@ -3,13 +3,13 @@ package acceptance.events.classification; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.classification.api.ClassificationService; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper; import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsCreationAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsCreationAccTest.java index 373bf403a..d4a99265d 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsCreationAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsCreationAccTest.java @@ -3,14 +3,14 @@ package acceptance.events.classification; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.Classification; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper; import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsUpdateAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsUpdateAccTest.java index 4654dc873..672c1cec8 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsUpdateAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/classification/CreateHistoryEventOnClassificationsUpdateAccTest.java @@ -3,8 +3,6 @@ package acceptance.events.classification; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -12,6 +10,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.classification.api.ClassificationCustomField; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.Classification; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.classification.ClassificationHistoryEventMapper; import pro.taskana.spi.history.api.events.classification.ClassificationHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java index 15279faf7..7b24bcb54 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancelClaimAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.task; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java index 608aecbff..e368866c8 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCancellationAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.task; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; import pro.taskana.spi.history.api.events.task.TaskHistoryEventType; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java index 6cd2dde54..940e769e6 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskClaimAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.task; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java index 0ad17e070..9560696ea 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCompletionAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.task; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java index ead1b2b59..873cc026b 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskCreationAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.task; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java index 4144ffd36..f03b0d4e6 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTerminationAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.task; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; import pro.taskana.spi.history.api.events.task.TaskHistoryEventType; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java index 244eac492..301d34098 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskTransferAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.task; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java index 18ac1e8f0..79f3563d1 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/CreateHistoryEventOnTaskUpdateAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.task; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java index fed970816..2db81e45d 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java @@ -4,14 +4,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.Arrays; import java.util.List; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.TaskHistoryQueryImpl; import pro.taskana.simplehistory.impl.task.TaskHistoryQueryMapper; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java index 854d585f9..4f5dcb4d4 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemCreationAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java index 63f24b7e5..7cb0bed26 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemDeletionAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java index c0d8151a6..2103a7a42 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsDeletionAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java index 0ff607770..da5407e42 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketAccessItemsSetAccTest.java @@ -3,13 +3,13 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java index e57ef7a91..997d4f672 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketCreationAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java index 9190a75d6..50eb2d26c 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDeletionAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java index 7ffbb954b..c1868ee5e 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetAddedAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java index 8c722fde7..a52ca84b7 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetRemovedAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java index f8845f96c..366900f25 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java @@ -3,13 +3,13 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java index 8e2c11970..d90ed3a7b 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketMarkedForDeletionAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java index cac846ae7..c9c88c64b 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketUpdateAccTest.java @@ -3,12 +3,12 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.SimpleHistoryServiceImpl; import pro.taskana.simplehistory.impl.workbasket.WorkbasketHistoryEventMapper; import pro.taskana.spi.history.api.events.workbasket.WorkbasketHistoryEvent; diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java index 931680511..704945bf4 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/jobs/HistoryCleanupJobAccTest.java @@ -3,14 +3,14 @@ package acceptance.jobs; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import acceptance.security.JaasExtension; -import acceptance.security.WithAccessId; import java.time.Instant; import java.time.temporal.ChronoUnit; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.simplehistory.impl.jobs.HistoryCleanupJob; import pro.taskana.spi.history.api.events.task.TaskHistoryEvent; import pro.taskana.spi.history.api.events.task.TaskHistoryEventType; diff --git a/lib/taskana-core/pom.xml b/lib/taskana-core/pom.xml index 0fb68baad..18ba2e43e 100644 --- a/lib/taskana-core/pom.xml +++ b/lib/taskana-core/pom.xml @@ -14,6 +14,11 @@ + + pro.taskana + taskana-common + ${project.version} + org.mybatis mybatis @@ -31,7 +36,13 @@ pro.taskana - taskana-data + taskana-common-data + ${project.version} + test + + + pro.taskana + taskana-common-test ${project.version} test 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 8bf9984e7..0dcbbde17 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.classification.internal.models.ClassificationImpl; import pro.taskana.common.api.exceptions.DomainNotFoundException; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; /** Acceptance test for all "create classification" scenarios. */ @ExtendWith(JaasExtension.class) @@ -25,26 +25,22 @@ class CreateClassificationAccTest extends AbstractAccTest { private static final String ID_PREFIX_CLASSIFICATION = "CLI"; - private ClassificationService classificationService; - - CreateClassificationAccTest() { - super(); - classificationService = taskanaEngine.getClassificationService(); - } + private static final ClassificationService CLASSIFICATION_SERVICE = + taskanaEngine.getClassificationService(); @WithAccessId(user = "businessadmin") @Test void testCreateMasterClassification() throws Exception { - long amountOfClassificationsBefore = classificationService.createClassificationQuery().count(); - Classification classification = classificationService.newClassification("Key0", "", "TASK"); + long amountOfClassificationsBefore = CLASSIFICATION_SERVICE.createClassificationQuery().count(); + Classification classification = CLASSIFICATION_SERVICE.newClassification("Key0", "", "TASK"); classification.setIsValidInDomain(true); - classification = classificationService.createClassification(classification); + classification = CLASSIFICATION_SERVICE.createClassification(classification); // check only 1 created - long amountOfClassificationsAfter = classificationService.createClassificationQuery().count(); + long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count(); assertThat(amountOfClassificationsAfter).isEqualTo(amountOfClassificationsBefore + 1); - classification = classificationService.getClassification(classification.getId()); + classification = CLASSIFICATION_SERVICE.getClassification(classification.getId()); assertThat(classification).isNotNull(); assertThat(classification.getCreated()).isNotNull(); @@ -58,15 +54,15 @@ class CreateClassificationAccTest extends AbstractAccTest { @Test void testCreateClassificationWithMasterCopy() throws Exception { final long countClassificationsBefore = - classificationService.createClassificationQuery().count(); + CLASSIFICATION_SERVICE.createClassificationQuery().count(); Classification classification = - classificationService.newClassification("Key1", "DOMAIN_A", "TASK"); + CLASSIFICATION_SERVICE.newClassification("Key1", "DOMAIN_A", "TASK"); classification.setIsValidInDomain(true); - classification = classificationService.createClassification(classification); + classification = CLASSIFICATION_SERVICE.createClassification(classification); // Check returning one is the "original" Classification createdClassification = - classificationService.getClassification(classification.getId()); + CLASSIFICATION_SERVICE.getClassification(classification.getId()); assertThat(classification).isNotNull(); assertThat(classification.getCreated()).isNotNull(); assertThat(classification.getModified()).isNotNull(); @@ -77,11 +73,11 @@ class CreateClassificationAccTest extends AbstractAccTest { assertThat(createdClassification.getKey()).isEqualTo("Key1"); // Check 2 new created - long amountOfClassificationsAfter = classificationService.createClassificationQuery().count(); + long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count(); assertThat(amountOfClassificationsAfter).isEqualTo(countClassificationsBefore + 2); // Check main - classification = classificationService.getClassification(classification.getId()); + classification = CLASSIFICATION_SERVICE.getClassification(classification.getId()); assertThat(classification).isNotNull(); assertThat(classification.getCreated()).isNotNull(); assertThat(classification.getModified()).isNotNull(); @@ -90,7 +86,7 @@ class CreateClassificationAccTest extends AbstractAccTest { assertThat(classification.getId()).startsWith(ID_PREFIX_CLASSIFICATION); // Check master-copy - classification = classificationService.getClassification(classification.getKey(), ""); + classification = CLASSIFICATION_SERVICE.getClassification(classification.getKey(), ""); assertThat(classification).isNotNull(); assertThat(classification.getCreated()).isNotNull(); assertThat(classification.getModified()).isNotNull(); @@ -103,14 +99,14 @@ class CreateClassificationAccTest extends AbstractAccTest { @Test void testCreateClassificationWithExistingMaster() throws Exception { - classificationService.createClassification( - classificationService.newClassification("Key0815", "", "TASK")); + CLASSIFICATION_SERVICE.createClassification( + CLASSIFICATION_SERVICE.newClassification("Key0815", "", "TASK")); - long amountOfClassificationsBefore = classificationService.createClassificationQuery().count(); + long amountOfClassificationsBefore = CLASSIFICATION_SERVICE.createClassificationQuery().count(); Classification expected = - classificationService.newClassification("Key0815", "DOMAIN_B", "TASK"); - Classification actual = classificationService.createClassification(expected); - long amountOfClassificationsAfter = classificationService.createClassificationQuery().count(); + CLASSIFICATION_SERVICE.newClassification("Key0815", "DOMAIN_B", "TASK"); + Classification actual = CLASSIFICATION_SERVICE.createClassification(expected); + long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count(); assertThat(amountOfClassificationsAfter).isEqualTo(amountOfClassificationsBefore + 1); assertThat(actual).isNotNull(); @@ -121,16 +117,16 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId(user = "businessadmin") @Test void testCreateChildInDomainAndCopyInMaster() throws Exception { - Classification parent = classificationService.newClassification("Key0816", "DOMAIN_A", "TASK"); - Classification actualParent = classificationService.createClassification(parent); + Classification parent = CLASSIFICATION_SERVICE.newClassification("Key0816", "DOMAIN_A", "TASK"); + Classification actualParent = CLASSIFICATION_SERVICE.createClassification(parent); assertThat(actualParent).isNotNull(); - long amountOfClassificationsBefore = classificationService.createClassificationQuery().count(); - Classification child = classificationService.newClassification("Key0817", "DOMAIN_A", "TASK"); + long amountOfClassificationsBefore = CLASSIFICATION_SERVICE.createClassificationQuery().count(); + Classification child = CLASSIFICATION_SERVICE.newClassification("Key0817", "DOMAIN_A", "TASK"); child.setParentId(actualParent.getId()); child.setParentKey(actualParent.getKey()); - Classification actualChild = classificationService.createClassification(child); - long amountOfClassificationsAfter = classificationService.createClassificationQuery().count(); + Classification actualChild = CLASSIFICATION_SERVICE.createClassification(child); + long amountOfClassificationsAfter = CLASSIFICATION_SERVICE.createClassificationQuery().count(); assertThat(amountOfClassificationsAfter).isEqualTo(amountOfClassificationsBefore + 2); assertThat(actualChild).isNotNull(); @@ -139,30 +135,30 @@ class CreateClassificationAccTest extends AbstractAccTest { @WithAccessId(user = "businessadmin") @Test void testCreateClassificationWithInvalidValues() { - classificationService.createClassificationQuery().count(); + CLASSIFICATION_SERVICE.createClassificationQuery().count(); // Check key NULL Classification classification = - classificationService.newClassification(null, "DOMAIN_A", "TASK"); - assertThatThrownBy(() -> classificationService.createClassification(classification)) + CLASSIFICATION_SERVICE.newClassification(null, "DOMAIN_A", "TASK"); + assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification)) .isInstanceOf(InvalidArgumentException.class); // Check invalid ServiceLevel Classification classification2 = - classificationService.newClassification("Key2", "DOMAIN_B", "TASK"); + CLASSIFICATION_SERVICE.newClassification("Key2", "DOMAIN_B", "TASK"); classification2.setServiceLevel("abc"); - assertThatThrownBy(() -> classificationService.createClassification(classification2)) + assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification2)) .isInstanceOf(InvalidArgumentException.class); } @WithAccessId(user = "businessadmin") @Test void testCreateClassificationAlreadyExisting() throws Exception { - Classification classification = classificationService.newClassification("Key3", "", "TASK"); + Classification classification = CLASSIFICATION_SERVICE.newClassification("Key3", "", "TASK"); Classification classificationCreated = - classificationService.createClassification(classification); - assertThatThrownBy(() -> classificationService.createClassification(classificationCreated)) + CLASSIFICATION_SERVICE.createClassification(classification); + assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classificationCreated)) .isInstanceOf(ClassificationAlreadyExistException.class); } @@ -170,8 +166,8 @@ class CreateClassificationAccTest extends AbstractAccTest { @Test void testCreateClassificationInUnknownDomain() { Classification classification = - classificationService.newClassification("Key3", "UNKNOWN_DOMAIN", "TASK"); - assertThatThrownBy(() -> classificationService.createClassification(classification)) + CLASSIFICATION_SERVICE.newClassification("Key3", "UNKNOWN_DOMAIN", "TASK"); + assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification)) .isInstanceOf(DomainNotFoundException.class); } @@ -179,8 +175,8 @@ class CreateClassificationAccTest extends AbstractAccTest { @Test void testCreateClassificationOfUnknownType() { Classification classification = - classificationService.newClassification("Key3", "DOMAIN_A", "UNKNOWN_TYPE"); - assertThatThrownBy(() -> classificationService.createClassification(classification)) + CLASSIFICATION_SERVICE.newClassification("Key3", "DOMAIN_A", "UNKNOWN_TYPE"); + assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification)) .isInstanceOf(InvalidArgumentException.class); } @@ -188,27 +184,27 @@ class CreateClassificationAccTest extends AbstractAccTest { @Test void testCreateClassificationOfUnknownCategory() { Classification classification = - classificationService.newClassification("Key4", "DOMAIN_A", "TASK"); + CLASSIFICATION_SERVICE.newClassification("Key4", "DOMAIN_A", "TASK"); classification.setCategory("UNKNOWN_CATEGORY"); - assertThatThrownBy(() -> classificationService.createClassification(classification)) + assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification)) .isInstanceOf(InvalidArgumentException.class); } @WithAccessId(user = "businessadmin") @Test void testCreateClassificationWithInvalidParentId() { - Classification classification = classificationService.newClassification("Key5", "", "TASK"); + Classification classification = CLASSIFICATION_SERVICE.newClassification("Key5", "", "TASK"); classification.setParentId("ID WHICH CANT BE FOUND"); - assertThatThrownBy(() -> classificationService.createClassification(classification)) + assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification)) .isInstanceOf(InvalidArgumentException.class); } @WithAccessId(user = "businessadmin") @Test void testCreateClassificationWithInvalidParentKey() { - Classification classification = classificationService.newClassification("Key5", "", "TASK"); + Classification classification = CLASSIFICATION_SERVICE.newClassification("Key5", "", "TASK"); classification.setParentKey("KEY WHICH CANT BE FOUND"); - assertThatThrownBy(() -> classificationService.createClassification(classification)) + assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification)) .isInstanceOf(InvalidArgumentException.class); } @@ -216,9 +212,9 @@ class CreateClassificationAccTest extends AbstractAccTest { @Test void testCreateClassificationWithExplicitId() { ClassificationImpl classification = - (ClassificationImpl) classificationService.newClassification("Key0818", "", "TASK"); + (ClassificationImpl) CLASSIFICATION_SERVICE.newClassification("Key0818", "", "TASK"); classification.setId("EXPLICIT ID"); - assertThatThrownBy(() -> classificationService.createClassification(classification)) + assertThatThrownBy(() -> CLASSIFICATION_SERVICE.createClassification(classification)) .isInstanceOf(InvalidArgumentException.class); } @@ -226,10 +222,10 @@ class CreateClassificationAccTest extends AbstractAccTest { @Test void should_BeAbleToCreateNewClassification_When_ClassificationCopy() throws Exception { ClassificationImpl oldClassification = - (ClassificationImpl) classificationService.getClassification("T2100", "DOMAIN_B"); + (ClassificationImpl) CLASSIFICATION_SERVICE.getClassification("T2100", "DOMAIN_B"); Classification newClassification = oldClassification.copy("T9949"); - newClassification = classificationService.createClassification(newClassification); + newClassification = CLASSIFICATION_SERVICE.createClassification(newClassification); assertThat(newClassification.getId()).isNotNull(); assertThat(newClassification.getId()).isNotEqualTo(oldClassification.getId()); @@ -240,11 +236,11 @@ class CreateClassificationAccTest extends AbstractAccTest { @TestTemplate void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdmin() { ClassificationImpl classification = - (ClassificationImpl) classificationService.newClassification("newKey718", "", "TASK"); + (ClassificationImpl) CLASSIFICATION_SERVICE.newClassification("newKey718", "", "TASK"); ThrowingCallable createClassificationCall = () -> { - classificationService.createClassification(classification); + CLASSIFICATION_SERVICE.createClassification(classification); }; assertThatThrownBy(createClassificationCall).isInstanceOf(NotAuthorizedException.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 5b5745cb3..3a47ce776 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java @@ -14,8 +14,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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 620ff1546..a02c44471 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java @@ -38,8 +38,8 @@ import pro.taskana.classification.api.ClassificationCustomField; import pro.taskana.classification.api.ClassificationService; import pro.taskana.classification.api.models.ClassificationSummary; import pro.taskana.common.api.TimeInterval; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 6cd8c8d43..bcdf6a266 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.common.internal.security.JaasExtension; +import pro.taskana.common.test.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 fc0f2ff5d..eada155b2 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java @@ -25,8 +25,8 @@ 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.jobs.JobRunner; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.Task; import pro.taskana.task.internal.models.TaskImpl; 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 9be3aa28d..0335f199e 100644 --- a/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java @@ -9,8 +9,8 @@ import org.junit.jupiter.api.BeforeEach; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.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/jobs/WorkbasketCleanupJobAccTest.java b/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java index 86dd649ce..774e31cfe 100644 --- a/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java @@ -9,8 +9,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.BaseQuery; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; import pro.taskana.task.internal.jobs.TaskCleanupJob; 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 4182e3693..8c20ce418 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.common.internal.security.JaasExtension; +import pro.taskana.common.test.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 ba69b8947..cbffda429 100644 --- a/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java @@ -16,8 +16,8 @@ import pro.taskana.classification.api.models.Classification; import pro.taskana.common.api.JobService; import pro.taskana.common.api.ScheduledJob; import pro.taskana.common.internal.JobServiceImpl; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.Task; 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 d341ef380..59e1575d4 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java @@ -13,8 +13,8 @@ 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.task.api.TaskCustomField; diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationCategoryReportAccTest.java index 22ac0ed3c..1947bab31 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationCategoryReportAccTest.java @@ -21,8 +21,8 @@ import org.junit.jupiter.api.function.ThrowingConsumer; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.TaskTimestamp; 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 c34215602..a390f542e 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java @@ -18,8 +18,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.function.ThrowingConsumer; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.TaskTimestamp; diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java index b177b95f2..e34c4b7d2 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java @@ -21,8 +21,8 @@ import org.junit.jupiter.api.function.ThrowingConsumer; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.SelectedItem; import pro.taskana.monitor.api.TaskTimestamp; 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 b71c1c2ac..17f30007f 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java @@ -18,8 +18,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.function.ThrowingConsumer; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.CombinedClassificationFilter; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.SelectedItem; diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationCategoryReportAccTest.java index c89933070..4dabbe3c0 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationCategoryReportAccTest.java @@ -20,8 +20,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.function.ThrowingConsumer; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.reports.ClassificationCategoryReport; 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 f604652ac..bb3ff736e 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java @@ -20,8 +20,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.function.ThrowingConsumer; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.reports.ClassificationReport; 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 a83d1b5d9..b87facf97 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java @@ -20,8 +20,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.function.ThrowingConsumer; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.reports.ClassificationReport.Builder; diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java index 205ca222a..928fe5096 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java @@ -20,8 +20,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.function.ThrowingConsumer; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.TaskTimestamp; import pro.taskana.monitor.api.reports.TaskCustomFieldValueReport; 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 88887f7da..7aa7fe03e 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java @@ -14,8 +14,8 @@ import org.junit.jupiter.api.TestTemplate; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.reports.TaskStatusReport; import pro.taskana.monitor.api.reports.item.TaskQueryItem; 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 ccad78ff1..2dc6caa26 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java @@ -13,8 +13,8 @@ import org.assertj.core.api.ThrowableAssert.ThrowingCallable; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.reports.TimestampReport; import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader; 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 1d4c3d2ce..e4cad2bce 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java @@ -20,8 +20,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.function.ThrowingConsumer; import pro.taskana.common.api.exceptions.NotAuthorizedException; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.monitor.api.CombinedClassificationFilter; import pro.taskana.monitor.api.MonitorService; import pro.taskana.monitor.api.TaskTimestamp; 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 31e54a387..fc831e17c 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 f16fa7591..d4772ca01 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.TaskanaEngineProxy; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 378b3ccb5..57ba811ad 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 c4b62af11..7ca27135e 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 20c446606..aa4670e1c 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java @@ -16,8 +16,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.BulkOperationResults; 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.test.security.JaasExtension; +import pro.taskana.common.test.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 a1a60fe83..0c7a71615 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.TestTemplate; import org.junit.jupiter.api.extension.ExtendWith; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 2c42730c8..95804aefd 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java @@ -18,8 +18,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.security.CurrentUserContext; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 bb893fa53..2cbbeb22d 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java @@ -19,8 +19,8 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.internal.TaskanaEngineProxy; 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.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; 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 c000a5148..72b2100cc 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskCommentAccTest.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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 ab89f2f0a..34d4f729e 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java @@ -16,8 +16,8 @@ import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.internal.TaskanaEngineProxy; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 4c26597bc..0d606d9cf 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskCommentNotFoundException; import pro.taskana.task.api.models.TaskComment; 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 91f641b71..7a5b16447 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.TestTemplate; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; 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 cd7e9051a..0ab714eed 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/GetTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/GetTaskCommentAccTest.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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.TaskCommentNotFoundException; import pro.taskana.task.api.models.TaskComment; 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 4f8178d75..5b94263cc 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 dfaa6e7fa..5f2e92602 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java @@ -9,8 +9,8 @@ import java.util.stream.Collectors; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskService; 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 1046c0962..b6fdca80f 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java @@ -36,9 +36,9 @@ import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.TimeInterval; import pro.taskana.common.api.exceptions.InvalidArgumentException; import pro.taskana.common.internal.TaskanaEngineProxy; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.internal.util.Triplet; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskQueryColumnName; 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 54d189d12..78cd9c893 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.ObjectReference; 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 2705d05a0..38e517f58 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 b1d4837e3..c04f95786 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 aa3e68e8e..8ca573a97 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 97c721a8d..66a34892b 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 50e220bd0..42eb77476 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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/SelectAndClaimTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/SelectAndClaimTaskAccTest.java index 54705ca51..bda1e4b0e 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/SelectAndClaimTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/SelectAndClaimTaskAccTest.java @@ -18,10 +18,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.BaseQuery.SortDirection; import pro.taskana.common.api.exceptions.SystemException; -import pro.taskana.common.internal.security.JaasExtension; import pro.taskana.common.internal.security.UserPrincipal; -import pro.taskana.common.internal.security.WithAccessId; import pro.taskana.common.internal.util.CheckedConsumer; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskQuery; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.Task; 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 6cde4feba..96733426b 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java @@ -13,8 +13,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.BulkOperationResults; 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.test.security.JaasExtension; +import pro.taskana.common.test.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 6a90fd9a7..602d58bfc 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java @@ -26,8 +26,8 @@ import pro.taskana.common.api.WorkingDaysToDaysConverter; 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.test.security.JaasExtension; +import pro.taskana.common.test.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/task/SetOwnerAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java index 61e9a503a..e402b272a 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java @@ -18,8 +18,8 @@ import pro.taskana.common.api.BulkOperationResults; import pro.taskana.common.api.exceptions.NotAuthorizedException; import pro.taskana.common.api.exceptions.TaskanaException; import pro.taskana.common.internal.TaskanaEngineProxy; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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/TerminateTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java index 2f04769f6..ba1712fe0 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java @@ -13,8 +13,8 @@ import org.junit.jupiter.api.TestTemplate; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.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 137ee3f68..0b4717731 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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/UpdateTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java index 1465091dd..0f2f2301a 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java @@ -27,8 +27,8 @@ import org.junit.jupiter.api.extension.ExtendWith; 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.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.TaskState; 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 29800ad79..4118fb565 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java @@ -16,8 +16,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.classification.api.models.Classification; import pro.taskana.classification.api.models.ClassificationSummary; 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.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.exceptions.AttachmentPersistenceException; import pro.taskana.task.api.models.Attachment; 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 acea6b069..a6ba5f793 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.NotAuthorizedException; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.TaskComment; import pro.taskana.task.internal.models.TaskCommentImpl; 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 2aba5d794..c424ad8c6 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.BulkOperationResults; 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.test.security.JaasExtension; +import pro.taskana.common.test.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/taskpreprocessing/CreateTaskPreprocessingAccTest.java b/lib/taskana-core/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java index e4e43ddc7..464b4c06a 100644 --- a/lib/taskana-core/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/taskpreprocessing/CreateTaskPreprocessingAccTest.java @@ -6,8 +6,8 @@ import acceptance.AbstractAccTest; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.Task; 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 3f6d0dc75..22734fdde 100644 --- a/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.exceptions.InvalidArgumentException; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskService; import pro.taskana.task.api.models.Task; 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 49805d6a1..e1740bd00 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.NotAuthorizedException; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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/CreateWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAuthorizationsAccTest.java index 87feb758d..9db6f5dec 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAuthorizationsAccTest.java @@ -7,8 +7,8 @@ import org.junit.jupiter.api.TestTemplate; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.models.WorkbasketAccessItem; 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 d694bb4b6..f5a8fb7cf 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java @@ -13,8 +13,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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.task.api.TaskService; import pro.taskana.task.internal.models.TaskImpl; import pro.taskana.workbasket.api.WorkbasketPermission; diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java index 998ccbfbc..bf6931667 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.TestTemplate; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketService; /** Acceptance test for all "delete workbasket authorizations" scenarios. */ 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 43e29894d..827a46653 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.TestTemplate; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.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 6f111013d..05149f396 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.TestTemplate; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.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/GetWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAuthorizationsAccTest.java index 3caf12633..6c7b48e9f 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAuthorizationsAccTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.TestTemplate; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketService; /** Acceptance test for all "get workbasket authorizations" scenarios. */ 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 405f8d057..13fc15bad 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java @@ -18,8 +18,8 @@ import org.junit.jupiter.api.TestFactory; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.function.ThrowingConsumer; -import pro.taskana.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketCustomField; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketQuery; 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 a70694485..dc629fd04 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 a6caf13b9..6ff3e5086 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java @@ -13,8 +13,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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 0b69230dc..54b6ad471 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 389fbb67a..e65c46e59 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java @@ -13,8 +13,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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.workbasket.api.WorkbasketCustomField; import pro.taskana.workbasket.api.WorkbasketService; import pro.taskana.workbasket.api.WorkbasketType; 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 6d54a7c0c..f8c97abce 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 eab905f58..368d08d78 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java @@ -17,8 +17,8 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.common.api.KeyDomain; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.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/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java index 0ce74fd8a..a65eae419 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.common.internal.security.JaasExtension; -import pro.taskana.common.internal.security.WithAccessId; +import pro.taskana.common.test.security.JaasExtension; +import pro.taskana.common.test.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 33bb0b5f6..290d89398 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java @@ -35,6 +35,7 @@ class ArchitectureTest { "pro.taskana.sampledata", "pro.taskana.common.internal", "pro.taskana.common.api", + "pro.taskana.common.test", "pro.taskana.classification.api", "pro.taskana.classification.internal", "pro.taskana.spi.history.api", diff --git a/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtension.java b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtension.java deleted file mode 100644 index 027da3ee0..000000000 --- a/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtension.java +++ /dev/null @@ -1,322 +0,0 @@ -package pro.taskana.common.internal.security; - -import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated; -import static pro.taskana.common.internal.util.CheckedFunction.wrap; - -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.security.Principal; -import java.security.PrivilegedAction; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import java.util.stream.StreamSupport; -import javax.security.auth.Subject; -import org.junit.jupiter.api.DynamicContainer; -import org.junit.jupiter.api.DynamicNode; -import org.junit.jupiter.api.extension.Extension; -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.ExtensionContext.Namespace; -import org.junit.jupiter.api.extension.ExtensionContext.Store; -import org.junit.jupiter.api.extension.InvocationInterceptor; -import org.junit.jupiter.api.extension.ParameterContext; -import org.junit.jupiter.api.extension.ParameterResolver; -import org.junit.jupiter.api.extension.ReflectiveInvocationContext; -import org.junit.jupiter.api.extension.TestTemplateInvocationContext; -import org.junit.jupiter.api.extension.TestTemplateInvocationContextProvider; -import org.junit.platform.commons.JUnitException; -import org.junit.platform.commons.support.AnnotationSupport; - -import pro.taskana.common.api.exceptions.SystemException; - -/** Runner for integration tests that enables JAAS subject. */ -public class JaasExtension implements InvocationInterceptor, TestTemplateInvocationContextProvider { - - private static final String ACCESS_IDS_STORE_KEY = "accessIds"; - - // region InvocationInterceptor - - @Override - public T interceptTestClassConstructor( - Invocation invocation, - ReflectiveInvocationContext> invocationContext, - ExtensionContext extensionContext) { - return extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable()); - } - - @Override - public void interceptBeforeAllMethod( - Invocation invocation, - ReflectiveInvocationContext invocationContext, - ExtensionContext extensionContext) { - extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable()); - } - - @Override - public void interceptBeforeEachMethod( - Invocation invocation, - ReflectiveInvocationContext invocationContext, - ExtensionContext extensionContext) { - extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable()); - } - - @Override - public void interceptTestMethod( - Invocation invocation, - ReflectiveInvocationContext invocationContext, - ExtensionContext extensionContext) { - if (isAnnotated(invocationContext.getExecutable(), WithAccessIds.class)) { - throw new JUnitException("Please use @TestTemplate instead of @Test for multiple accessIds"); - } - extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable()); - } - - @Override - @SuppressWarnings("unchecked") - public T interceptTestFactoryMethod( - Invocation invocation, - ReflectiveInvocationContext invocationContext, - ExtensionContext extensionContext) { - WithAccessIds annotation = invocationContext.getExecutable().getAnnotation(WithAccessIds.class); - if (annotation != null) { - // our goal is to run each test returned from the test factory X times. X is the amount of - // WithAccessId annotations. In order to achieve this we are wrapping the result from the - // factory (the returning tests) in a dynamicContainer for each accessId. Since we don't know - // what the factory will return we have to check for every possible return type. All possible - // return types can be found here: - // https://junit.org/junit5/docs/current/user-guide/#writing-tests-dynamic-tests - // After checking each return type we abuse the return type of T and hardly change it to - // Stream no matter what the factory returns. This return type is allowed - // per definition (See link above), but is not the type T. Hence we have an unchecked cast at - // the end to keep the compiler happy... - - // we are using the first annotation to run the factory method with. - T factoryResult = performInvocationWithAccessId(invocation, annotation.value()[0]); - - Iterable newChildrenForDynamicContainer; - // TestFactory must have one of the following return types. See link above for further details - if (factoryResult instanceof DynamicNode) { - newChildrenForDynamicContainer = Collections.singleton((DynamicNode) factoryResult); - } else if (factoryResult instanceof Stream) { - Stream nodes = (Stream) factoryResult; - newChildrenForDynamicContainer = nodes.collect(Collectors.toList()); - } else if (factoryResult instanceof Iterable) { - newChildrenForDynamicContainer = (Iterable) factoryResult; - } else if (factoryResult instanceof Iterator) { - newChildrenForDynamicContainer = () -> (Iterator) factoryResult; - } else if (factoryResult instanceof DynamicNode[]) { - newChildrenForDynamicContainer = Arrays.asList((DynamicNode[]) factoryResult); - } else { - throw new SystemException( - String.format( - "Testfactory '%s' did not return a proper type", - invocationContext.getExecutable().getName())); - } - - // Currently a DynamicContainer has children from this type: Stream - // Because of this the children can only be extracted once (Streams can only be operated - // once). This is obviously not ok since we want to execute each node X times. So we have to - // manually persist all children recursively to extract them X times... - Map> childrenMap = new HashMap<>(); - persistDynamicContainerChildren(newChildrenForDynamicContainer, childrenMap); - - Function wrapTestsInDynamicContainer = - accessId -> - DynamicContainer.dynamicContainer( - getDisplayNameForAccessId(accessId), - StreamSupport.stream(newChildrenForDynamicContainer.spliterator(), false) - .map(x -> duplicateDynamicNode(x, childrenMap))); - - Store store = getStore(extensionContext); - return (T) - Stream.of(annotation.value()) - .peek(a -> store.put(ACCESS_IDS_STORE_KEY, a)) - .map(wrapTestsInDynamicContainer); - } - - return extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable()); - } - - @Override - public void interceptTestTemplateMethod( - Invocation invocation, - ReflectiveInvocationContext invocationContext, - ExtensionContext extensionContext) { - WithAccessId accessId = - getStore(extensionContext).get(ACCESS_IDS_STORE_KEY, WithAccessId.class); - performInvocationWithAccessId(invocation, accessId); - } - - @Override - public void interceptDynamicTest(Invocation invocation, ExtensionContext extensionContext) { - ExtensionContext testContext = getParentMethodExtensionContent(extensionContext); - // Check if the test factory provided an access Id for this dynamic test. - WithAccessId o = getStore(testContext).get(ACCESS_IDS_STORE_KEY, WithAccessId.class); - if (o != null) { - performInvocationWithAccessId(invocation, o); - } else { - extractAccessIdAndPerformInvocation(invocation, testContext.getRequiredTestMethod()); - } - } - - @Override - public void interceptAfterEachMethod( - Invocation invocation, - ReflectiveInvocationContext invocationContext, - ExtensionContext extensionContext) { - extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable()); - } - - @Override - public void interceptAfterAllMethod( - Invocation invocation, - ReflectiveInvocationContext invocationContext, - ExtensionContext extensionContext) { - extractAccessIdAndPerformInvocation(invocation, invocationContext.getExecutable()); - } - - // endregion - - // region TestTemplateInvocationContextProvider - - @Override - public boolean supportsTestTemplate(ExtensionContext context) { - return isAnnotated(context.getElement(), WithAccessIds.class) - || isAnnotated(context.getElement(), WithAccessId.class); - } - - @Override - public Stream provideTestTemplateInvocationContexts( - ExtensionContext context) { - List accessIds = - AnnotationSupport.findRepeatableAnnotations(context.getElement(), WithAccessId.class); - Store store = getStore(context); - return accessIds.stream() - .peek(a -> store.put(ACCESS_IDS_STORE_KEY, a)) - .map(JaasExtensionInvocationContext::new); - } - - // endregion - - private static void persistDynamicContainerChildren( - Iterable nodes, Map> childrenMap) { - nodes.forEach( - node -> { - if (node instanceof DynamicContainer) { - DynamicContainer container = (DynamicContainer) node; - List children = container.getChildren().collect(Collectors.toList()); - childrenMap.put(container.hashCode() + container.getDisplayName(), children); - persistDynamicContainerChildren(children, childrenMap); - } - }); - } - - private static DynamicNode duplicateDynamicNode( - DynamicNode node, Map> lookupMap) { - if (node instanceof DynamicContainer) { - DynamicContainer container = (DynamicContainer) node; - Stream children = - lookupMap.get(node.hashCode() + node.getDisplayName()).stream() - .map(x -> duplicateDynamicNode(x, lookupMap)); - return DynamicContainer.dynamicContainer(container.getDisplayName(), children); - } - return node; - } - - private static T extractAccessIdAndPerformInvocation( - Invocation invocation, AnnotatedElement executable) { - return performInvocationWithAccessId(invocation, executable.getAnnotation(WithAccessId.class)); - } - - private static T performInvocationWithAccessId( - Invocation invocation, WithAccessId withAccessId) { - Subject subject = new Subject(); - subject.getPrincipals().addAll(getPrincipals(withAccessId)); - - Function, T> proceedInvocation = wrap(Invocation::proceed); - PrivilegedAction performInvocation = () -> proceedInvocation.apply(invocation); - return Subject.doAs(subject, performInvocation); - } - - private static List getPrincipals(WithAccessId withAccessId) { - if (withAccessId != null) { - return Stream.concat( - Stream.of(withAccessId.user()).map(UserPrincipal::new), - Arrays.stream(withAccessId.groups()).map(GroupPrincipal::new)) - .collect(Collectors.toList()); - } - return Collections.emptyList(); - } - - private ExtensionContext getParentMethodExtensionContent(ExtensionContext extensionContext) { - Optional parent = extensionContext.getParent(); - // the class MethodExtensionContext is part of junit-jupiter-engine and has only a - // package-private visibility thus this workaround is needed. - while (!parent - .map(Object::getClass) - .map(Class::getName) - .filter(s -> s.endsWith("MethodExtensionContext")) - .isPresent()) { - parent = parent.flatMap(ExtensionContext::getParent); - } - return parent.orElseThrow( - () -> - new JUnitException( - String.format( - "Test '%s' does not have a parent method", extensionContext.getUniqueId()))); - } - - /** - * Gets the store with a method-level scope. - * - * @param context context for current extension - * @return The store - */ - private Store getStore(ExtensionContext context) { - return context.getStore(Namespace.create(getClass(), context.getRequiredTestMethod())); - } - - private static String getDisplayNameForAccessId(WithAccessId withAccessId) { - return String.format("for user '%s'", withAccessId.user()); - } - - private static class JaasExtensionInvocationContext implements TestTemplateInvocationContext { - private final WithAccessId withAccessId; - - private JaasExtensionInvocationContext(WithAccessId withAccessId) { - this.withAccessId = withAccessId; - } - - @Override - public String getDisplayName(int invocationIndex) { - return getDisplayNameForAccessId(withAccessId); - } - - @Override - public List getAdditionalExtensions() { - return Collections.singletonList(new WithAccessIdParameterResolver()); - } - - private class WithAccessIdParameterResolver implements ParameterResolver { - @Override - public boolean supportsParameter( - ParameterContext parameterContext, ExtensionContext extensionContext) { - return parameterContext.getParameter().getType().equals(WithAccessId.class); - } - - @Override - public Object resolveParameter( - ParameterContext parameterContext, ExtensionContext extensionContext) { - return withAccessId; - } - } - } -} diff --git a/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessId.java b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessId.java deleted file mode 100644 index 15ff8b785..000000000 --- a/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessId.java +++ /dev/null @@ -1,17 +0,0 @@ -package pro.taskana.common.internal.security; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.CONSTRUCTOR}) -@Repeatable(WithAccessIds.class) -public @interface WithAccessId { - - String user(); - - String[] groups() default {}; -} diff --git a/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessIds.java b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessIds.java deleted file mode 100644 index b28ba34da..000000000 --- a/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessIds.java +++ /dev/null @@ -1,12 +0,0 @@ -package pro.taskana.common.internal.security; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.METHOD) -public @interface WithAccessIds { - WithAccessId[] value(); -} 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 52475d9c9..018605b99 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 @@ -24,9 +24,9 @@ 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.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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskState; 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 a83742c20..48b26536f 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 @@ -28,9 +28,9 @@ 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.task.api.TaskCustomField; import pro.taskana.task.api.TaskState; 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 e8e2aa0bb..767d83983 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 @@ -16,9 +16,9 @@ import pro.taskana.TaskanaEngineConfiguration; import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService; 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 abcabdb7d..899731448 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 @@ -18,9 +18,9 @@ import pro.taskana.common.api.TaskanaEngine; import pro.taskana.common.api.TaskanaEngine.ConnectionManagementMode; 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.common.test.security.JaasExtension; +import pro.taskana.common.test.security.WithAccessId; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.workbasket.api.WorkbasketPermission; import pro.taskana.workbasket.api.WorkbasketService;