TSK-1277: moved JaasExtension and all its necessary classes to common modules

common/taskana-common-test/pom.xml

@@ -15,5 +15,23 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>pro.taskana</groupId>
+      <artifactId>taskana-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <!-- TEST DEPENDENCIES -->
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
 </project>

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;

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;

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;

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 {
 

common/taskana-common/pom.xml

@@ -14,5 +14,16 @@
     <version>4.1.1-SNAPSHOT</version>
   </parent>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <version>${version.json}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+  </dependencies>
 
 </project>

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;
   }

history/taskana-simplehistory-provider/pom.xml

@@ -38,6 +38,12 @@
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>pro.taskana</groupId>
+			<artifactId>taskana-common-test</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

lib/taskana-core/pom.xml

@@ -14,6 +14,11 @@
 	</parent>
 
 	<dependencies>
+		<dependency>
+			<groupId>pro.taskana</groupId>
+			<artifactId>taskana-common</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis</artifactId>
@@ -31,7 +36,13 @@
 		<!-- test dependencies -->
 		<dependency>
 			<groupId>pro.taskana</groupId>
-			<artifactId>taskana-data</artifactId>
+			<artifactId>taskana-common-data</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>pro.taskana</groupId>
+			<artifactId>taskana-common-test</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>

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);

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)

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)

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)

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.

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)

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;
 

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;

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;

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;