TSK-1182: refined architecture tests

lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationServiceImpl.java

@@ -20,6 +20,7 @@ import pro.taskana.classification.api.exceptions.ClassificationInUseException;
 import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
 import pro.taskana.classification.api.models.Classification;
 import pro.taskana.classification.api.models.ClassificationSummary;
+import pro.taskana.classification.internal.jobs.ClassificationChangedJob;
 import pro.taskana.classification.internal.models.ClassificationImpl;
 import pro.taskana.common.api.ScheduledJob;
 import pro.taskana.common.api.TaskanaRole;
@@ -28,7 +29,6 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.common.internal.jobs.ClassificationChangedJob;
 import pro.taskana.common.internal.util.IdGenerator;
 import pro.taskana.common.internal.util.LogSanitizer;
 import pro.taskana.task.api.models.TaskSummary;

lib/taskana-core/src/main/java/pro/taskana/classification/internal/jobs/ClassificationChangedJob.java

@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.jobs;
+package pro.taskana.classification.internal.jobs;
 
 import java.util.HashMap;
 import java.util.List;
@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
 import pro.taskana.common.api.ScheduledJob;
 import pro.taskana.common.api.TaskanaEngine;
 import pro.taskana.common.api.exceptions.TaskanaException;
+import pro.taskana.common.internal.jobs.AbstractTaskanaJob;
 import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
 import pro.taskana.task.internal.TaskServiceImpl;
 

lib/taskana-core/src/main/java/pro/taskana/common/internal/jobs/AbstractTaskanaJob.java

@@ -4,11 +4,15 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import pro.taskana.classification.internal.jobs.ClassificationChangedJob;
 import pro.taskana.common.api.ScheduledJob;
 import pro.taskana.common.api.TaskanaEngine;
 import pro.taskana.common.api.exceptions.TaskanaException;
 import pro.taskana.common.internal.TaskanaEngineImpl;
 import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
+import pro.taskana.task.internal.jobs.TaskCleanupJob;
+import pro.taskana.task.internal.jobs.TaskRefreshJob;
+import pro.taskana.workbasket.internal.jobs.WorkbasketCleanupJob;
 
 /** Abstract base for all background jobs of TASKANA. */
 public abstract class AbstractTaskanaJob implements TaskanaJob {
@@ -48,7 +52,7 @@ public abstract class AbstractTaskanaJob implements TaskanaJob {
     }
   }
 
-  <T> List<List<T>> partition(Collection<T> members, int maxSize) {
+  protected <T> List<List<T>> partition(Collection<T> members, int maxSize) {
     List<List<T>> result = new ArrayList<>();
     List<T> internal = new ArrayList<>();
     for (T member : members) {

lib/taskana-core/src/main/java/pro/taskana/task/internal/jobs/TaskCleanupJob.java

@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.jobs;
+package pro.taskana.task.internal.jobs;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -18,6 +18,7 @@ import pro.taskana.common.api.TaskanaEngine;
 import pro.taskana.common.api.TimeInterval;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.TaskanaException;
+import pro.taskana.common.internal.jobs.AbstractTaskanaJob;
 import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
 import pro.taskana.common.internal.util.LogSanitizer;
 import pro.taskana.task.api.models.TaskSummary;

lib/taskana-core/src/main/java/pro/taskana/task/internal/jobs/TaskRefreshJob.java

@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.jobs;
+package pro.taskana.task.internal.jobs;
 
 import java.util.Arrays;
 import java.util.List;
@@ -6,10 +6,12 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import pro.taskana.classification.internal.jobs.ClassificationChangedJob;
 import pro.taskana.common.api.LoggerUtils;
 import pro.taskana.common.api.ScheduledJob;
 import pro.taskana.common.api.TaskanaEngine;
 import pro.taskana.common.api.exceptions.TaskanaException;
+import pro.taskana.common.internal.jobs.AbstractTaskanaJob;
 import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
 import pro.taskana.task.internal.TaskServiceImpl;
 

lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/jobs/WorkbasketCleanupJob.java

@@ -1,4 +1,4 @@
-package pro.taskana.common.internal.jobs;
+package pro.taskana.workbasket.internal.jobs;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -13,6 +13,7 @@ import pro.taskana.common.api.TaskanaEngine;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.TaskanaException;
+import pro.taskana.common.internal.jobs.AbstractTaskanaJob;
 import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
 import pro.taskana.workbasket.api.WorkbasketQueryColumnName;
 

lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java

@@ -16,8 +16,8 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 
 /** Acceptance test for all "create classification" scenarios. */
 @ExtendWith(JaasExtension.class)

lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java

@@ -13,8 +13,8 @@ import pro.taskana.classification.api.exceptions.ClassificationInUseException;
 import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
 import pro.taskana.classification.api.models.Classification;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 
 /** Acceptance test for all "delete classification" scenarios. */
 @ExtendWith(JaasExtension.class)

lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java

@@ -27,8 +27,8 @@ import pro.taskana.common.api.TimeInterval;
 import pro.taskana.common.api.exceptions.ConcurrencyException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.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.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
 
 /** Acceptance test for all "query classifications with pagination" scenarios. */
 @ExtendWith(JaasExtension.class)

lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java

@@ -22,9 +22,9 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.internal.jobs.JobRunner;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.common.internal.util.WorkingDaysToDaysConverter;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.TaskNotFoundException;
 import pro.taskana.task.api.models.Task;

lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java

@@ -13,9 +13,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.common.internal.jobs.TaskCleanupJob;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.InvalidOwnerException;
 import pro.taskana.task.api.exceptions.InvalidStateException;
@@ -23,6 +22,7 @@ import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
 import pro.taskana.task.api.exceptions.TaskNotFoundException;
 import pro.taskana.task.api.models.Task;
 import pro.taskana.task.api.models.TaskSummary;
+import pro.taskana.task.internal.jobs.TaskCleanupJob;
 import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
 
 /** Acceptance test for all "jobs tasks runner" scenarios. */

lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java

@@ -11,14 +11,14 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.BaseQuery;
 import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.common.internal.jobs.TaskCleanupJob;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.common.internal.jobs.WorkbasketCleanupJob;
+import pro.taskana.common.internal.security.WithAccessId;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
+import pro.taskana.task.internal.jobs.TaskCleanupJob;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.models.WorkbasketSummary;
+import pro.taskana.workbasket.internal.jobs.WorkbasketCleanupJob;
 
 /** Acceptance test for all "jobs workbasket runner" scenarios. */
 @ExtendWith(JaasExtension.class)

lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java

@@ -8,7 +8,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
 import pro.taskana.task.api.ObjectReferenceQuery;
 import pro.taskana.task.api.TaskQuery;
 import pro.taskana.task.api.TaskService;

lib/taskana-core/src/test/java/acceptance/persistence/UpdateObjectsUseUtcTimeStampsAccTest.java

@@ -23,9 +23,9 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.internal.JobServiceImpl;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.common.internal.util.WorkingDaysToDaysConverter;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.AttachmentPersistenceException;
 import pro.taskana.task.api.exceptions.InvalidStateException;

lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java

@@ -13,9 +13,9 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.MonitorService;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.CustomField;
 
 /** Acceptance test for all "classification report" scenarios. */

lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java

@@ -15,11 +15,11 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.MonitorService;
 import pro.taskana.monitor.api.SelectedItem;
 import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.CustomField;
 import pro.taskana.task.api.TaskState;
 

lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java

@@ -11,11 +11,11 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.MonitorService;
 import pro.taskana.monitor.api.SelectedItem;
 import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 
 /** Acceptance test for all "get task ids of classification report" scenarios. */
 @ExtendWith(JaasExtension.class)

lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java

@@ -15,11 +15,11 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.MonitorService;
 import pro.taskana.monitor.api.SelectedItem;
 import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.CustomField;
 import pro.taskana.task.api.TaskState;
 

lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java

@@ -12,11 +12,11 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.MonitorService;
 import pro.taskana.monitor.api.SelectedItem;
 import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 
 /** Acceptance test for all "get task ids of workbasket report" scenarios. */
 @ExtendWith(JaasExtension.class)

lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java

@@ -18,11 +18,11 @@ import org.slf4j.LoggerFactory;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.MonitorService;
 import pro.taskana.monitor.api.reports.CategoryReport;
 import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.CustomField;
 import pro.taskana.task.api.TaskState;
 

lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java

@@ -18,11 +18,11 @@ import org.slf4j.LoggerFactory;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.MonitorService;
 import pro.taskana.monitor.api.reports.ClassificationReport;
 import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.CustomField;
 import pro.taskana.task.api.TaskState;
 

lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java

@@ -17,11 +17,11 @@ import org.slf4j.LoggerFactory;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.MonitorService;
 import pro.taskana.monitor.api.reports.CustomFieldValueReport;
 import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.CustomField;
 import pro.taskana.task.api.TaskState;
 

lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java

@@ -17,14 +17,14 @@ import org.slf4j.LoggerFactory;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.MonitorService;
 import pro.taskana.monitor.api.reports.ClassificationReport.DetailedClassificationReport;
 import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
 import pro.taskana.monitor.api.reports.item.DetailedMonitorQueryItem;
 import pro.taskana.monitor.api.reports.row.FoldableRow;
 import pro.taskana.monitor.api.reports.row.Row;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.CustomField;
 import pro.taskana.task.api.TaskState;
 

lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java

@@ -16,13 +16,13 @@ import org.slf4j.LoggerFactory;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.MonitorService;
 import pro.taskana.monitor.api.reports.TaskStatusReport;
 import pro.taskana.monitor.api.reports.header.TaskStatusColumnHeader;
 import pro.taskana.monitor.api.reports.item.TaskQueryItem;
 import pro.taskana.monitor.api.reports.row.Row;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.InvalidStateException;

lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java

@@ -11,14 +11,14 @@ import java.util.stream.IntStream;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.MonitorService;
 import pro.taskana.monitor.api.reports.TimestampReport;
 import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
 import pro.taskana.monitor.api.reports.item.TimestampQueryItem;
 import pro.taskana.monitor.api.reports.row.SingleRow;
 import pro.taskana.monitor.api.reports.row.TimestampRow;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 
 /** Test class for {@link TimestampReport}. */
 @ExtendWith(JaasExtension.class)

lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java

@@ -18,12 +18,12 @@ import org.slf4j.LoggerFactory;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.monitor.api.CombinedClassificationFilter;
 import pro.taskana.monitor.api.MonitorService;
 import pro.taskana.monitor.api.reports.WorkbasketReport;
 import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.CustomField;
 import pro.taskana.task.api.TaskState;
 

lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java

@@ -9,8 +9,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.classification.api.ClassificationService;
 import pro.taskana.classification.api.models.ClassificationSummary;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.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.TaskanaEngineProxyForTest;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.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.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.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

@@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketPermission;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.models.WorkbasketSummary;

lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java

@@ -19,8 +19,8 @@ import pro.taskana.common.api.BulkOperationResults;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.CallbackState;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;

lib/taskana-core/src/test/java/acceptance/task/CancelTaskAccTest.java

@@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.InvalidStateException;

lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java

@@ -13,8 +13,8 @@ import pro.taskana.classification.api.exceptions.ClassificationNotFoundException
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.internal.security.CurrentUserContext;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.InvalidOwnerException;

lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java

@@ -26,9 +26,9 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.internal.TaskanaEngineProxyForTest;
 import pro.taskana.common.internal.security.CurrentUserContext;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.common.internal.util.WorkingDaysToDaysConverter;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.InvalidStateException;

lib/taskana-core/src/test/java/acceptance/task/CreateTaskCommentAccTest.java

@@ -10,8 +10,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.TaskNotFoundException;
 import pro.taskana.task.api.models.TaskComment;

lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java

@@ -14,8 +14,8 @@ import pro.taskana.common.api.BulkOperationResults;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.InvalidStateException;
 import pro.taskana.task.api.exceptions.TaskNotFoundException;

lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java

@@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.TaskCommentNotFoundException;
 import pro.taskana.task.api.exceptions.TaskNotFoundException;

lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java

@@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.TaskNotFoundException;

lib/taskana-core/src/test/java/acceptance/task/GetTaskCommentAccTest.java

@@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.TaskCommentNotFoundException;
 import pro.taskana.task.api.exceptions.TaskNotFoundException;

lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java

@@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.BaseQuery.SortDirection;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskQuery;
 import pro.taskana.task.api.TaskQueryColumnName;
 import pro.taskana.task.api.TaskService;

lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java

@@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.TaskNotFoundException;
 import pro.taskana.task.api.models.Attachment;

lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java

@@ -42,9 +42,9 @@ import pro.taskana.common.api.exceptions.ConcurrencyException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.internal.TaskanaEngineProxyForTest;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.common.internal.util.Triplet;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.TaskQuery;
 import pro.taskana.task.api.TaskQueryColumnName;
 import pro.taskana.task.api.TaskService;

lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java

@@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 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.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.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.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.WildcardSearchField;
 import pro.taskana.task.api.models.TaskSummary;

lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java

@@ -12,8 +12,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.KeyDomain;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.models.TaskSummary;
 import pro.taskana.workbasket.api.exceptions.NotAuthorizedToQueryWorkbasketException;

lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java

@@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.KeyDomain;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.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.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.models.TaskSummary;

lib/taskana-core/src/test/java/acceptance/task/ServiceLevelOfAllTasksAccTest.java

@@ -14,8 +14,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.BulkOperationResults;
 import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.models.Task;
 import pro.taskana.task.api.models.TaskSummary;

lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java

@@ -21,9 +21,9 @@ import pro.taskana.common.api.exceptions.ConcurrencyException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.TaskanaException;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.common.internal.util.WorkingDaysToDaysConverter;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.AttachmentPersistenceException;
 import pro.taskana.task.api.exceptions.InvalidStateException;

lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java

@@ -22,8 +22,8 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.TaskanaException;
 import pro.taskana.common.internal.TaskanaEngineProxyForTest;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.AttachmentPersistenceException;

lib/taskana-core/src/test/java/acceptance/task/TerminateTaskAccTest.java

@@ -12,8 +12,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.InvalidStateException;

lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java

@@ -17,8 +17,8 @@ import pro.taskana.common.api.BulkOperationResults;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.InvalidOwnerException;

lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java

@@ -18,8 +18,8 @@ import pro.taskana.classification.api.models.ClassificationSummary;
 import pro.taskana.common.api.exceptions.ConcurrencyException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.AttachmentPersistenceException;

lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java

@@ -21,9 +21,9 @@ import pro.taskana.common.api.exceptions.ConcurrencyException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.internal.security.CurrentUserContext;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.common.internal.util.WorkingDaysToDaysConverter;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.AttachmentPersistenceException;
 import pro.taskana.task.api.exceptions.InvalidStateException;

lib/taskana-core/src/test/java/acceptance/task/UpdateTaskCommentAccTest.java

@@ -11,8 +11,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import pro.taskana.common.api.exceptions.ConcurrencyException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.TaskCommentNotFoundException;
 import pro.taskana.task.api.exceptions.TaskNotFoundException;

lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java

@@ -16,8 +16,8 @@ import pro.taskana.common.api.BulkOperationResults;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.TaskanaException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.InvalidOwnerException;

lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java

@@ -10,8 +10,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import pro.taskana.classification.api.exceptions.ClassificationNotFoundException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
 import pro.taskana.task.api.exceptions.TaskNotFoundException;

lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java

@@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import pro.taskana.common.api.exceptions.DomainNotFoundException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.WorkbasketType;
 import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException;

lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java

@@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.InvalidOwnerException;
 import pro.taskana.task.api.exceptions.InvalidStateException;

lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java

@@ -16,8 +16,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
 import pro.taskana.workbasket.api.models.Workbasket;

lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java

@@ -10,8 +10,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketPermission;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.WorkbasketType;

lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java

@@ -17,8 +17,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketPermission;
 import pro.taskana.workbasket.api.WorkbasketQuery;
 import pro.taskana.workbasket.api.WorkbasketService;

lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java

@@ -15,8 +15,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.BaseQuery.SortDirection;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketAccessItemQuery;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.models.WorkbasketAccessItem;

lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java

@@ -15,8 +15,8 @@ import pro.taskana.common.api.BaseQuery.SortDirection;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketPermission;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.models.WorkbasketSummary;

lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java

@@ -7,8 +7,8 @@ import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.models.WorkbasketSummary;
 

lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java

@@ -12,8 +12,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.exceptions.ConcurrencyException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.WorkbasketType;
 import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;

lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizations2AccTest.java

@@ -8,8 +8,8 @@ import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.models.WorkbasketAccessItem;
 

lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java

@@ -15,8 +15,8 @@ import pro.taskana.classification.api.exceptions.ClassificationNotFoundException
 import pro.taskana.common.api.KeyDomain;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.exceptions.TaskAlreadyExistException;
 import pro.taskana.task.api.models.Task;

lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java

@@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import pro.taskana.common.api.BaseQuery.SortDirection;
-import pro.taskana.security.JaasExtension;
+import pro.taskana.common.internal.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.models.WorkbasketSummary;
 

lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java

@@ -5,28 +5,51 @@ import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
 import static com.tngtech.archunit.library.GeneralCodingRules.NO_CLASSES_SHOULD_ACCESS_STANDARD_STREAMS;
 import static com.tngtech.archunit.library.GeneralCodingRules.NO_CLASSES_SHOULD_THROW_GENERIC_EXCEPTIONS;
 import static com.tngtech.archunit.library.dependencies.SlicesRuleDefinition.slices;
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+import static org.assertj.core.api.Assertions.assertThat;
 
+import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.core.importer.ClassFileImporter;
+import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ArchRule;
+import com.tngtech.archunit.lang.ConditionEvents;
+import com.tngtech.archunit.lang.SimpleConditionEvent;
+import java.util.Arrays;
+import java.util.List;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.function.ThrowingConsumer;
 
 /**
  * Test architecture of classes in taskana. For more info and examples see
  * https://www.archunit.org/userguide/html/000_Index.html
  */
 class ArchitectureTest {
+  private static final List<String> TASKANA_SUB_PACKAGES =
+      Arrays.asList(
+          "pro.taskana.sampledata",
+          "pro.taskana.common.internal",
+          "pro.taskana.common.api",
+          "pro.taskana.classification.api",
+          "pro.taskana.classification.internal",
+          "pro.taskana.spi.history.api",
+          "pro.taskana.spi.history.internal",
+          "pro.taskana.monitor.api",
+          "pro.taskana.monitor.internal",
+          "pro.taskana.task.api",
+          "pro.taskana.task.internal",
+          "pro.taskana.workbasket.api",
+          "pro.taskana.workbasket.internal",
+          "pro.taskana.spi.routing.api");
   private static JavaClasses importedClasses;
 
   @BeforeAll
-  static void init() throws ClassNotFoundException {
+  static void init() {
     // time intensive operation should only be done once
     importedClasses = new ClassFileImporter().importPackages("pro.taskana", "acceptance");
   }
@@ -74,95 +97,106 @@ class ArchitectureTest {
     NO_CLASSES_SHOULD_ACCESS_STANDARD_STREAMS.check(importedClasses);
   }
 
-  /**
-   * Solution would be nice, but is not achievable without big changes
-   * https://www.archunit.org/userguide/html/000_Index.html#_cycle_checks
-   */
-  @Disabled
   @Test
-  void freeOfCycles() {
+  void everySubpackageShouldBeTestsForCyclicDependencies() {
-    ArchRule myRule = slices().matching("pro.taskana.(*)..").should().beFreeOfCycles();
+    List<Pattern> excludePackages =
+        Stream.of(
+                "pro.taskana", // from TaskanaEngineConfiguration
+                "acceptance.*" // all our acceptance tests
+                )
+            .map(Pattern::compile)
+            .collect(Collectors.toList());
+    ArchCondition<JavaClass> condition =
+        new ArchCondition<JavaClass>("all be defined in TASKANA_SUB_PACKAGES") {
+          @Override
+          public void check(JavaClass item, ConditionEvents events) {
+            if (TASKANA_SUB_PACKAGES.stream().noneMatch(p -> item.getPackageName().startsWith(p))
+                && excludePackages.stream()
+                    .noneMatch(p -> p.matcher(item.getPackageName()).matches())) {
+              String message =
+                  String.format(
+                      "Package '%s' was not declared in TASKANA_SUB_PACKAGES",
+                      item.getPackageName());
+              events.add(SimpleConditionEvent.violated(item, message));
+            }
+          }
+        };
+    ArchRule myRule = classes().should(condition);
     myRule.check(importedClasses);
   }
 
+  @TestFactory
+  Stream<DynamicTest> everyPackageWhichIsTestedForCyclicDependenciesShouldExist() {
+    return DynamicTest.stream(
+        TASKANA_SUB_PACKAGES.iterator(),
+        p -> String.format("package '%s' exists", p),
+        p -> assertThat(importedClasses.containPackage(p)).isTrue());
+  }
+
   /**
    * Test for cycles with subpackages
    * https://www.archunit.org/userguide/html/000_Index.html#_cycle_checks
    */
   @TestFactory
-  Stream<DynamicTest> freeOfCycles_subpackages() {
+  Stream<DynamicTest> everySubPackageShouldBeFreeOfCyclicDependencies() {
-
+    Stream<String> packagesToTest = TASKANA_SUB_PACKAGES.stream().map(s -> s + ".(*)..");
-    Stream<String> packagesToTest =
+    ThrowingConsumer<String> testMethod =
-        Stream.of(
+        p -> slices().matching(p).should().beFreeOfCycles().check(importedClasses);
-            "pro.taskana.common.internal.(*)..",
+    return DynamicTest.stream(
-            "pro.taskana.common.api.(*)..",
+        packagesToTest.iterator(),
-            "pro.taskana.classification.api.(*)..",
+        p -> p.replaceAll(Pattern.quote("pro.taskana."), "") + " is free of cycles",
-            "pro.taskana.classification.internal.(*)..",
+        testMethod);
-            "pro.taskana.history.api.(*)..",
-            "pro.taskana.history.internal.(*)..",
-            "pro.taskana.report.api.(*)..",
-            "pro.taskana.report.internal.(*)..",
-            "pro.taskana.task.api.(*)..",
-            "pro.taskana.task.internal.(*)..",
-            "pro.taskana.workbasket.api.(*)..",
-            "pro.taskana.workbasket.internal.(*)..");
-    return packagesToTest.map(
-        p ->
-            dynamicTest(
-                p.replaceAll(Pattern.quote("pro.taskana."), "") + " is free of cycles",
-                () -> slices().matching(p).should().beFreeOfCycles().check(importedClasses)));
   }
 
-  @Disabled("TBD")
   @TestFactory
   Stream<DynamicTest> commonClassesShouldNotDependOnOtherDomainClasses() {
-
     Stream<String> packagesToTest =
-        Stream.of("..workbasket..", "..report..", "..history..", "..task..", "..classification..");
+        TASKANA_SUB_PACKAGES.stream()
-    return packagesToTest.map(
+            .map(p -> p.split("\\.")[2])
+            .distinct()
+            .filter(d -> !"common".equals(d))
+            .map(d -> ".." + d + "..");
+    ThrowingConsumer<String> testMethod =
         p ->
-            dynamicTest(
+            noClasses()
-                p.replaceAll(Pattern.quote("."), "") + " should not be used by common",
+                .that()
-                () ->
+                .haveNameNotMatching(".*TaskanaEngine.*")
-                    noClasses()
+                .and()
-                        .that()
+                .haveSimpleNameNotEndingWith("AbstractTaskanaJob")
-                        .resideInAPackage("..common..")
+                .and()
-                        .should()
+                .resideInAPackage("..common..")
-                        .dependOnClassesThat()
+                .should()
-                        .resideInAPackage(p)
+                .dependOnClassesThat()
-                        .check(importedClasses)));
+                .resideInAPackage(p)
+                .check(importedClasses);
+    return DynamicTest.stream(
+        packagesToTest.iterator(), p -> p + " should not be used by common", testMethod);
   }
 
   @TestFactory
-  Stream<DynamicTest> classesShouldNotDependOnReportDomainClasses() {
+  Stream<DynamicTest> classesShouldNotDependOnMonitorDomainClasses() {
-
     Stream<String> packagesToTest =
-        Stream.of(
+        TASKANA_SUB_PACKAGES.stream()
-            "..workbasket..",
+            .map(p -> p.split("\\.")[2])
-            "..history..",
+            .distinct()
-            "..task..",
+            .filter(d -> !"monitor".equals(d))
-            // TBD
+            .map(d -> ".." + d + "..");
-            // "..common..",
-            "..classification..");
-    return packagesToTest.map(
-        p ->
-            dynamicTest(
-                "Domain " + p.replaceAll(Pattern.quote("."), "") + " should not depend on reports",
-                () ->
-                    noClasses()
-                        .that()
-                        .resideInAPackage(p)
-                        .should()
-                        .dependOnClassesThat()
-                        .resideInAnyPackage("..report..")
-                        .check(importedClasses)));
-  }
 
-  @Disabled
+    ThrowingConsumer<String> testMethod =
-  @Test
+        p ->
-  void freeOfCyclicDependencies() {
+            noClasses()
-    ArchRule myRule = slices().matching("pro.taskana.(*)..").should().notDependOnEachOther();
+                .that()
-    myRule.check(importedClasses);
+                .resideInAPackage(p)
+                .and()
+                .haveNameNotMatching(".*TaskanaEngine.*")
+                .should()
+                .dependOnClassesThat()
+                .resideInAnyPackage("..monitor..")
+                .check(importedClasses);
+    return DynamicTest.stream(
+        packagesToTest.iterator(),
+        p -> String.format("Domain %s should not depend on monitor", p),
+        testMethod);
   }
 
   @Test

lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtension.java

@@ -1,4 +1,4 @@
-package pro.taskana.security;
+package pro.taskana.common.internal.security;
 
 import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated;
 import static pro.taskana.common.internal.util.CheckedFunction.wrap;
@@ -36,8 +36,6 @@ import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.support.AnnotationSupport;
 
 import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.security.GroupPrincipal;
-import pro.taskana.common.internal.security.UserPrincipal;
 
 /** Runner for integration tests that enables JAAS subject. */
 public class JaasExtension implements InvocationInterceptor, TestTemplateInvocationContextProvider {

lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtensionTest.java

@@ -1,4 +1,4 @@
-package pro.taskana.security;
+package pro.taskana.common.internal.security;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.DynamicContainer.dynamicContainer;
@@ -23,8 +23,6 @@ import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.TestTemplate;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import pro.taskana.common.internal.security.CurrentUserContext;
-
 @ExtendWith(JaasExtension.class)
 public class JaasExtensionTest {
 

lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessId.java

@@ -1,4 +1,4 @@
-package pro.taskana.security;
+package pro.taskana.common.internal.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Repeatable;

lib/taskana-core/src/test/java/pro/taskana/common/internal/security/WithAccessIds.java

@@ -1,4 +1,4 @@
-package pro.taskana.security;
+package pro.taskana.common.internal.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskStatusReportBuilderImplTest.java

@@ -1,4 +1,4 @@
-package pro.taskana.task.internal;
+package pro.taskana.monitor.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
@@ -24,8 +24,6 @@ import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.internal.InternalTaskanaEngine;
 import pro.taskana.monitor.api.reports.TaskStatusReport;
 import pro.taskana.monitor.api.reports.item.TaskQueryItem;
-import pro.taskana.monitor.internal.MonitorMapper;
-import pro.taskana.monitor.internal.MonitorServiceImpl;
 import pro.taskana.task.api.TaskState;
 
 /** Unit Test for TaskStatusReportBuilderImpl. */

lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkbasketReportBuilderImplTest.java

@@ -1,4 +1,4 @@
-package pro.taskana.workbasket.internal;
+package pro.taskana.monitor.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -34,8 +34,6 @@ import pro.taskana.monitor.api.SelectedItem;
 import pro.taskana.monitor.api.reports.WorkbasketReport;
 import pro.taskana.monitor.api.reports.header.TimeIntervalColumnHeader;
 import pro.taskana.monitor.api.reports.item.MonitorQueryItem;
-import pro.taskana.monitor.internal.MonitorMapper;
-import pro.taskana.monitor.internal.MonitorServiceImpl;
 import pro.taskana.task.api.CustomField;
 import pro.taskana.task.api.TaskState;
 

lib/taskana-core/src/test/java/pro/taskana/task/internal/JunitHelper.java

@@ -1,4 +1,4 @@
-package pro.taskana.common.internal;
+package pro.taskana.task.internal;
 
 import pro.taskana.task.api.models.Attachment;
 import pro.taskana.task.api.models.ObjectReference;

lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntAutocommitTest.java

@@ -27,14 +27,13 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.JunitHelper;
 import pro.taskana.common.internal.TaskanaEngineImpl;
 import pro.taskana.common.internal.TaskanaEngineTestConfiguration;
 import pro.taskana.common.internal.security.CurrentUserContext;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.common.internal.util.IdGenerator;
 import pro.taskana.sampledata.SampleDataGenerator;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.InvalidStateException;
 import pro.taskana.task.api.exceptions.TaskAlreadyExistException;

lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplIntExplicitTest.java

@@ -29,15 +29,14 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.SystemException;
-import pro.taskana.common.internal.JunitHelper;
 import pro.taskana.common.internal.TaskanaEngineImpl;
 import pro.taskana.common.internal.TaskanaEngineTestConfiguration;
 import pro.taskana.common.internal.configuration.DbSchemaCreator;
 import pro.taskana.common.internal.security.CurrentUserContext;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.common.internal.util.IdGenerator;
 import pro.taskana.sampledata.SampleDataGenerator;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.task.api.TaskState;
 import pro.taskana.task.api.exceptions.InvalidStateException;
 import pro.taskana.task.api.exceptions.TaskAlreadyExistException;

lib/taskana-core/src/test/java/pro/taskana/task/internal/TaskServiceImplTest.java

@@ -19,17 +19,14 @@ import pro.taskana.TaskanaEngineConfiguration;
 import pro.taskana.classification.api.models.Classification;
 import pro.taskana.classification.internal.ClassificationQueryImpl;
 import pro.taskana.classification.internal.ClassificationServiceImpl;
-import pro.taskana.classification.internal.models.ClassificationImpl;
 import pro.taskana.common.api.TaskanaEngine;
 import pro.taskana.common.internal.InternalTaskanaEngine;
-import pro.taskana.common.internal.JunitHelper;
 import pro.taskana.task.api.CallbackState;
 import pro.taskana.task.api.models.ObjectReference;
 import pro.taskana.task.api.models.TaskSummary;
 import pro.taskana.task.internal.models.TaskImpl;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.models.Workbasket;
-import pro.taskana.workbasket.internal.models.WorkbasketImpl;
 
 /**
  * Unit Test for TaskServiceImpl.
@@ -186,22 +183,4 @@ class TaskServiceImplTest {
     assertThat(summaryAfter).isEqualTo(summaryBefore);
     assertThat(summaryAfter.hashCode()).isEqualTo(summaryBefore.hashCode());
   }
-
-  static Classification createDummyClassification() {
-    ClassificationImpl classification = new ClassificationImpl();
-    classification.setName("dummy-classification");
-    classification.setDomain("dummy-domain");
-    classification.setKey("dummy-classification-key");
-    classification.setId("DummyClassificationId");
-    return classification;
-  }
-
-  static WorkbasketImpl createWorkbasket(String id, String key) {
-    WorkbasketImpl workbasket = new WorkbasketImpl();
-    workbasket.setId(id);
-    workbasket.setDomain("Domain1");
-    workbasket.setKey(key);
-    workbasket.setName("Workbasket " + id);
-    return workbasket;
-  }
 }

lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntAutocommitTest.java

@@ -21,10 +21,10 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException;
 import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.internal.TaskanaEngineTestConfiguration;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.common.internal.util.IdGenerator;
 import pro.taskana.sampledata.SampleDataGenerator;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.WorkbasketType;
 import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException;

lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntExplicitTest.java

@@ -22,10 +22,10 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.internal.TaskanaEngineImpl;
 import pro.taskana.common.internal.TaskanaEngineTestConfiguration;
+import pro.taskana.common.internal.security.JaasExtension;
+import pro.taskana.common.internal.security.WithAccessId;
 import pro.taskana.common.internal.util.IdGenerator;
 import pro.taskana.sampledata.SampleDataGenerator;
-import pro.taskana.security.JaasExtension;
-import pro.taskana.security.WithAccessId;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.WorkbasketType;
 import pro.taskana.workbasket.api.exceptions.InvalidWorkbasketException;

lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java

@@ -27,14 +27,13 @@ import pro.taskana.common.api.exceptions.DomainNotFoundException;
 import pro.taskana.common.api.exceptions.NotAuthorizedException;
 import pro.taskana.common.api.exceptions.TaskanaException;
 import pro.taskana.common.internal.TaskanaEngineImpl;
-import pro.taskana.common.internal.jobs.TaskCleanupJob;
-import pro.taskana.common.internal.jobs.WorkbasketCleanupJob;
 import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
 import pro.taskana.common.internal.util.IdGenerator;
 import pro.taskana.task.api.TaskService;
 import pro.taskana.task.api.models.ObjectReference;
 import pro.taskana.task.api.models.Task;
 import pro.taskana.task.api.models.TaskSummary;
+import pro.taskana.task.internal.jobs.TaskCleanupJob;
 import pro.taskana.task.internal.models.TaskImpl;
 import pro.taskana.workbasket.api.WorkbasketService;
 import pro.taskana.workbasket.api.WorkbasketType;
@@ -43,6 +42,7 @@ import pro.taskana.workbasket.api.exceptions.WorkbasketAlreadyExistException;
 import pro.taskana.workbasket.api.exceptions.WorkbasketInUseException;
 import pro.taskana.workbasket.api.exceptions.WorkbasketNotFoundException;
 import pro.taskana.workbasket.api.models.Workbasket;
+import pro.taskana.workbasket.internal.jobs.WorkbasketCleanupJob;
 import pro.taskana.workbasket.internal.models.WorkbasketImpl;
 
 /** Test for internal transaction management. */

rest/taskana-rest-spring-example-common/src/main/java/pro/taskana/jobs/JobScheduler.java

@@ -16,10 +16,10 @@ import org.springframework.stereotype.Component;
 import pro.taskana.common.api.TaskanaEngine;
 import pro.taskana.common.api.TaskanaRole;
 import pro.taskana.common.internal.jobs.JobRunner;
-import pro.taskana.common.internal.jobs.TaskCleanupJob;
-import pro.taskana.common.internal.jobs.WorkbasketCleanupJob;
 import pro.taskana.common.internal.security.UserPrincipal;
 import pro.taskana.common.internal.transaction.TaskanaTransactionProvider;
+import pro.taskana.task.internal.jobs.TaskCleanupJob;
+import pro.taskana.workbasket.internal.jobs.WorkbasketCleanupJob;
 
 /** This class invokes the JobRunner periodically to schedule long running jobs. */
 @Component