TSK-1009: Fix remaining checkstyle warnings

This commit is contained in:
Benjamin Eckstein 2020-01-07 13:49:05 +01:00 committed by Mustapha Zorgati
parent 7509bb0f1c
commit 841d38961a
70 changed files with 153 additions and 151 deletions

View File

@ -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
*/

View File

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

View File

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

View File

@ -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 + ";");
}

View File

@ -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
*/

View File

@ -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
*/

View File

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

View File

@ -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) {

View File

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

View File

@ -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<String> listTaskIdsForSelectedItems(List<SelectedItem> selectedItems)

View File

@ -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<Object> 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) {

View File

@ -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";

View File

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

View File

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

View File

@ -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() {

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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 =

View File

@ -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 =

View File

@ -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 =

View File

@ -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 =

View File

@ -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 {
/**

View File

@ -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 =

View File

@ -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() {

View File

@ -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() {

View File

@ -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() {

View File

@ -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() {

View File

@ -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(

View File

@ -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() {

View File

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

View File

@ -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() {

View File

@ -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() {

View File

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

View File

@ -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() {

View File

@ -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<TaskSummary> results =

View File

@ -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() {

View File

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

View File

@ -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() {

View File

@ -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() {

View File

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

View File

@ -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() {

View File

@ -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() {

View File

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

View File

@ -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() {

View File

@ -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(

View File

@ -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() {

View File

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

View File

@ -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() {

View File

@ -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() {

View File

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

View File

@ -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() {

View File

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

View File

@ -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() {

View File

@ -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() {

View File

@ -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() {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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<Object>)
() -> {
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<Object>) () -> {
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;
});
}
}

View File

@ -86,5 +86,5 @@ public class TaskanaConfig {
@Profile("inmemorydb")
@Configuration
@PropertySource("classpath:customdb.properties")
static class InmemoryDBProperties {}
static class InmemoryDbProperties {}
}