From 841d38961a44431c8b198b38b54eda1695e90a39 Mon Sep 17 00:00:00 2001 From: Benjamin Eckstein <13351939+benjamineckstein@users.noreply.github.com> Date: Tue, 7 Jan 2020 13:49:05 +0100 Subject: [PATCH] TSK-1009: Fix remaining checkstyle warnings --- .../query/HistoryQueryColumnName.java | 3 ++- .../test/java/acceptance/AbstractAccTest.java | 4 +-- .../{DBWriter.java => DbWriter.java} | 6 ++--- .../sampledata/SampleDataGenerator.java | 2 +- .../ObjectReferenceQueryColumnName.java | 3 ++- .../taskana/WorkbasketQueryColumnName.java | 3 ++- .../java/pro/taskana/configuration/DB.java | 4 +-- .../configuration/DbSchemaCreator.java | 4 +-- .../TaskanaEngineConfiguration.java | 2 +- .../report/TimeIntervalReportBuilder.java | 2 +- .../taskana/security/CurrentUserContext.java | 14 +++++------ .../CreateClassificationAccTest.java | 4 +-- .../DeleteClassificationAccTest.java | 4 +-- .../QueryClassificationAccTest.java | 4 +-- ...ryClassificationWithPaginationAccTest.java | 4 +-- .../UpdateClassificationAccTest.java | 4 +-- .../jobs/TaskCleanupJobAccTest.java | 4 +-- .../jobs/WorkbasketCleanupJobAccTest.java | 4 +-- ...ObjectreferencesWithPaginationAccTest.java | 4 +-- ...CustomAttributeValuesForReportAccTest.java | 4 +-- .../GetTaskIdsOfCategoryReportAccTest.java | 4 +-- ...tTaskIdsOfClassificationReportAccTest.java | 4 +-- ...askIdsOfCustomFieldValueReportAccTest.java | 4 +-- .../GetTaskIdsOfWorkbasketReportAccTest.java | 4 +-- .../report/ProvideCategoryReportAccTest.java | 4 +-- .../ProvideClassificationReportAccTest.java | 4 +-- .../ProvideCustomFieldValueReportAccTest.java | 4 +-- ...deDetailedClassificationReportAccTest.java | 4 +-- .../ProvideTaskStatusReportAccTest.java | 4 +-- .../report/ProvideTimestampReportAccTest.java | 4 +-- .../ProvideWorkbasketReportAccTest.java | 4 +-- .../security/ClassificationQueryAccTest.java | 4 +-- .../security/TaskEngineAccTest.java | 4 +-- .../acceptance/security/TaskQueryAccTest.java | 4 +-- .../security/WorkbasketQueryAccTest.java | 4 +-- .../acceptance/task/CallbackStateAccTest.java | 4 +-- .../acceptance/task/CompleteTaskAccTest.java | 4 +-- .../acceptance/task/CreateTaskAccTest.java | 4 +-- .../acceptance/task/DeleteTaskAccTest.java | 4 +-- .../java/acceptance/task/GetTaskAccTest.java | 4 +-- .../QueryTaskByClassificationNameAccTest.java | 4 +-- .../task/QueryTaskWithAttachment.java | 4 +-- .../acceptance/task/QueryTasksAccTest.java | 6 ++--- .../QueryTasksByObjectReferenceAccTest.java | 4 +-- .../QueryTasksByTimeIntervalsAccTest.java | 4 +-- .../task/QueryTasksByWorkbasketAccTest.java | 4 +-- .../task/QueryTasksWithPaginationAccTest.java | 4 +-- .../task/QueryTasksWithSortingAccTest.java | 4 +-- .../acceptance/task/TransferTaskAccTest.java | 4 +-- .../acceptance/task/UpdateTaskAccTest.java | 4 +-- .../task/UpdateTaskAttachmentsAccTest.java | 4 +-- .../acceptance/task/WorkOnTaskAccTest.java | 4 +-- .../taskrouting/TaskRoutingAccTest.java | 4 +-- .../workbasket/CreateWorkbasketAccTest.java | 4 +-- .../workbasket/DeleteWorkbasketAccTest.java | 4 +-- .../DistributionTargetsAccTest.java | 4 +-- .../workbasket/GetWorkbasketAccTest.java | 4 +-- .../workbasket/QueryWorkbasketAccTest.java | 4 +-- .../QueryWorkbasketAccessItemsAccTest.java | 4 +-- .../QueryWorkbasketByPermissionAccTest.java | 4 +-- ...QueryWorkbasketsWithPaginationAccTest.java | 4 +-- .../workbasket/UpdateWorkbasketAccTest.java | 4 +-- ...UpdateWorkbasketAuthorizationsAccTest.java | 4 +-- ...sketQueryWithOrderedPaginationAccTest.java | 4 +-- .../TaskServiceImplIntAutocommitTest.java | 4 +-- .../TaskServiceImplIntExplicitTest.java | 4 +-- ...orkbasketServiceImplIntAutocommitTest.java | 4 +-- .../WorkbasketServiceImplIntExplicitTest.java | 4 +-- ...{JAASExtension.java => JaasExtension.java} | 25 +++++++++---------- .../main/java/pro/taskana/TaskanaConfig.java | 2 +- 70 files changed, 153 insertions(+), 151 deletions(-) rename history/taskana-simplehistory-provider/src/test/java/configuration/{DBWriter.java => DbWriter.java} (97%) rename lib/taskana-core/src/test/java/pro/taskana/security/{JAASExtension.java => JaasExtension.java} (73%) diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/query/HistoryQueryColumnName.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/query/HistoryQueryColumnName.java index 0043a0e8d..e0c05d3be 100644 --- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/query/HistoryQueryColumnName.java +++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/query/HistoryQueryColumnName.java @@ -4,7 +4,8 @@ import pro.taskana.QueryColumnName; /** * Enum containing the column names for @see - * pro.taskana.simplehistory.mappings.HistoryQueryMapper#queryHistoryColumnValues(pro.taskana.simplehistory.impl.HistoryQueryImpl). + * pro.taskana.simplehistory.mappings.HistoryQueryMapper#queryHistoryColumnValues + * (pro.taskana.simplehistory.impl.HistoryQueryImpl). * * @author bv */ diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java index 3b6f671ee..b5f44fdf3 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/AbstractAccTest.java @@ -1,6 +1,6 @@ package acceptance; -import configuration.DBWriter; +import configuration.DbWriter; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -47,7 +47,7 @@ public class AbstractAccTest { historyService = new SimpleHistoryServiceImpl(); historyService.initialize(taskanaEngineConfiguration); - DBWriter writer = new DBWriter(); + DbWriter writer = new DbWriter(); writer.clearDB(dataSource); writer.generateTestData(dataSource); } diff --git a/history/taskana-simplehistory-provider/src/test/java/configuration/DBWriter.java b/history/taskana-simplehistory-provider/src/test/java/configuration/DbWriter.java similarity index 97% rename from history/taskana-simplehistory-provider/src/test/java/configuration/DBWriter.java rename to history/taskana-simplehistory-provider/src/test/java/configuration/DbWriter.java index 386a9071d..4512c47a5 100644 --- a/history/taskana-simplehistory-provider/src/test/java/configuration/DBWriter.java +++ b/history/taskana-simplehistory-provider/src/test/java/configuration/DbWriter.java @@ -12,16 +12,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** Set up the database's writer and generates data for tests. */ -public class DBWriter { +public class DbWriter { - private static final Logger LOGGER = LoggerFactory.getLogger(DBWriter.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DbWriter.class); private static final String INSERTVALUES = "/sql/history-events.sql"; private StringWriter outWriter = new StringWriter(); private PrintWriter logWriter; private StringWriter errorWriter; private PrintWriter errorLogWriter; - public DBWriter() { + public DbWriter() { this.logWriter = new PrintWriter(this.outWriter); this.errorWriter = new StringWriter(); this.errorLogWriter = new PrintWriter(this.errorWriter); diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/simplehistory/sampledata/SampleDataGenerator.java b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/simplehistory/sampledata/SampleDataGenerator.java index 4a88cc412..cd81f5d68 100644 --- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/simplehistory/sampledata/SampleDataGenerator.java +++ b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/rest/simplehistory/sampledata/SampleDataGenerator.java @@ -75,7 +75,7 @@ public class SampleDataGenerator { private StringReader selectSchemaScript(String dbProductName, String schemaName) { return new StringReader( - DB.isPostgreSQL(dbProductName) + DB.isPostgreSql(dbProductName) ? "SET search_path TO " + schemaName + ";" : "SET SCHEMA " + schemaName + ";"); } diff --git a/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQueryColumnName.java b/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQueryColumnName.java index b334e0d32..d06923875 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQueryColumnName.java +++ b/lib/taskana-core/src/main/java/pro/taskana/ObjectReferenceQueryColumnName.java @@ -2,7 +2,8 @@ package pro.taskana; /** * Enum containing the column names for @see {@link - * pro.taskana.mappings.QueryMapper#queryObjectReferenceColumnValues(pro.taskana.impl.ObjectReferenceQueryImpl)}. + * pro.taskana.mappings.QueryMapper#queryObjectReferenceColumnValues + * (pro.taskana.impl.ObjectReferenceQueryImpl)}. * * @author jsa */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQueryColumnName.java b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQueryColumnName.java index 1809f35d3..c8329f0c5 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQueryColumnName.java +++ b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketQueryColumnName.java @@ -2,7 +2,8 @@ package pro.taskana; /** * Enum containing the column names for @see {@link - * pro.taskana.mappings.QueryMapper#queryWorkbasketColumnValues(pro.taskana.impl.WorkbasketQueryImpl)}. + * pro.taskana.mappings.QueryMapper#queryWorkbasketColumnValues + * (pro.taskana.impl.WorkbasketQueryImpl)}. * * @author jsa */ diff --git a/lib/taskana-core/src/main/java/pro/taskana/configuration/DB.java b/lib/taskana-core/src/main/java/pro/taskana/configuration/DB.java index 9caf8121e..42ebe31a5 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/configuration/DB.java +++ b/lib/taskana-core/src/main/java/pro/taskana/configuration/DB.java @@ -24,7 +24,7 @@ public enum DB { return dbProductName != null && dbProductName.contains(H2.dbProductname); } - public static boolean isPostgreSQL(String dbProductName) { + public static boolean isPostgreSql(String dbProductName) { return POSTGRESS.dbProductname.equals(dbProductName); } @@ -34,7 +34,7 @@ public enum DB { return DB2.dbProductId; } else if (isH2(dbProductName)) { return H2.dbProductId; - } else if (isPostgreSQL(dbProductName)) { + } else if (isPostgreSql(dbProductName)) { return POSTGRESS.dbProductId; } else { throw new UnsupportedDatabaseException(dbProductName); diff --git a/lib/taskana-core/src/main/java/pro/taskana/configuration/DbSchemaCreator.java b/lib/taskana-core/src/main/java/pro/taskana/configuration/DbSchemaCreator.java index 534a9361b..4400db121 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/configuration/DbSchemaCreator.java +++ b/lib/taskana-core/src/main/java/pro/taskana/configuration/DbSchemaCreator.java @@ -118,13 +118,13 @@ public class DbSchemaCreator { } private static String selectDbScriptFileName(String dbProductName) { - return DB.isPostgreSQL(dbProductName) + return DB.isPostgreSql(dbProductName) ? DB_SCHEMA_POSTGRES : DB.isH2(dbProductName) ? DB_SCHEMA : DB_SCHEMA_DB2; } private static String selectDbSchemaDetectionScript(String dbProductName) { - return DB.isPostgreSQL(dbProductName) ? DB_SCHEMA_DETECTION_POSTGRES : DB_SCHEMA_DETECTION; + return DB.isPostgreSql(dbProductName) ? DB_SCHEMA_DETECTION_POSTGRES : DB_SCHEMA_DETECTION; } private ScriptRunner getScriptRunnerInstance(Connection connection) { diff --git a/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java b/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java index 602c0b2a4..93340d4a0 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java +++ b/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java @@ -477,7 +477,7 @@ public class TaskanaEngineConfiguration { try (Connection connection = dataSource.getConnection()) { String databaseProductName = connection.getMetaData().getDatabaseProductName(); - if (DB.isPostgreSQL(databaseProductName)) { + if (DB.isPostgreSql(databaseProductName)) { this.schemaName = this.schemaName.toLowerCase(); } else { this.schemaName = this.schemaName.toUpperCase(); diff --git a/lib/taskana-core/src/main/java/pro/taskana/report/TimeIntervalReportBuilder.java b/lib/taskana-core/src/main/java/pro/taskana/report/TimeIntervalReportBuilder.java index b507232b5..5111ffefc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/report/TimeIntervalReportBuilder.java +++ b/lib/taskana-core/src/main/java/pro/taskana/report/TimeIntervalReportBuilder.java @@ -108,8 +108,8 @@ public interface TimeIntervalReportBuilder< * Returns a list of all taskIds of the report that are in the list of selected items. * * @param selectedItems a list of selectedItems - * @throws InvalidArgumentException if the column headers are not initialized * @return the list of all taskIds + * @throws InvalidArgumentException if the column headers are not initialized * @throws NotAuthorizedException if the user has no rights to access the monitor */ List listTaskIdsForSelectedItems(List selectedItems) diff --git a/lib/taskana-core/src/main/java/pro/taskana/security/CurrentUserContext.java b/lib/taskana-core/src/main/java/pro/taskana/security/CurrentUserContext.java index 02f2ca0bb..a4f909691 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/security/CurrentUserContext.java +++ b/lib/taskana-core/src/main/java/pro/taskana/security/CurrentUserContext.java @@ -38,9 +38,9 @@ public final class CurrentUserContext { */ public static String getUserid() { if (runningOnWebSphere()) { - return getUseridFromWSSubject(); + return getUseridFromWsSubject(); } else { - return getUseridFromJAASSubject(); + return getUseridFromJaasSubject(); } } @@ -83,7 +83,7 @@ public final class CurrentUserContext { * * @return the userid of the caller. If the userid could not be obtained, null is returned. */ - private static String getUseridFromWSSubject() { + private static String getUseridFromWsSubject() { try { Class wsSubjectClass = Class.forName(WSSUBJECT_CLASSNAME); Method getCallerSubjectMethod = @@ -93,11 +93,11 @@ public final class CurrentUserContext { if (callerSubject != null) { Set publicCredentials = callerSubject.getPublicCredentials(); LOGGER.debug("Public credentials of caller: {}", publicCredentials); - for (Object pC : publicCredentials) { + for (Object credential : publicCredentials) { Object o = - pC.getClass() + credential.getClass() .getMethod(GET_UNIQUE_SECURITY_NAME_METHOD, (Class[]) null) - .invoke(pC, (Object[]) null); + .invoke(credential, (Object[]) null); LOGGER.debug("Returning the unique security name of first public credential: {}", o); String userIdFound = o.toString(); String userIdUsed = userIdFound; @@ -133,7 +133,7 @@ public final class CurrentUserContext { return runningOnWebSphere; } - private static String getUseridFromJAASSubject() { + private static String getUseridFromJaasSubject() { Subject subject = Subject.getSubject(AccessController.getContext()); LOGGER.trace("Subject of caller: {}", subject); if (subject != null) { diff --git a/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java index f501feb90..c9038c7f2 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/CreateClassificationAccTest.java @@ -20,11 +20,11 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskanaException; import pro.taskana.impl.ClassificationImpl; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "create classification" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class CreateClassificationAccTest extends AbstractAccTest { private static final String ID_PREFIX_CLASSIFICATION = "CLI"; diff --git a/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java index c10845955..5cb3f8f24 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/DeleteClassificationAccTest.java @@ -14,11 +14,11 @@ import pro.taskana.ClassificationService; import pro.taskana.exceptions.ClassificationInUseException; import pro.taskana.exceptions.ClassificationNotFoundException; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "delete classification" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class DeleteClassificationAccTest extends AbstractAccTest { private ClassificationService classificationService; diff --git a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java index fc6d7e28d..aed8cd1d9 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationAccTest.java @@ -22,11 +22,11 @@ import pro.taskana.exceptions.ClassificationNotFoundException; import pro.taskana.exceptions.ConcurrencyException; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "get classification" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryClassificationAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; diff --git a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java index eaa129ffb..b78212582 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/QueryClassificationWithPaginationAccTest.java @@ -13,10 +13,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.ClassificationService; import pro.taskana.ClassificationSummary; import pro.taskana.exceptions.TaskanaRuntimeException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; /** Acceptance test for all "query classifications with pagination" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryClassificationWithPaginationAccTest extends AbstractAccTest { QueryClassificationWithPaginationAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java index 2b538a801..2941cca56 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java @@ -33,11 +33,11 @@ import pro.taskana.impl.DaysToWorkingDaysConverter; import pro.taskana.impl.TaskImpl; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.jobs.JobRunner; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "update classification" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) public class UpdateClassificationAccTest extends AbstractAccTest { private ClassificationService classificationService; diff --git a/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java b/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java index 8ba648c36..ce8b5b2b4 100644 --- a/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/jobs/TaskCleanupJobAccTest.java @@ -23,11 +23,11 @@ import pro.taskana.exceptions.TaskAlreadyExistException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.jobs.TaskCleanupJob; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "jobs tasks runner" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class TaskCleanupJobAccTest extends AbstractAccTest { TaskService taskService; diff --git a/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java b/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java index ff7beff6e..ebf95b83a 100644 --- a/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/jobs/WorkbasketCleanupJobAccTest.java @@ -18,11 +18,11 @@ import pro.taskana.WorkbasketSummary; import pro.taskana.exceptions.TaskanaException; import pro.taskana.jobs.TaskCleanupJob; import pro.taskana.jobs.WorkbasketCleanupJob; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "jobs workbasket runner" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class WorkbasketCleanupJobAccTest extends AbstractAccTest { WorkbasketService workbasketService; diff --git a/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java index d9916ae93..0f1af9f5e 100644 --- a/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/objectreference/QueryObjectreferencesWithPaginationAccTest.java @@ -16,10 +16,10 @@ import pro.taskana.ObjectReferenceQuery; import pro.taskana.TaskQuery; import pro.taskana.TaskService; import pro.taskana.exceptions.TaskanaRuntimeException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; /** Acceptance test for all "query classifications with pagination" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryObjectreferencesWithPaginationAccTest extends AbstractAccTest { private TaskService taskService; diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java index 126fa9c5b..37f4156b4 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java @@ -16,11 +16,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.CustomField; import pro.taskana.TaskMonitorService; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "classification report" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest { @Test diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java index 04a5381e5..3bdf4531c 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java @@ -20,11 +20,11 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.SelectedItem; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "get task ids of category report" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { @Test diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java index 8d4cb1e41..9f1a82356 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java @@ -14,11 +14,11 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.SelectedItem; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "get task ids of classification report" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { @Test diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java index 2e22dde45..ac14c2e26 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java @@ -20,11 +20,11 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.SelectedItem; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "get task ids of category report" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { @Test diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java index 61babfc0f..477aff448 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java @@ -15,11 +15,11 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.SelectedItem; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "get task ids of workbasket report" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { @Test diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java index 9790bd61e..a2ad86eca 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCategoryReportAccTest.java @@ -24,11 +24,11 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.report.CategoryReport; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "category report" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class ProvideCategoryReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = LoggerFactory.getLogger(ProvideCategoryReportAccTest.class); diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java index d1b50d023..4b8ebf229 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java @@ -24,11 +24,11 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.report.ClassificationReport; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "classification report" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class ProvideClassificationReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java index 16f406a91..c5aefb9d0 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideCustomFieldValueReportAccTest.java @@ -23,11 +23,11 @@ import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.report.CustomFieldValueReport; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "classification report" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class ProvideCustomFieldValueReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java index a4b616ecf..6233efd7a 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java @@ -26,11 +26,11 @@ import pro.taskana.impl.report.item.DetailedMonitorQueryItem; import pro.taskana.impl.report.row.FoldableRow; import pro.taskana.impl.report.structure.Row; import pro.taskana.report.ClassificationReport.DetailedClassificationReport; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "detailed classification report" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java index c57f35886..44460eca7 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java @@ -21,11 +21,11 @@ import pro.taskana.impl.report.header.TaskStatusColumnHeader; import pro.taskana.impl.report.item.TaskQueryItem; import pro.taskana.impl.report.structure.Row; import pro.taskana.report.TaskStatusReport; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "task status report" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class ProvideTaskStatusReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java index 1e202e063..b2ca47464 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java @@ -18,11 +18,11 @@ import pro.taskana.impl.report.item.TimestampQueryItem; import pro.taskana.impl.report.row.SingleRow; import pro.taskana.impl.report.row.TimestampRow; import pro.taskana.report.TimestampReport; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Test class for {@link TimestampReport}. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class ProvideTimestampReportAccTest extends AbstractReportAccTest { /** diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java index 3bf4d7d15..f2a30c58e 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java @@ -25,11 +25,11 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.impl.report.CombinedClassificationFilter; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.report.WorkbasketReport; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "workbasket level report" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { private static final Logger LOGGER = diff --git a/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java index 7fb636449..aa077c6f1 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/ClassificationQueryAccTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.ClassificationService; import pro.taskana.ClassificationSummary; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** @@ -18,7 +18,7 @@ import pro.taskana.security.WithAccessId; * * @author bbr */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class ClassificationQueryAccTest extends AbstractAccTest { ClassificationQueryAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java index dbf1dbd6e..5f379c728 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/TaskEngineAccTest.java @@ -10,11 +10,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.TaskanaRole; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for task queries and authorization. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class TaskEngineAccTest extends AbstractAccTest { TaskEngineAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java index ff9201b45..88893c048 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/TaskQueryAccTest.java @@ -10,11 +10,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.TaskService; import pro.taskana.TaskSummary; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for task queries and authorization. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class TaskQueryAccTest extends AbstractAccTest { TaskQueryAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java b/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java index 1c2a0239b..c578786e5 100644 --- a/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/security/WorkbasketQueryAccTest.java @@ -13,11 +13,11 @@ import pro.taskana.WorkbasketService; import pro.taskana.WorkbasketSummary; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for workbasket queries and authorization. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class WorkbasketQueryAccTest extends AbstractAccTest { WorkbasketQueryAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java index 54aec84e4..9ea6d2d5e 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java @@ -31,11 +31,11 @@ import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.TaskanaException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.TaskImpl; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "create task" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class CallbackStateAccTest extends AbstractAccTest { @WithAccessId( diff --git a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java index 0e8c15d2b..b13d76089 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java @@ -25,11 +25,11 @@ import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.TaskImpl; import pro.taskana.security.CurrentUserContext; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance tests for all claim and complete scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class CompleteTaskAccTest extends AbstractAccTest { CompleteTaskAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java index cb63ede50..f7cbfc8ed 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java @@ -44,11 +44,11 @@ import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.mappings.AttachmentMapper; import pro.taskana.mappings.TaskTestMapper; import pro.taskana.security.CurrentUserContext; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "create task" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class CreateTaskAccTest extends AbstractAccTest { private TaskService taskService; diff --git a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java index 341776ea5..d315c0ac1 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java @@ -21,11 +21,11 @@ import pro.taskana.exceptions.InvalidStateException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.TaskanaException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "delete task" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class DeleteTaskAccTest extends AbstractAccTest { DeleteTaskAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java index b9cccc29c..5b18afacc 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/GetTaskAccTest.java @@ -17,11 +17,11 @@ import pro.taskana.TaskState; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskNotFoundException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "get task" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class GetTaskAccTest extends AbstractAccTest { GetTaskAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java index 71617b0fc..b8703abd9 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java @@ -14,14 +14,14 @@ import pro.taskana.TaskQuery; import pro.taskana.TaskQueryColumnName; import pro.taskana.TaskService; import pro.taskana.TaskSummary; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for the usecase of adding/removing an attachment of a task and update the result * correctly. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryTaskByClassificationNameAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java index 2f5edb30b..f44bc68ad 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachment.java @@ -18,14 +18,14 @@ import pro.taskana.TaskSummary; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskNotFoundException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for the usecase of adding/removing an attachment of a task and update the result * correctly. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryTaskWithAttachment extends AbstractAccTest { QueryTaskWithAttachment() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java index 0f145c6a4..e99bdc915 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java @@ -45,11 +45,11 @@ import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.TaskImpl; import pro.taskana.impl.TaskanaEngineProxyForTest; import pro.taskana.mappings.TaskTestMapper; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "query tasks with sorting" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryTasksAccTest extends AbstractAccTest { @BeforeEach @@ -1377,7 +1377,7 @@ class QueryTasksAccTest extends AbstractAccTest { @WithAccessId(userName = "admin") @Test - void testQueryForAttachmentLikeCHAndOrderByClassificationKeyDescAndAsc() { + void testQueryForAttachmentChannelLikeAndOrdering() { TaskService taskService = taskanaEngine.getTaskService(); List results = diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java index 974a36e90..cde482b60 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByObjectReferenceAccTest.java @@ -10,11 +10,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.TaskService; import pro.taskana.TaskSummary; import pro.taskana.exceptions.SystemException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "query tasks by object reference" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryTasksByObjectReferenceAccTest extends AbstractAccTest { QueryTasksByObjectReferenceAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java index dd0b45ff0..b42d6ba83 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByTimeIntervalsAccTest.java @@ -15,11 +15,11 @@ import pro.taskana.BaseQuery.SortDirection; import pro.taskana.TaskService; import pro.taskana.TaskSummary; import pro.taskana.TimeInterval; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "query tasks with sorting" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryTasksByTimeIntervalsAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java index 7af76033f..0e0162310 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java @@ -15,11 +15,11 @@ import pro.taskana.KeyDomain; import pro.taskana.TaskService; import pro.taskana.TaskSummary; import pro.taskana.exceptions.NotAuthorizedToQueryWorkbasketException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "query tasks by workbasket" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryTasksByWorkbasketAccTest extends AbstractAccTest { QueryTasksByWorkbasketAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java index 360e9eadb..6514f4d64 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java @@ -14,11 +14,11 @@ import pro.taskana.KeyDomain; import pro.taskana.TaskService; import pro.taskana.TaskSummary; import pro.taskana.exceptions.TaskanaRuntimeException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "query tasks by workbasket with pagination" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryTasksWithPaginationAccTest extends AbstractAccTest { QueryTasksWithPaginationAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java index 83ab16b01..1cd855d73 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java @@ -15,11 +15,11 @@ import pro.taskana.KeyDomain; import pro.taskana.TaskService; import pro.taskana.TaskState; import pro.taskana.TaskSummary; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "query tasks with sorting" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryTasksWithSortingAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; diff --git a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java index 767779e20..7afd81be4 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java @@ -30,11 +30,11 @@ import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.TaskanaException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "transfer task" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class TransferTaskAccTest extends AbstractAccTest { TransferTaskAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java index 994a05507..17ea18c8a 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java @@ -34,11 +34,11 @@ import pro.taskana.exceptions.TaskAlreadyExistException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.TaskImpl; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "update task" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class UpdateTaskAccTest extends AbstractAccTest { UpdateTaskAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java index 68503fb4e..bceb14022 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAttachmentsAccTest.java @@ -36,14 +36,14 @@ import pro.taskana.impl.DaysToWorkingDaysConverter; import pro.taskana.impl.TaskImpl; import pro.taskana.impl.report.header.TimeIntervalColumnHeader; import pro.taskana.security.CurrentUserContext; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** * Acceptance test for the usecase of adding/removing an attachment of a task and update the result * correctly. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class UpdateTaskAttachmentsAccTest extends AbstractAccTest { private Task task; diff --git a/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java index 4b57db6fb..ec5e12504 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java @@ -28,11 +28,11 @@ import pro.taskana.exceptions.InvalidStateException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.TaskanaException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "work on task" scenarios. This includes claim, complete... */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class WorkOnTaskAccTest extends AbstractAccTest { WorkOnTaskAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java b/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java index 0371fc2f6..2e0398034 100644 --- a/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/taskrouting/TaskRoutingAccTest.java @@ -16,11 +16,11 @@ import pro.taskana.exceptions.TaskAlreadyExistException; import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.TaskImpl; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "create task" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class TaskRoutingAccTest extends AbstractAccTest { @WithAccessId( diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java index 41061a4e2..ff1835ec9 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java @@ -20,11 +20,11 @@ import pro.taskana.exceptions.InvalidWorkbasketException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.WorkbasketAlreadyExistException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "create workbasket" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class CreateWorkbasketAccTest extends AbstractAccTest { CreateWorkbasketAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java index 4d6b49cd2..ad5b0f936 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java @@ -27,11 +27,11 @@ import pro.taskana.exceptions.TaskNotFoundException; import pro.taskana.exceptions.WorkbasketInUseException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.TaskImpl; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test which does test the deletion of a workbasket and all wanted failures. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class DeleteWorkbasketAccTest extends AbstractAccTest { private WorkbasketService workbasketService; diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java index 58be12696..53f60e999 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java @@ -19,11 +19,11 @@ import pro.taskana.WorkbasketService; import pro.taskana.WorkbasketSummary; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "get workbasket" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class DistributionTargetsAccTest extends AbstractAccTest { DistributionTargetsAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java index 30de59042..fc7f725be 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java @@ -16,11 +16,11 @@ import pro.taskana.WorkbasketSummary; import pro.taskana.WorkbasketType; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "get workbasket" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class GetWorkbasketAccTest extends AbstractAccTest { GetWorkbasketAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java index 474dbf52e..9b86e1169 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java @@ -20,11 +20,11 @@ import pro.taskana.WorkbasketSummary; import pro.taskana.WorkbasketType; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "query workbasket by permission" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryWorkbasketAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java index 6969402fb..eb02c2ba7 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java @@ -19,11 +19,11 @@ import pro.taskana.WorkbasketAccessItem; import pro.taskana.WorkbasketAccessItemQuery; import pro.taskana.WorkbasketService; import pro.taskana.exceptions.NotAuthorizedException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "query access items for workbaskets" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest { QueryWorkbasketAccessItemsAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java index 2996ecce1..70a7b95a9 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java @@ -18,11 +18,11 @@ import pro.taskana.WorkbasketSummary; import pro.taskana.exceptions.InvalidArgumentException; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.SystemException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "query workbasket by permission" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryWorkbasketByPermissionAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java index 7e98c0a7a..17070b907 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java @@ -13,11 +13,11 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.WorkbasketService; import pro.taskana.WorkbasketSummary; import pro.taskana.exceptions.TaskanaRuntimeException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "query classifications with pagination" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { QueryWorkbasketsWithPaginationAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java index 7853db9a6..86bf944b6 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java @@ -14,11 +14,11 @@ import pro.taskana.WorkbasketService; import pro.taskana.WorkbasketType; import pro.taskana.exceptions.NotAuthorizedException; import pro.taskana.exceptions.WorkbasketNotFoundException; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "update workbasket" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) public class UpdateWorkbasketAccTest extends AbstractAccTest { public UpdateWorkbasketAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java index f69c1cd9e..a48b47142 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java @@ -30,11 +30,11 @@ import pro.taskana.exceptions.TaskAlreadyExistException; import pro.taskana.exceptions.WorkbasketNotFoundException; import pro.taskana.impl.WorkbasketAccessItemImpl; import pro.taskana.security.CurrentUserContext; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** Acceptance test for all "update workbasket" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { UpdateWorkbasketAuthorizationsAccTest() { diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java index 6569252fd..3cb5d314b 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketQueryWithOrderedPaginationAccTest.java @@ -12,10 +12,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import pro.taskana.BaseQuery.SortDirection; import pro.taskana.WorkbasketService; import pro.taskana.WorkbasketSummary; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; /** Acceptance test for all "query classifications with pagination" scenarios. */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class WorkbasketQueryWithOrderedPaginationAccTest extends AbstractAccTest { private static SortDirection asc = SortDirection.ASCENDING; diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java index 394f50e7b..95082cef7 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java @@ -51,7 +51,7 @@ import pro.taskana.impl.configuration.TaskanaEngineTestConfiguration; import pro.taskana.impl.util.IdGenerator; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.security.CurrentUserContext; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** @@ -59,7 +59,7 @@ import pro.taskana.security.WithAccessId; * * @author EH */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class TaskServiceImplIntAutocommitTest { private DataSource dataSource; diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java index fbeba0bba..fa05e323f 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java @@ -57,7 +57,7 @@ import pro.taskana.impl.configuration.TaskanaEngineTestConfiguration; import pro.taskana.impl.util.IdGenerator; import pro.taskana.sampledata.SampleDataGenerator; import pro.taskana.security.CurrentUserContext; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** @@ -65,7 +65,7 @@ import pro.taskana.security.WithAccessId; * * @author EH */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class TaskServiceImplIntExplicitTest { private static DataSource dataSource; diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java index 584fbd57a..cb12c2019 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java @@ -42,7 +42,7 @@ import pro.taskana.impl.configuration.TaskanaEngineTestConfiguration; import pro.taskana.impl.util.IdGenerator; import pro.taskana.mappings.WorkbasketMapper; import pro.taskana.sampledata.SampleDataGenerator; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** @@ -50,7 +50,7 @@ import pro.taskana.security.WithAccessId; * * @author EH */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class WorkbasketServiceImplIntAutocommitTest { private static final int SLEEP_TIME = 100; diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java index eb42cd0b6..61d3491ca 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java @@ -34,7 +34,7 @@ import pro.taskana.impl.WorkbasketImpl; import pro.taskana.impl.configuration.TaskanaEngineTestConfiguration; import pro.taskana.impl.util.IdGenerator; import pro.taskana.sampledata.SampleDataGenerator; -import pro.taskana.security.JAASExtension; +import pro.taskana.security.JaasExtension; import pro.taskana.security.WithAccessId; /** @@ -42,7 +42,7 @@ import pro.taskana.security.WithAccessId; * * @author bbr */ -@ExtendWith(JAASExtension.class) +@ExtendWith(JaasExtension.class) class WorkbasketServiceImplIntExplicitTest { static int counter = 0; diff --git a/lib/taskana-core/src/test/java/pro/taskana/security/JAASExtension.java b/lib/taskana-core/src/test/java/pro/taskana/security/JaasExtension.java similarity index 73% rename from lib/taskana-core/src/test/java/pro/taskana/security/JAASExtension.java rename to lib/taskana-core/src/test/java/pro/taskana/security/JaasExtension.java index 25725ee93..830179831 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/security/JAASExtension.java +++ b/lib/taskana-core/src/test/java/pro/taskana/security/JaasExtension.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.extension.ReflectiveInvocationContext; import org.junit.platform.commons.JUnitException; /** Runner for integration tests that enables JAAS subject. */ -public class JAASExtension implements InvocationInterceptor { +public class JaasExtension implements InvocationInterceptor { @Override public void interceptTestMethod( @@ -39,17 +39,16 @@ public class JAASExtension implements InvocationInterceptor { subject.getPrincipals().addAll(principalList); Subject.doAs( subject, - (PrivilegedExceptionAction) - () -> { - try { - invocation.proceed(); - } catch (Exception | Error e) { - throw e; - } catch (Throwable e) { - throw new JUnitException( - "Execution of test failed: " + invocationContext.getExecutable().getName(), e); - } - return null; - }); + (PrivilegedExceptionAction) () -> { + try { + invocation.proceed(); + } catch (Exception | Error e) { + throw e; + } catch (Throwable e) { + throw new JUnitException( + "Execution of test failed: " + invocationContext.getExecutable().getName(), e); + } + return null; + }); } } diff --git a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfig.java b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfig.java index 99584cef4..d4ff9b841 100644 --- a/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfig.java +++ b/lib/taskana-spring-example/src/main/java/pro/taskana/TaskanaConfig.java @@ -86,5 +86,5 @@ public class TaskanaConfig { @Profile("inmemorydb") @Configuration @PropertySource("classpath:customdb.properties") - static class InmemoryDBProperties {} + static class InmemoryDbProperties {} }