From 28b3ce6f8a563bf74bf02382b77c3b817085f127 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Fri, 30 Oct 2020 02:47:34 +0100 Subject: [PATCH] TSK-1282: replaced all usages of Arrays.asList with List.of --- .../api/WorkingDaysToDaysConverterTest.java | 4 +- .../impl/LogfileHistoryServiceImplTest.java | 6 +- ...eteHistoryEventsOnTaskDeletionAccTest.java | 5 +- ...rkbasketDistributionTargetsSetAccTest.java | 3 +- .../task/internal/TaskServiceImpl.java | 19 +- .../UpdateClassificationAccTest.java | 365 +++++++++--------- .../config/TaskanaRoleConfigAccTest.java | 5 +- ...CustomAttributeValuesForReportAccTest.java | 3 +- ...OfClassificationCategoryReportAccTest.java | 14 +- ...tTaskIdsOfClassificationReportAccTest.java | 14 +- ...dsOfTaskCustomFieldValueReportAccTest.java | 14 +- .../GetTaskIdsOfWorkbasketReportAccTest.java | 8 +- ...deClassificationCategoryReportAccTest.java | 2 +- .../ProvideClassificationReportAccTest.java | 2 +- ...deDetailedClassificationReportAccTest.java | 2 +- ...videTaskCustomFieldValueReportAccTest.java | 2 +- .../ProvideTaskStatusReportAccTest.java | 6 +- .../report/ProvideTimestampReportAccTest.java | 11 +- .../ProvideWorkbasketReportAccTest.java | 2 +- .../acceptance/task/CallbackStateAccTest.java | 67 ++-- .../acceptance/task/CompleteTaskAccTest.java | 16 +- .../acceptance/task/DeleteTaskAccTest.java | 9 +- .../acceptance/task/QueryTasksAccTest.java | 2 +- .../task/QueryTasksByWorkbasketAccTest.java | 10 +- .../task/ServiceLevelPriorityAccTest.java | 11 +- .../java/acceptance/task/SetOwnerAccTest.java | 7 +- .../acceptance/task/TransferTaskAccTest.java | 13 +- .../acceptance/task/UpdateTaskAccTest.java | 3 +- .../acceptance/task/WorkOnTaskAccTest.java | 3 +- .../DistributionTargetsAccTest.java | 42 +- .../workbasket/QueryWorkbasketAccTest.java | 20 +- .../QueryWorkbasketByPermissionAccTest.java | 11 +- .../java/pro/taskana/ArchitectureTest.java | 3 +- ...ficationCategoryReportBuilderImplTest.java | 11 +- .../ClassificationReportBuilderImplTest.java | 13 +- .../taskana/monitor/internal/ReportTest.java | 5 +- ...CustomFieldValueReportBuilderImplTest.java | 7 +- .../TaskStatusReportBuilderImplTest.java | 5 +- .../WorkbasketReportBuilderImplTest.java | 15 +- .../WorkingDaysToDaysReportConverterTest.java | 3 +- .../internal/models/TaskModelsCloneTest.java | 9 +- ...orkbasketServiceImplIntAutocommitTest.java | 3 +- .../WorkbasketServiceImplIntExplicitTest.java | 3 +- .../taskana/jobs/AsyncUpdateJobIntTest.java | 79 ++-- ...sificationDefinitionControllerIntTest.java | 16 +- .../taskana/common/rest/QueryHelperTest.java | 11 +- ...WorkbasketAccessItemControllerIntTest.java | 3 +- ...WorkbasketDefinitionControllerIntTest.java | 4 +- ...itionRepresentationModelAssemblerTest.java | 5 +- 49 files changed, 412 insertions(+), 484 deletions(-) diff --git a/common/taskana-common/src/test/java/pro/taskana/common/api/WorkingDaysToDaysConverterTest.java b/common/taskana-common/src/test/java/pro/taskana/common/api/WorkingDaysToDaysConverterTest.java index af662a5b6..0339af7b0 100644 --- a/common/taskana-common/src/test/java/pro/taskana/common/api/WorkingDaysToDaysConverterTest.java +++ b/common/taskana-common/src/test/java/pro/taskana/common/api/WorkingDaysToDaysConverterTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import java.time.Instant; import java.time.LocalDate; import java.time.temporal.ChronoUnit; -import java.util.Arrays; +import java.util.List; import java.util.stream.Stream; import org.junit.jupiter.api.DynamicContainer; import org.junit.jupiter.api.DynamicNode; @@ -25,7 +25,7 @@ class WorkingDaysToDaysConverterTest { CustomHoliday dayOfReformation = CustomHoliday.of(31, 10); CustomHoliday allSaintsDays = CustomHoliday.of(1, 11); converter = - new WorkingDaysToDaysConverter(true, false, Arrays.asList(dayOfReformation, allSaintsDays)); + new WorkingDaysToDaysConverter(true, false, List.of(dayOfReformation, allSaintsDays)); } @TestFactory diff --git a/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java b/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java index a6e8b5988..053b407f7 100644 --- a/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java +++ b/history/taskana-loghistory-provider/src/test/java/pro/taskana/loghistory/impl/LogfileHistoryServiceImplTest.java @@ -57,7 +57,7 @@ class LogfileHistoryServiceImplTest { logfileHistoryServiceImpl.create(eventToBeLogged); - String logMessage = logger.getLoggingEvents().asList().get(0).getMessage(); + String logMessage = logger.getLoggingEvents().get(0).getMessage(); TaskHistoryEvent deserializedEventFromLogMessage = objectMapper.readValue(logMessage, TaskHistoryEvent.class); @@ -80,7 +80,7 @@ class LogfileHistoryServiceImplTest { logfileHistoryServiceImpl.create(eventToBeLogged); - String logMessage = logger.getLoggingEvents().asList().get(0).getMessage(); + String logMessage = logger.getLoggingEvents().get(0).getMessage(); WorkbasketHistoryEvent deserializedEventFromLogMessage = objectMapper.readValue(logMessage, WorkbasketHistoryEvent.class); @@ -103,7 +103,7 @@ class LogfileHistoryServiceImplTest { logfileHistoryServiceImpl.create(eventToBeLogged); - String logMessage = logger.getLoggingEvents().asList().get(0).getMessage(); + String logMessage = logger.getLoggingEvents().get(0).getMessage(); ClassificationHistoryEvent deserializedEventFromLogMessage = objectMapper.readValue(logMessage, ClassificationHistoryEvent.class); diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java index 2db81e45d..89bd499de 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/task/DeleteHistoryEventsOnTaskDeletionAccTest.java @@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import acceptance.AbstractAccTest; -import java.util.Arrays; import java.util.List; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.junit.jupiter.api.Test; @@ -74,7 +73,7 @@ class DeleteHistoryEventsOnTaskDeletionAccTest extends AbstractAccTest { historyService.createTaskHistoryQuery().taskIdIn(taskId_1, taskId_2)); assertThat(listEvents).hasSize(3); - taskService.deleteTasks(Arrays.asList(taskId_1, taskId_2)); + taskService.deleteTasks(List.of(taskId_1, taskId_2)); // make sure the tasks got deleted ThrowingCallable getDeletedTaskCall = @@ -145,7 +144,7 @@ class DeleteHistoryEventsOnTaskDeletionAccTest extends AbstractAccTest { historyService.createTaskHistoryQuery().taskIdIn(taskId_1, taskId_2)); assertThat(listEvents).hasSize(2); - taskService.deleteTasks(Arrays.asList(taskId_1, taskId_2)); + taskService.deleteTasks(List.of(taskId_1, taskId_2)); // make sure the tasks got deleted ThrowingCallable getDeletedTaskCall = diff --git a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java index 366900f25..f4cb8416d 100644 --- a/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java +++ b/history/taskana-simplehistory-provider/src/test/java/acceptance/events/workbasket/CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest.java @@ -3,7 +3,6 @@ package acceptance.events.workbasket; import static org.assertj.core.api.Assertions.assertThat; import acceptance.AbstractAccTest; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -33,7 +32,7 @@ class CreateHistoryEventOnWorkbasketDistributionTargetsSetAccTest extends Abstra final String sourceWorkbasketId = "WBI:100000000000000000000000000000000004"; List targetWorkbaskets = - Arrays.asList( + List.of( "WBI:100000000000000000000000000000000002", "WBI:100000000000000000000000000000000003"); List events = diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java index f0cadbca4..821316927 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskServiceImpl.java @@ -10,6 +10,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -693,7 +694,7 @@ public class TaskServiceImpl implements TaskService { List taskSummaries = taskMapper.findExistingTasks(null, externalIds); - Iterator taskIdIterator = externalIds.iterator(); + Iterator taskIdIterator = new ArrayList<>(externalIds).iterator(); while (taskIdIterator.hasNext()) { removeSingleTaskForCallbackStateByExternalId(bulkLog, taskSummaries, taskIdIterator, state); } @@ -1430,21 +1431,23 @@ public class TaskServiceImpl implements TaskService { "", new InvalidArgumentException("IDs with EMPTY or NULL value are not allowed.")); externalIdIterator.remove(); } else { - MinimalTaskSummary foundSummary = + Optional foundSummary = taskSummaries.stream() .filter(taskSummary -> currentExternalId.equals(taskSummary.getExternalId())) - .findFirst() - .orElse(null); - if (foundSummary == null) { + .findFirst(); + if (foundSummary.isPresent()) { + if (!desiredCallbackStateCanBeSetForFoundSummary( + foundSummary.get(), desiredCallbackState)) { + bulkLog.addError(currentExternalId, new InvalidStateException(currentExternalId)); + externalIdIterator.remove(); + } + } else { bulkLog.addError( currentExternalId, new TaskNotFoundException( currentExternalId, String.format("Task with id %s was not found.", currentExternalId))); externalIdIterator.remove(); - } else if (!desiredCallbackStateCanBeSetForFoundSummary(foundSummary, desiredCallbackState)) { - bulkLog.addError(currentExternalId, new InvalidStateException(currentExternalId)); - externalIdIterator.remove(); } } LOGGER.debug("exit from removeSingleTask()"); 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 5d6b11109..be5198e26 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java @@ -7,8 +7,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import acceptance.AbstractAccTest; import java.time.Duration; import java.time.Instant; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.junit.jupiter.api.Test; @@ -188,63 +186,59 @@ class UpdateClassificationAccTest extends AbstractAccTest { TaskService taskService = taskanaEngine.getTaskService(); List tasksWithP1D = - new ArrayList<>( - Arrays.asList( - "TKI:000000000000000000000000000000000054", - "TKI:000000000000000000000000000000000055", - "TKI:000000000000000000000000000000000000", - "TKI:000000000000000000000000000000000011", - "TKI:000000000000000000000000000000000053")); + List.of( + "TKI:000000000000000000000000000000000054", + "TKI:000000000000000000000000000000000055", + "TKI:000000000000000000000000000000000000", + "TKI:000000000000000000000000000000000011", + "TKI:000000000000000000000000000000000053"); validateTaskPropertiesAfterClassificationChange( before, tasksWithP1D, taskService, converter, 1, 1000); - List tasksWithP8D = - new ArrayList<>(List.of("TKI:000000000000000000000000000000000008")); + List tasksWithP8D = List.of("TKI:000000000000000000000000000000000008"); validateTaskPropertiesAfterClassificationChange( before, tasksWithP8D, taskService, converter, 8, 1000); - List tasksWithP14D = - new ArrayList<>(List.of("TKI:000000000000000000000000000000000010")); + List tasksWithP14D = List.of("TKI:000000000000000000000000000000000010"); validateTaskPropertiesAfterClassificationChange( before, tasksWithP14D, taskService, converter, 14, 1000); List tasksWithP15D = - new ArrayList<>( - Arrays.asList( - "TKI:000000000000000000000000000000000003", - "TKI:000000000000000000000000000000000004", - "TKI:000000000000000000000000000000000005", - "TKI:000000000000000000000000000000000006", - "TKI:000000000000000000000000000000000007", - "TKI:000000000000000000000000000000000009", - "TKI:000000000000000000000000000000000012", - "TKI:000000000000000000000000000000000013", - "TKI:000000000000000000000000000000000014", - "TKI:000000000000000000000000000000000015", - "TKI:000000000000000000000000000000000016", - "TKI:000000000000000000000000000000000017", - "TKI:000000000000000000000000000000000018", - "TKI:000000000000000000000000000000000019", - "TKI:000000000000000000000000000000000020", - "TKI:000000000000000000000000000000000021", - "TKI:000000000000000000000000000000000022", - "TKI:000000000000000000000000000000000023", - "TKI:000000000000000000000000000000000024", - "TKI:000000000000000000000000000000000025", - "TKI:000000000000000000000000000000000026", - "TKI:000000000000000000000000000000000027", - "TKI:000000000000000000000000000000000028", - "TKI:000000000000000000000000000000000029", - "TKI:000000000000000000000000000000000030", - "TKI:000000000000000000000000000000000031", - "TKI:000000000000000000000000000000000032", - "TKI:000000000000000000000000000000000033", - "TKI:000000000000000000000000000000000034", - "TKI:000000000000000000000000000000000035", - "TKI:000000000000000000000000000000000100", - "TKI:000000000000000000000000000000000101", - "TKI:000000000000000000000000000000000102", - "TKI:000000000000000000000000000000000103")); + List.of( + "TKI:000000000000000000000000000000000003", + "TKI:000000000000000000000000000000000004", + "TKI:000000000000000000000000000000000005", + "TKI:000000000000000000000000000000000006", + "TKI:000000000000000000000000000000000007", + "TKI:000000000000000000000000000000000009", + "TKI:000000000000000000000000000000000012", + "TKI:000000000000000000000000000000000013", + "TKI:000000000000000000000000000000000014", + "TKI:000000000000000000000000000000000015", + "TKI:000000000000000000000000000000000016", + "TKI:000000000000000000000000000000000017", + "TKI:000000000000000000000000000000000018", + "TKI:000000000000000000000000000000000019", + "TKI:000000000000000000000000000000000020", + "TKI:000000000000000000000000000000000021", + "TKI:000000000000000000000000000000000022", + "TKI:000000000000000000000000000000000023", + "TKI:000000000000000000000000000000000024", + "TKI:000000000000000000000000000000000025", + "TKI:000000000000000000000000000000000026", + "TKI:000000000000000000000000000000000027", + "TKI:000000000000000000000000000000000028", + "TKI:000000000000000000000000000000000029", + "TKI:000000000000000000000000000000000030", + "TKI:000000000000000000000000000000000031", + "TKI:000000000000000000000000000000000032", + "TKI:000000000000000000000000000000000033", + "TKI:000000000000000000000000000000000034", + "TKI:000000000000000000000000000000000035", + "TKI:000000000000000000000000000000000100", + "TKI:000000000000000000000000000000000101", + "TKI:000000000000000000000000000000000102", + "TKI:000000000000000000000000000000000103"); validateTaskPropertiesAfterClassificationChange( before, tasksWithP15D, taskService, converter, 15, 1000); } @@ -294,55 +288,53 @@ class UpdateClassificationAccTest extends AbstractAccTest { TaskService taskService = taskanaEngine.getTaskService(); List tasksWithPrio99 = - new ArrayList<>( - Arrays.asList( - "TKI:000000000000000000000000000000000003", - "TKI:000000000000000000000000000000000004", - "TKI:000000000000000000000000000000000005", - "TKI:000000000000000000000000000000000006", - "TKI:000000000000000000000000000000000007", - "TKI:000000000000000000000000000000000009", - "TKI:000000000000000000000000000000000012", - "TKI:000000000000000000000000000000000013", - "TKI:000000000000000000000000000000000014", - "TKI:000000000000000000000000000000000015", - "TKI:000000000000000000000000000000000016", - "TKI:000000000000000000000000000000000017", - "TKI:000000000000000000000000000000000018", - "TKI:000000000000000000000000000000000019", - "TKI:000000000000000000000000000000000020", - "TKI:000000000000000000000000000000000021", - "TKI:000000000000000000000000000000000022", - "TKI:000000000000000000000000000000000023", - "TKI:000000000000000000000000000000000024", - "TKI:000000000000000000000000000000000025", - "TKI:000000000000000000000000000000000026", - "TKI:000000000000000000000000000000000027", - "TKI:000000000000000000000000000000000028", - "TKI:000000000000000000000000000000000029", - "TKI:000000000000000000000000000000000030", - "TKI:000000000000000000000000000000000031", - "TKI:000000000000000000000000000000000032", - "TKI:000000000000000000000000000000000033", - "TKI:000000000000000000000000000000000034", - "TKI:000000000000000000000000000000000035", - "TKI:000000000000000000000000000000000100", - "TKI:000000000000000000000000000000000101", - "TKI:000000000000000000000000000000000102", - "TKI:000000000000000000000000000000000103", - "TKI:200000000000000000000000000000000007", - "TKI:000000000000000000000000000000000000", - "TKI:000000000000000000000000000000000052", - "TKI:000000000000000000000000000000000053", - "TKI:000000000000000000000000000000000054", - "TKI:000000000000000000000000000000000008", - "TKI:000000000000000000000000000000000009", - "TKI:000000000000000000000000000000000010")); + List.of( + "TKI:000000000000000000000000000000000003", + "TKI:000000000000000000000000000000000004", + "TKI:000000000000000000000000000000000005", + "TKI:000000000000000000000000000000000006", + "TKI:000000000000000000000000000000000007", + "TKI:000000000000000000000000000000000009", + "TKI:000000000000000000000000000000000012", + "TKI:000000000000000000000000000000000013", + "TKI:000000000000000000000000000000000014", + "TKI:000000000000000000000000000000000015", + "TKI:000000000000000000000000000000000016", + "TKI:000000000000000000000000000000000017", + "TKI:000000000000000000000000000000000018", + "TKI:000000000000000000000000000000000019", + "TKI:000000000000000000000000000000000020", + "TKI:000000000000000000000000000000000021", + "TKI:000000000000000000000000000000000022", + "TKI:000000000000000000000000000000000023", + "TKI:000000000000000000000000000000000024", + "TKI:000000000000000000000000000000000025", + "TKI:000000000000000000000000000000000026", + "TKI:000000000000000000000000000000000027", + "TKI:000000000000000000000000000000000028", + "TKI:000000000000000000000000000000000029", + "TKI:000000000000000000000000000000000030", + "TKI:000000000000000000000000000000000031", + "TKI:000000000000000000000000000000000032", + "TKI:000000000000000000000000000000000033", + "TKI:000000000000000000000000000000000034", + "TKI:000000000000000000000000000000000035", + "TKI:000000000000000000000000000000000100", + "TKI:000000000000000000000000000000000101", + "TKI:000000000000000000000000000000000102", + "TKI:000000000000000000000000000000000103", + "TKI:200000000000000000000000000000000007", + "TKI:000000000000000000000000000000000000", + "TKI:000000000000000000000000000000000052", + "TKI:000000000000000000000000000000000053", + "TKI:000000000000000000000000000000000054", + "TKI:000000000000000000000000000000000008", + "TKI:000000000000000000000000000000000009", + "TKI:000000000000000000000000000000000010"); validateTaskPropertiesAfterClassificationChange( before, tasksWithPrio99, taskService, converter, 1, 99); - List tasksWithPrio101 = - new ArrayList<>(List.of("TKI:000000000000000000000000000000000011")); + List tasksWithPrio101 = List.of("TKI:000000000000000000000000000000000011"); validateTaskPropertiesAfterClassificationChange( before, tasksWithPrio101, taskService, converter, 1, 101); @@ -350,58 +342,56 @@ class UpdateClassificationAccTest extends AbstractAccTest { updateClassificationAndRunAssociatedJobs(updatedClassification); List tasksWithPrio7 = - new ArrayList<>( - Arrays.asList( - "TKI:000000000000000000000000000000000003", - "TKI:000000000000000000000000000000000004", - "TKI:000000000000000000000000000000000005", - "TKI:000000000000000000000000000000000006", - "TKI:000000000000000000000000000000000007", - "TKI:000000000000000000000000000000000009", - "TKI:000000000000000000000000000000000010", - "TKI:000000000000000000000000000000000012", - "TKI:000000000000000000000000000000000013", - "TKI:000000000000000000000000000000000014", - "TKI:000000000000000000000000000000000015", - "TKI:000000000000000000000000000000000016", - "TKI:000000000000000000000000000000000017", - "TKI:000000000000000000000000000000000018", - "TKI:000000000000000000000000000000000019", - "TKI:000000000000000000000000000000000020", - "TKI:000000000000000000000000000000000021", - "TKI:000000000000000000000000000000000022", - "TKI:000000000000000000000000000000000023", - "TKI:000000000000000000000000000000000024", - "TKI:000000000000000000000000000000000025", - "TKI:000000000000000000000000000000000026", - "TKI:000000000000000000000000000000000027", - "TKI:000000000000000000000000000000000028", - "TKI:000000000000000000000000000000000029", - "TKI:000000000000000000000000000000000030", - "TKI:000000000000000000000000000000000031", - "TKI:000000000000000000000000000000000032", - "TKI:000000000000000000000000000000000033", - "TKI:000000000000000000000000000000000034", - "TKI:000000000000000000000000000000000035", - "TKI:000000000000000000000000000000000100", - "TKI:000000000000000000000000000000000101", - "TKI:000000000000000000000000000000000102", - "TKI:000000000000000000000000000000000103", - "TKI:000000000000000000000000000000000000", - "TKI:000000000000000000000000000000000052", - "TKI:000000000000000000000000000000000053", - "TKI:000000000000000000000000000000000054", - "TKI:000000000000000000000000000000000055", - "TKI:200000000000000000000000000000000007")); + List.of( + "TKI:000000000000000000000000000000000003", + "TKI:000000000000000000000000000000000004", + "TKI:000000000000000000000000000000000005", + "TKI:000000000000000000000000000000000006", + "TKI:000000000000000000000000000000000007", + "TKI:000000000000000000000000000000000009", + "TKI:000000000000000000000000000000000010", + "TKI:000000000000000000000000000000000012", + "TKI:000000000000000000000000000000000013", + "TKI:000000000000000000000000000000000014", + "TKI:000000000000000000000000000000000015", + "TKI:000000000000000000000000000000000016", + "TKI:000000000000000000000000000000000017", + "TKI:000000000000000000000000000000000018", + "TKI:000000000000000000000000000000000019", + "TKI:000000000000000000000000000000000020", + "TKI:000000000000000000000000000000000021", + "TKI:000000000000000000000000000000000022", + "TKI:000000000000000000000000000000000023", + "TKI:000000000000000000000000000000000024", + "TKI:000000000000000000000000000000000025", + "TKI:000000000000000000000000000000000026", + "TKI:000000000000000000000000000000000027", + "TKI:000000000000000000000000000000000028", + "TKI:000000000000000000000000000000000029", + "TKI:000000000000000000000000000000000030", + "TKI:000000000000000000000000000000000031", + "TKI:000000000000000000000000000000000032", + "TKI:000000000000000000000000000000000033", + "TKI:000000000000000000000000000000000034", + "TKI:000000000000000000000000000000000035", + "TKI:000000000000000000000000000000000100", + "TKI:000000000000000000000000000000000101", + "TKI:000000000000000000000000000000000102", + "TKI:000000000000000000000000000000000103", + "TKI:000000000000000000000000000000000000", + "TKI:000000000000000000000000000000000052", + "TKI:000000000000000000000000000000000053", + "TKI:000000000000000000000000000000000054", + "TKI:000000000000000000000000000000000055", + "TKI:200000000000000000000000000000000007"); validateTaskPropertiesAfterClassificationChange( before, tasksWithPrio7, taskService, converter, 1, 7); - List tasksWithPrio9 = - new ArrayList<>(List.of("TKI:000000000000000000000000000000000008")); + List tasksWithPrio9 = List.of("TKI:000000000000000000000000000000000008"); validateTaskPropertiesAfterClassificationChange( before, tasksWithPrio9, taskService, converter, 1, 9); - tasksWithPrio101 = new ArrayList<>(List.of("TKI:000000000000000000000000000000000011")); + tasksWithPrio101 = List.of("TKI:000000000000000000000000000000000011"); validateTaskPropertiesAfterClassificationChange( before, tasksWithPrio101, taskService, converter, 1, 101); @@ -427,61 +417,58 @@ class UpdateClassificationAccTest extends AbstractAccTest { // TODO - resume old behaviour after attachment query is possible. TaskService taskService = taskanaEngine.getTaskService(); List tasksWithPD12 = - new ArrayList<>( - Arrays.asList( - "TKI:000000000000000000000000000000000003", - "TKI:000000000000000000000000000000000004", - "TKI:000000000000000000000000000000000005", - "TKI:000000000000000000000000000000000006", - "TKI:000000000000000000000000000000000007", - "TKI:000000000000000000000000000000000009", - "TKI:000000000000000000000000000000000010", - "TKI:000000000000000000000000000000000012", - "TKI:000000000000000000000000000000000013", - "TKI:000000000000000000000000000000000014", - "TKI:000000000000000000000000000000000015", - "TKI:000000000000000000000000000000000016", - "TKI:000000000000000000000000000000000017", - "TKI:000000000000000000000000000000000018", - "TKI:000000000000000000000000000000000019", - "TKI:000000000000000000000000000000000020", - "TKI:000000000000000000000000000000000021", - "TKI:000000000000000000000000000000000022", - "TKI:000000000000000000000000000000000023", - "TKI:000000000000000000000000000000000024", - "TKI:000000000000000000000000000000000025", - "TKI:000000000000000000000000000000000026", - "TKI:000000000000000000000000000000000027", - "TKI:000000000000000000000000000000000028", - "TKI:000000000000000000000000000000000029", - "TKI:000000000000000000000000000000000030", - "TKI:000000000000000000000000000000000031", - "TKI:000000000000000000000000000000000032", - "TKI:000000000000000000000000000000000033", - "TKI:000000000000000000000000000000000034", - "TKI:000000000000000000000000000000000035", - "TKI:000000000000000000000000000000000100", - "TKI:000000000000000000000000000000000101", - "TKI:000000000000000000000000000000000102", - "TKI:000000000000000000000000000000000103", - "TKI:200000000000000000000000000000000007")); + List.of( + "TKI:000000000000000000000000000000000003", + "TKI:000000000000000000000000000000000004", + "TKI:000000000000000000000000000000000005", + "TKI:000000000000000000000000000000000006", + "TKI:000000000000000000000000000000000007", + "TKI:000000000000000000000000000000000009", + "TKI:000000000000000000000000000000000010", + "TKI:000000000000000000000000000000000012", + "TKI:000000000000000000000000000000000013", + "TKI:000000000000000000000000000000000014", + "TKI:000000000000000000000000000000000015", + "TKI:000000000000000000000000000000000016", + "TKI:000000000000000000000000000000000017", + "TKI:000000000000000000000000000000000018", + "TKI:000000000000000000000000000000000019", + "TKI:000000000000000000000000000000000020", + "TKI:000000000000000000000000000000000021", + "TKI:000000000000000000000000000000000022", + "TKI:000000000000000000000000000000000023", + "TKI:000000000000000000000000000000000024", + "TKI:000000000000000000000000000000000025", + "TKI:000000000000000000000000000000000026", + "TKI:000000000000000000000000000000000027", + "TKI:000000000000000000000000000000000028", + "TKI:000000000000000000000000000000000029", + "TKI:000000000000000000000000000000000030", + "TKI:000000000000000000000000000000000031", + "TKI:000000000000000000000000000000000032", + "TKI:000000000000000000000000000000000033", + "TKI:000000000000000000000000000000000034", + "TKI:000000000000000000000000000000000035", + "TKI:000000000000000000000000000000000100", + "TKI:000000000000000000000000000000000101", + "TKI:000000000000000000000000000000000102", + "TKI:000000000000000000000000000000000103", + "TKI:200000000000000000000000000000000007"); validateTaskPropertiesAfterClassificationChange( before, tasksWithPD12, taskService, converter, 12, 555); - List tasksWithPD8 = - new ArrayList<>(List.of("TKI:000000000000000000000000000000000008")); + List tasksWithPD8 = List.of("TKI:000000000000000000000000000000000008"); validateTaskPropertiesAfterClassificationChange( before, tasksWithPD8, taskService, converter, 8, 555); List tasksWithPD1 = - new ArrayList<>( - Arrays.asList( - "TKI:000000000000000000000000000000000000", - "TKI:000000000000000000000000000000000011", - "TKI:000000000000000000000000000000000052", - "TKI:000000000000000000000000000000000053", - "TKI:000000000000000000000000000000000054", - "TKI:000000000000000000000000000000000055")); + List.of( + "TKI:000000000000000000000000000000000000", + "TKI:000000000000000000000000000000000011", + "TKI:000000000000000000000000000000000052", + "TKI:000000000000000000000000000000000053", + "TKI:000000000000000000000000000000000054", + "TKI:000000000000000000000000000000000055"); validateTaskPropertiesAfterClassificationChange( before, tasksWithPD1, taskService, converter, 1, 555); } diff --git a/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java b/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java index 6333f9751..7fe545118 100644 --- a/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java @@ -7,7 +7,6 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Arrays; import java.util.List; import java.util.Set; import org.h2.store.fs.FileUtils; @@ -120,7 +119,7 @@ class TaskanaRoleConfigAccTest extends TaskanaEngineImpl { throws Exception { Path file = Files.createFile(Paths.get(System.getProperty("user.home") + filename)); List lines = - Arrays.asList( + List.of( "taskana.roles.admin =uSeR " + delimiter + "name=Username,Organisation=novatec", " taskana.roles.businessadmin = name=user2, ou = bpm " + delimiter + " user3 ", " taskana.roles.user = ", @@ -139,7 +138,7 @@ class TaskanaRoleConfigAccTest extends TaskanaEngineImpl { private String createNewConfigFileWithSameDelimiter(String filename) throws Exception { Path file = Files.createFile(Paths.get(System.getProperty("user.home") + filename)); List lines = - Arrays.asList( + List.of( "taskana.roles.admin =uSeR|Username", " taskana.roles.businessadmin = user2 | user3 ", " taskana.roles.user = nobody", 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 d57f2e51d..247d54453 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetCustomAttributeValuesForReportAccTest.java @@ -3,7 +3,6 @@ package acceptance.report; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -75,7 +74,7 @@ class GetCustomAttributeValuesForReportAccTest extends AbstractReportAccTest { @WithAccessId(user = "monitor") @Test void testGetCustomAttributeValuesForExcludedClassifications() throws Exception { - List domains = Arrays.asList("DOMAIN_A", "DOMAIN_B", "DOMAIN_C"); + List domains = List.of("DOMAIN_A", "DOMAIN_B", "DOMAIN_C"); List values = MONITOR_SERVICE diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationCategoryReportAccTest.java index bcc8f4fef..2316b7ea4 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationCategoryReportAccTest.java @@ -92,7 +92,7 @@ class GetTaskIdsOfClassificationCategoryReportAccTest extends AbstractReportAccT void testGetTaskIdsOfCategoryReport() throws Exception { final List columnHeaders = getListOfColumnHeaders(); - final List selectedItems = Arrays.asList(EXTERN, AUTOMATIC, MANUAL); + final List selectedItems = List.of(EXTERN, AUTOMATIC, MANUAL); List ids = MONITOR_SERVICE @@ -122,7 +122,7 @@ class GetTaskIdsOfClassificationCategoryReportAccTest extends AbstractReportAccT final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); final List columnHeaders = getListOfColumnHeaders(); - final List selectedItems = Arrays.asList(EXTERN, AUTOMATIC, MANUAL); + final List selectedItems = List.of(EXTERN, AUTOMATIC, MANUAL); List ids = MONITOR_SERVICE @@ -146,7 +146,7 @@ class GetTaskIdsOfClassificationCategoryReportAccTest extends AbstractReportAccT final List states = List.of(TaskState.READY); final List columnHeaders = getListOfColumnHeaders(); - final List selectedItems = Arrays.asList(EXTERN, AUTOMATIC, MANUAL); + final List selectedItems = List.of(EXTERN, AUTOMATIC, MANUAL); List ids = MONITOR_SERVICE @@ -174,10 +174,10 @@ class GetTaskIdsOfClassificationCategoryReportAccTest extends AbstractReportAccT @WithAccessId(user = "monitor") @Test void testGetTaskIdsOfCategoryReportWithCategoryFilter() throws Exception { - final List categories = Arrays.asList("AUTOMATIC", "MANUAL"); + final List categories = List.of("AUTOMATIC", "MANUAL"); final List columnHeaders = getListOfColumnHeaders(); - final List selectedItems = Arrays.asList(AUTOMATIC, MANUAL); + final List selectedItems = List.of(AUTOMATIC, MANUAL); List ids = MONITOR_SERVICE @@ -200,7 +200,7 @@ class GetTaskIdsOfClassificationCategoryReportAccTest extends AbstractReportAccT final List domains = List.of("DOMAIN_A"); final List columnHeaders = getListOfColumnHeaders(); - final List selectedItems = Arrays.asList(EXTERN, AUTOMATIC, MANUAL); + final List selectedItems = List.of(EXTERN, AUTOMATIC, MANUAL); List ids = MONITOR_SERVICE @@ -225,7 +225,7 @@ class GetTaskIdsOfClassificationCategoryReportAccTest extends AbstractReportAccT customAttributeFilter.put(TaskCustomField.CUSTOM_1, "Geschaeftsstelle A"); final List columnHeaders = getListOfColumnHeaders(); - final List selectedItems = Arrays.asList(EXTERN, AUTOMATIC, MANUAL); + final List selectedItems = List.of(EXTERN, AUTOMATIC, MANUAL); List ids = MONITOR_SERVICE 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 078c6a498..3fe213152 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationReportAccTest.java @@ -38,7 +38,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { @Test void testRoleCheck() { - List selectedItems = Arrays.asList(L_10000, L_10000_1, L_30000); + List selectedItems = List.of(L_10000, L_10000_1, L_30000); ThrowingCallable call = () -> @@ -70,7 +70,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { @Test void should_SelectCompletedItems_When_CompletedTimeStampIsRequested() throws Exception { List columnHeaders = getListOfColumnHeaders(); - List selectedItems = Arrays.asList(L_10000, L_10000_1, L_30000); + List selectedItems = List.of(L_10000, L_10000_1, L_30000); List ids = MONITOR_SERVICE @@ -86,7 +86,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfClassificationReport() throws Exception { List columnHeaders = getListOfColumnHeaders(); - List selectedItems = Arrays.asList(L_10000, L_10000_1, L_30000); + List selectedItems = List.of(L_10000, L_10000_1, L_30000); List ids = MONITOR_SERVICE @@ -111,7 +111,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { final List columnHeaders = getListOfColumnHeaders(); final List selectedItems = - Arrays.asList( + List.of( new SelectedItem("L10000", "L11000", 0, 0), new SelectedItem("L10000", "L11000", Integer.MIN_VALUE, -11)); @@ -134,7 +134,7 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { final List columnHeaders = getListOfColumnHeaders(); final List selectedItems = - Arrays.asList(L_30000, new SelectedItem("L10000", "L11000", 0, 0)); + List.of(L_30000, new SelectedItem("L10000", "L11000", 0, 0)); List ids = MONITOR_SERVICE @@ -152,8 +152,8 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfClassificationReportWithDomainFilter() throws Exception { List columnHeaders = getListOfColumnHeaders(); - List selectedItems = Arrays.asList(L_10000, L_10000_1, L_30000); - List domains = Arrays.asList("DOMAIN_B", "DOMAIN_C"); + List selectedItems = List.of(L_10000, L_10000_1, L_30000); + List domains = List.of("DOMAIN_B", "DOMAIN_C"); List ids = MONITOR_SERVICE diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java index 4d780b35a..458c852d6 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java @@ -92,7 +92,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes void testGetTaskIdsOfCustomFieldValueReport() throws Exception { List columnHeaders = getListOfColumnHeaders(); List selectedItems = - Arrays.asList(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); + List.of(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); List ids = MONITOR_SERVICE @@ -119,7 +119,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); final List columnHeaders = getListOfColumnHeaders(); List selectedItems = - Arrays.asList(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); + List.of(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); List ids = MONITOR_SERVICE @@ -141,7 +141,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes void testGetTaskIdsOfCustomFieldValueReportWithStateFilter() throws Exception { final List columnHeaders = getListOfColumnHeaders(); List selectedItems = - Arrays.asList(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); + List.of(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); List ids = MONITOR_SERVICE @@ -165,10 +165,10 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes @WithAccessId(user = "monitor") @Test void testGetTaskIdsOfCustomFieldValueReportWithCategoryFilter() throws Exception { - final List categories = Arrays.asList("AUTOMATIC", "MANUAL"); + final List categories = List.of("AUTOMATIC", "MANUAL"); final List columnHeaders = getListOfColumnHeaders(); List selectedItems = - Arrays.asList(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); + List.of(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); List ids = MONITOR_SERVICE @@ -189,7 +189,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes void testGetTaskIdsOfCustomFieldValueReportWithDomainFilter() throws Exception { final List columnHeaders = getListOfColumnHeaders(); List selectedItems = - Arrays.asList(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); + List.of(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); List ids = MONITOR_SERVICE @@ -212,7 +212,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes customAttributeFilter.put(TaskCustomField.CUSTOM_1, "Geschaeftsstelle A"); final List columnHeaders = getListOfColumnHeaders(); List selectedItems = - Arrays.asList(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); + List.of(GESCHAEFTSSTELLE_A, GESCHAEFTSSTELLE_B, GESCHAEFTSSTELLE_C); List ids = MONITOR_SERVICE 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 9bd841f4d..2a02a2b91 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java @@ -69,7 +69,7 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { @Test void should_SelectCompletedItems_When_CompletedTimeStampIsRequested() throws Exception { final List columnHeaders = getListOfColumnHeaders(); - final List selectedItems = Arrays.asList(S_1, S_2, S_3); + final List selectedItems = List.of(S_1, S_2, S_3); List ids = MONITOR_SERVICE @@ -85,7 +85,7 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfWorkbasketReport() throws Exception { final List columnHeaders = getListOfColumnHeaders(); - final List selectedItems = Arrays.asList(S_1, S_2, S_3); + final List selectedItems = List.of(S_1, S_2, S_3); List ids = MONITOR_SERVICE @@ -109,7 +109,7 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { @Test void testGetTaskIdsOfWorkbasketReportWithExcludedClassifications() throws Exception { final List columnHeaders = getListOfColumnHeaders(); - final List selectedItems = Arrays.asList(S_1, S_2, S_3); + final List selectedItems = List.of(S_1, S_2, S_3); List ids = MONITOR_SERVICE @@ -135,7 +135,7 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { final List selectedItems = List.of(new SelectedItem("USER-1-1", null, Integer.MIN_VALUE, Integer.MAX_VALUE)); final List combinedClassificationFilters = - Arrays.asList( + List.of( new CombinedClassificationFilter( "CLI:000000000000000000000000000000000003", "CLI:000000000000000000000000000000000008"), diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationCategoryReportAccTest.java index de0eaacf6..6d448b830 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationCategoryReportAccTest.java @@ -276,7 +276,7 @@ class ProvideClassificationCategoryReportAccTest extends AbstractReportAccTest { @WithAccessId(user = "monitor") @Test void testEachItemOfCategoryReportWithCategoryFilter() throws Exception { - List categories = Arrays.asList("AUTOMATIC", "MANUAL"); + List categories = List.of("AUTOMATIC", "MANUAL"); List columnHeaders = getShortListOfColumnHeaders(); ClassificationCategoryReport report = 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 2e6e377bb..ce035b6ca 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideClassificationReportAccTest.java @@ -307,7 +307,7 @@ class ProvideClassificationReportAccTest extends AbstractReportAccTest { @WithAccessId(user = "monitor") @Test void testEachItemOfClassificationReportWithCategoryFilter() throws Exception { - List categories = Arrays.asList("AUTOMATIC", "MANUAL"); + List categories = List.of("AUTOMATIC", "MANUAL"); List columnHeaders = getShortListOfColumnHeaders(); ClassificationReport report = 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 10b182961..f384b1651 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideDetailedClassificationReportAccTest.java @@ -500,7 +500,7 @@ class ProvideDetailedClassificationReportAccTest extends AbstractReportAccTest { @WithAccessId(user = "monitor") @Test void testEachItemOfDetailedClassificationReportWithCategoryFilter() throws Exception { - List categories = Arrays.asList("AUTOMATIC", "MANUAL"); + List categories = List.of("AUTOMATIC", "MANUAL"); List columnHeaders = getShortListOfColumnHeaders(); DetailedClassificationReport report = diff --git a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java index 3875f37e5..2bb71b782 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java @@ -292,7 +292,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest { @WithAccessId(user = "monitor") @Test void testEachItemOfCustomFieldValueReportWithCategoryFilter() throws Exception { - List categories = Arrays.asList("AUTOMATIC", "MANUAL"); + List categories = List.of("AUTOMATIC", "MANUAL"); List columnHeaders = getShortListOfColumnHeaders(); TaskCustomFieldValueReport report = 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 84b1cc2a8..0fe9721f6 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTaskStatusReportAccTest.java @@ -1,11 +1,9 @@ package acceptance.report; -import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.Arrays; import java.util.List; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.junit.jupiter.api.BeforeEach; @@ -114,7 +112,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest { TaskStatusReport report = MONITOR_SERVICE .createTaskStatusReportBuilder() - .domainIn(asList("DOMAIN_C", "DOMAIN_A")) + .domainIn(List.of("DOMAIN_C", "DOMAIN_A")) .buildReport(); assertThat(report).isNotNull(); @@ -179,7 +177,7 @@ class ProvideTaskStatusReportAccTest extends AbstractReportAccTest { MONITOR_SERVICE .createTaskStatusReportBuilder() .stateIn( - Arrays.asList( + List.of( TaskState.READY, TaskState.CLAIMED, TaskState.COMPLETED, 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 cd2f299dd..430b5eb6a 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideTimestampReportAccTest.java @@ -3,9 +3,8 @@ package acceptance.report; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; -import java.util.Arrays; -import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; @@ -114,12 +113,10 @@ class ProvideTimestampReportAccTest extends AbstractReportAccTest { .collect(Collectors.toList()); TimestampReport timestampReport = MONITOR_SERVICE.createTimestampReportBuilder().withColumnHeaders(headers).buildReport(); - final HashSet org1Set = new HashSet<>(Arrays.asList("N/A", "org1")); - final HashSet allOtherOrgLevelSet = new HashSet<>(List.of("N/A")); + final Set org1Set = Set.of("N/A", "org1"); + final Set allOtherOrgLevelSet = Set.of("N/A"); - assertThat(timestampReport.getRows()).hasSize(2); - assertThat(timestampReport.getRows().keySet()) - .isEqualTo(new HashSet<>(Arrays.asList("CREATED", "COMPLETED"))); + assertThat(timestampReport.getRows()).containsOnlyKeys("CREATED", "COMPLETED"); // * * * * * * * * * * * * * * * * * * TEST THE CREATED ROW * * * * * * * * * * * * * * * * * * 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 93e04ed01..fd6119e94 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/ProvideWorkbasketReportAccTest.java @@ -260,7 +260,7 @@ class ProvideWorkbasketReportAccTest extends AbstractReportAccTest { @WithAccessId(user = "monitor") @Test void testEachItemOfWorkbasketReportWithCategoryFilter() throws Exception { - List categories = Arrays.asList("AUTOMATIC", "MANUAL"); + List categories = List.of("AUTOMATIC", "MANUAL"); List columnHeaders = getShortListOfColumnHeaders(); WorkbasketReport report = 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 aa4670e1c..01a6220d6 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java @@ -1,11 +1,10 @@ package acceptance.task; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; import acceptance.AbstractAccTest; -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -98,6 +97,18 @@ class CallbackStateAccTest extends AbstractAccTest { .hasMessageEndingWith(endOfMessage); } + @WithAccessId(user = "admin") + @Test + void should_NotThrowUnsupportedOperationException_When_ExternalIdListIsUnmodifiable() { + TaskService taskService = taskanaEngine.getTaskService(); + + assertThatCode( + () -> + taskService.setCallbackStateForTasks( + List.of(""), CallbackState.CALLBACK_PROCESSING_COMPLETED)) + .doesNotThrowAnyException(); + } + @WithAccessId(user = "admin") @Test void testUpdateOfCallbackState() throws Exception { @@ -127,8 +138,7 @@ class CallbackStateAccTest extends AbstractAccTest { assertThat(createdTask3.getState()).isEqualTo(TaskState.COMPLETED); List taskIds = - new ArrayList<>( - Arrays.asList(createdTask1.getId(), createdTask2.getId(), createdTask3.getId())); + List.of(createdTask1.getId(), createdTask2.getId(), createdTask3.getId()); // delete should fail because callback_state = CALLBACK_PROCESSING_REQUIRED BulkOperationResults bulkResult1 = taskService.deleteTasks(taskIds); @@ -141,11 +151,10 @@ class CallbackStateAccTest extends AbstractAccTest { assertThat(excpt.getClass().getName()).isEqualTo(InvalidStateException.class.getName()); } List externalIds = - new ArrayList<>( - Arrays.asList( - createdTask1.getExternalId(), - createdTask2.getExternalId(), - createdTask3.getExternalId())); + List.of( + createdTask1.getExternalId(), + createdTask2.getExternalId(), + createdTask3.getExternalId()); // now enable deletion by setting callback state to CALLBACK_PROCESSING_COMPLETED BulkOperationResults bulkResult2 = @@ -153,9 +162,7 @@ class CallbackStateAccTest extends AbstractAccTest { externalIds, CallbackState.CALLBACK_PROCESSING_COMPLETED); assertThat(bulkResult2.containsErrors()).isFalse(); - taskIds = - new ArrayList<>( - Arrays.asList(createdTask1.getId(), createdTask2.getId(), createdTask3.getId())); + taskIds = List.of(createdTask1.getId(), createdTask2.getId(), createdTask3.getId()); // now it should be possible to delete the tasks BulkOperationResults bulkResult3 = taskService.deleteTasks(taskIds); assertThat(bulkResult3.containsErrors()).isFalse(); @@ -179,11 +186,10 @@ class CallbackStateAccTest extends AbstractAccTest { .isEqualTo(CallbackState.CALLBACK_PROCESSING_COMPLETED); List externalIds = - new ArrayList<>( - Arrays.asList( - createdTask1.getExternalId(), - createdTask2.getExternalId(), - createdTask3.getExternalId())); + List.of( + createdTask1.getExternalId(), + createdTask2.getExternalId(), + createdTask3.getExternalId()); // try to set CallbackState to NONE BulkOperationResults bulkResult = @@ -213,11 +219,10 @@ class CallbackStateAccTest extends AbstractAccTest { .isEqualTo(CallbackState.CALLBACK_PROCESSING_COMPLETED); List externalIds = - new ArrayList<>( - Arrays.asList( - createdTask1.getExternalId(), - createdTask2.getExternalId(), - createdTask3.getExternalId())); + List.of( + createdTask1.getExternalId(), + createdTask2.getExternalId(), + createdTask3.getExternalId()); // complete a task createdTask3 = (TaskImpl) taskService.forceCompleteTask(createdTask3.getId()); @@ -250,11 +255,10 @@ class CallbackStateAccTest extends AbstractAccTest { .isEqualTo(CallbackState.CALLBACK_PROCESSING_COMPLETED); List externalIds = - new ArrayList<>( - Arrays.asList( - createdTask1.getExternalId(), - createdTask2.getExternalId(), - createdTask3.getExternalId())); + List.of( + createdTask1.getExternalId(), + createdTask2.getExternalId(), + createdTask3.getExternalId()); // claim two tasks createdTask1 = (TaskImpl) taskService.forceClaim(createdTask1.getId()); @@ -291,11 +295,10 @@ class CallbackStateAccTest extends AbstractAccTest { .isEqualTo(CallbackState.CALLBACK_PROCESSING_COMPLETED); List externalIds = - new ArrayList<>( - Arrays.asList( - createdTask1.getExternalId(), - createdTask2.getExternalId(), - createdTask3.getExternalId())); + List.of( + createdTask1.getExternalId(), + createdTask2.getExternalId(), + createdTask3.getExternalId()); // It's only allowed to set the CallbackState to REQUIRED if the TaskState doesn't equal // COMPLETE 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 b9dc36fc2..b0903d7b6 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java @@ -279,7 +279,7 @@ class CompleteTaskAccTest extends AbstractAccTest { void should_CompleteAllTasks_When_BulkCompletingTasks() throws Exception { String id1 = "TKI:000000000000000000000000000000000102"; String id2 = "TKI:000000000000000000000000000000000101"; - List taskIdList = Arrays.asList(id1, id2); + List taskIdList = List.of(id1, id2); Instant beforeBulkComplete = Instant.now().truncatedTo(ChronoUnit.MILLIS); BulkOperationResults results = TASK_SERVICE.completeTasks(taskIdList); @@ -306,7 +306,7 @@ class CompleteTaskAccTest extends AbstractAccTest { void should_CompleteValidTasksEvenIfErrorsExist_When_BulkCompletingTasks() throws Exception { String invalid = "invalid-id"; String validId = "TKI:000000000000000000000000000000000103"; - List taskIdList = Arrays.asList(invalid, validId); + List taskIdList = List.of(invalid, validId); Instant beforeBulkComplete = Instant.now().truncatedTo(ChronoUnit.MILLIS); BulkOperationResults results = TASK_SERVICE.completeTasks(taskIdList); @@ -327,6 +327,7 @@ class CompleteTaskAccTest extends AbstractAccTest { String invalid2 = null; String invalid3 = "invalid-id"; String notAuthorized = "TKI:000000000000000000000000000000000002"; + // we can't use List.of because of the null value we insert List taskIdList = Arrays.asList(invalid1, invalid2, invalid3, notAuthorized); BulkOperationResults results = TASK_SERVICE.completeTasks(taskIdList); @@ -357,7 +358,7 @@ class CompleteTaskAccTest extends AbstractAccTest { void should_AddErrorForTasksInEndState_When_BulkCompletingTasks() throws Exception { String id1 = "TKI:300000000000000000000000000000000000"; // task is canceled String id2 = "TKI:300000000000000000000000000000000010"; // task is terminated - List taskIdList = Arrays.asList(id1, id2); + List taskIdList = List.of(id1, id2); BulkOperationResults results = TASK_SERVICE.completeTasks(taskIdList); @@ -402,7 +403,7 @@ class CompleteTaskAccTest extends AbstractAccTest { void should_CompleteAllTasks_When_BulkForceCompletingTasks() throws Exception { String id1 = "TKI:000000000000000000000000000000000026"; String id2 = "TKI:000000000000000000000000000000000027"; - List taskIdList = Arrays.asList(id1, id2); + List taskIdList = List.of(id1, id2); Instant beforeBulkComplete = Instant.now().truncatedTo(ChronoUnit.MILLIS); BulkOperationResults results = @@ -430,7 +431,7 @@ class CompleteTaskAccTest extends AbstractAccTest { void should_CompleteValidTasksEvenIfErrorsExist_When_BulkForceCompletingTasks() throws Exception { String invalid = "invalid-id"; String validId = "TKI:000000000000000000000000000000000028"; - List taskIdList = Arrays.asList(invalid, validId); + List taskIdList = List.of(invalid, validId); Instant beforeBulkComplete = Instant.now().truncatedTo(ChronoUnit.MILLIS); BulkOperationResults results = @@ -452,6 +453,7 @@ class CompleteTaskAccTest extends AbstractAccTest { String invalid2 = null; String invalid3 = "invalid-id"; String notAuthorized = "TKI:000000000000000000000000000000000002"; + // we can't use List.of because of the null value we insert List taskIdList = Arrays.asList(invalid1, invalid2, invalid3, notAuthorized); BulkOperationResults results = @@ -468,7 +470,7 @@ class CompleteTaskAccTest extends AbstractAccTest { void should_AddErrorForTasksInEndState_When_BulkForceCompletingTasks() throws Exception { String id1 = "TKI:300000000000000000000000000000000000"; // task is canceled String id2 = "TKI:300000000000000000000000000000000010"; // task is terminated - List taskIdList = Arrays.asList(id1, id2); + List taskIdList = List.of(id1, id2); BulkOperationResults results = TASK_SERVICE.forceCompleteTasks(taskIdList); @@ -550,7 +552,7 @@ class CompleteTaskAccTest extends AbstractAccTest { void should_OnlyClaimTasksWhichAreNotClaimed_When_BulkForceCompletingTasks() throws Exception { String id1 = "TKI:000000000000000000000000000000000043"; // task is already claimed String id2 = "TKI:000000000000000000000000000000000044"; // task is ready - List taskIdList = Arrays.asList(id1, id2); + List taskIdList = List.of(id1, id2); Task task = TASK_SERVICE.getTask(id2); assertThat(task.getState()).isSameAs(TaskState.READY); 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 34d4f729e..c68a116b7 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskAccTest.java @@ -5,7 +5,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import acceptance.AbstractAccTest; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.junit.jupiter.api.Test; @@ -60,7 +59,7 @@ class DeleteTaskAccTest extends AbstractAccTest { assertThat( attachmentMapper.findAttachmentSummariesByTaskIds( - Arrays.asList( + List.of( "TKI:000000000000000000000000000000000067", "TKI:000000000000000000000000000000000068"))) .hasSize(4); @@ -69,14 +68,14 @@ class DeleteTaskAccTest extends AbstractAccTest { } taskService.deleteTasks( - Arrays.asList( + List.of( "TKI:000000000000000000000000000000000067", "TKI:000000000000000000000000000000000068")); try { assertThat( attachmentMapper.findAttachmentSummariesByTaskIds( - Arrays.asList( + List.of( "TKI:000000000000000000000000000000000067", "TKI:000000000000000000000000000000000068"))) .isEmpty(); @@ -129,7 +128,7 @@ class DeleteTaskAccTest extends AbstractAccTest { TaskService taskService = taskanaEngine.getTaskService(); List taskIds = - Arrays.asList( + List.of( "TKI:000000000000000000000000000000000008", "TKI:000000000000000000000000000000000009", "TKI:000000000000000000000000000000000008", 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 3c1d273cd..682ccc62e 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java @@ -261,7 +261,7 @@ class QueryTasksAccTest extends AbstractAccTest { @TestFactory Stream testQueryForCustomX() { List> list = - Arrays.asList( + List.of( new Triplet<>( TaskCustomField.CUSTOM_1, new String[] {"custom%", "p%", "%xyz%", "efg"}, 3), new Triplet<>(TaskCustomField.CUSTOM_2, new String[] {"custom%", "a%"}, 2), 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 8ca573a97..e3a99bffb 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java @@ -4,9 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import acceptance.AbstractAccTest; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -31,8 +29,7 @@ class QueryTasksByWorkbasketAccTest extends AbstractAccTest { void testQueryForWorkbasketKeyDomain() { TaskService taskService = taskanaEngine.getTaskService(); List workbasketIdentifiers = - Arrays.asList( - new KeyDomain("GPK_KSC_2", "DOMAIN_A"), new KeyDomain("USER-1-2", "DOMAIN_A")); + List.of(new KeyDomain("GPK_KSC_2", "DOMAIN_A"), new KeyDomain("USER-1-2", "DOMAIN_A")); List results = taskService @@ -42,10 +39,7 @@ class QueryTasksByWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(30); String[] ids = - results.stream() - .map(t -> t.getWorkbasketSummary().getId()) - .collect(Collectors.toList()) - .toArray(new String[0]); + results.stream().map(t -> t.getWorkbasketSummary().getId()).toArray(String[]::new); List result2 = taskService.createTaskQuery().workbasketIdIn(ids).list(); assertThat(result2).hasSize(30); diff --git a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java index e2772d7d1..a6bbfab26 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/ServiceLevelPriorityAccTest.java @@ -9,7 +9,6 @@ import java.time.Duration; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.assertj.core.data.TemporalUnitWithinOffset; @@ -203,7 +202,7 @@ class ServiceLevelPriorityAccTest extends AbstractAccTest { String tkId3 = "TKI:000000000000000000000000000000000058"; String tkId4 = "TKI:000000000000000000000000000000000060"; - List taskIds = Arrays.asList(tkId1, tkId2, tkId3, tkId4); + List taskIds = List.of(tkId1, tkId2, tkId3, tkId4); Instant planned = getInstant("2020-02-11T07:00:00"); BulkOperationResults results = @@ -230,7 +229,7 @@ class ServiceLevelPriorityAccTest extends AbstractAccTest { String tkId3 = "TKI:000000000000000000000000000000000059"; String tkId4 = "TKI:000000000000000000000000000000000058"; String tkId5 = "TKI:000000000000000000000000000000000060"; - List taskIds = Arrays.asList(tkId1, tkId2, tkId3, tkId4, tkId5); + List taskIds = List.of(tkId1, tkId2, tkId3, tkId4, tkId5); Instant planned = getInstant("2020-04-20T07:00:00"); BulkOperationResults results = taskService.setPlannedPropertyOfTasks(planned, taskIds); @@ -292,7 +291,7 @@ class ServiceLevelPriorityAccTest extends AbstractAccTest { // now check that bulk update gives the same due dates - List taskIds = Arrays.asList(tkId0, tkId1, tkId2); + List taskIds = List.of(tkId0, tkId1, tkId2); BulkOperationResults results = taskService.setPlannedPropertyOfTasks(planned, taskIds); @@ -330,7 +329,7 @@ class ServiceLevelPriorityAccTest extends AbstractAccTest { String tkId2 = "TKI:000000000000000000000000000000000009"; String tkId3 = "TKI:000000000000000000000000000000000008"; String tkId4 = "TKI:000000000000000000000000000000000010"; - List taskIds = Arrays.asList(tkId1, tkId2, tkId3, tkId4); + List taskIds = List.of(tkId1, tkId2, tkId3, tkId4); Instant planned = getInstant("2020-02-25T07:00:00"); BulkOperationResults results = @@ -349,7 +348,7 @@ class ServiceLevelPriorityAccTest extends AbstractAccTest { String tkId3 = "TKI:000000000000000000000000000000000008"; String tkId4 = "TKI:000000000000000000000000000000000010"; // all three have P13D - List taskIds = Arrays.asList(tkId1, tkId2, tkId3, tkId4); + List taskIds = List.of(tkId1, tkId2, tkId3, tkId4); Instant planned = getInstant("2020-05-03T07:00:00"); BulkOperationResults results = taskService.setPlannedPropertyOfTasks(planned, taskIds); diff --git a/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java index cbc472869..87e62493c 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/SetOwnerAccTest.java @@ -5,7 +5,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import acceptance.AbstractAccTest; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map.Entry; import java.util.stream.Collectors; @@ -98,7 +97,7 @@ class SetOwnerAccTest extends AbstractAccTest { void testSetOwnerOfTasksWithDuplicatesSucceeds() { List taskIds = - Arrays.asList( + List.of( "TKI:000000000000000000000000000000000058", "TKI:000000000000000000000000000000000059", "TKI:000000000000000000000000000000000058", @@ -112,7 +111,7 @@ class SetOwnerAccTest extends AbstractAccTest { @Test void testSetOwnerOfTasksWithDuplicatesAndNotExistingSucceeds() { List taskIds = - Arrays.asList( + List.of( "TKI:000000000000000000000000000000000058", "TKI:000000000000000000000000000047110059", "TKI:000000000000000000000000000000000059", @@ -131,7 +130,7 @@ class SetOwnerAccTest extends AbstractAccTest { void testSetOwnerOfTasksWithNoQualifyingTasks() { List taskIds = - Arrays.asList( + List.of( "TKI:000000000000000000000000000000000008", "TKI:000000000000000000000000000000000009", "TKI:000000000000000000000000000000000008", 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 89966b5a3..ec1df3999 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java @@ -326,19 +326,18 @@ class TransferTaskAccTest extends AbstractAccTest { // test with invalid list ThrowingCallable call = - () -> { - taskService.transferTasks("WBI:100000000000000000000000000000000006", null); - }; + () -> taskService.transferTasks("WBI:100000000000000000000000000000000006", null); assertThatThrownBy(call) .isInstanceOf(InvalidArgumentException.class) .hasMessage("TaskIds must not be null."); // test with list containing only invalid arguments call = - () -> { - taskService.transferTasks( - "WBI:100000000000000000000000000000000006", Arrays.asList("", "", "", null)); - }; + () -> + taskService.transferTasks( + "WBI:100000000000000000000000000000000006", + /* we can't use List.of because of the null value we insert */ + Arrays.asList("", "", "", null)); assertThatThrownBy(call) .isInstanceOf(InvalidArgumentException.class) .hasMessage("TaskIds must not contain only invalid arguments."); 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 57e0c811d..e1394f766 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/UpdateTaskAccTest.java @@ -15,7 +15,6 @@ import static pro.taskana.task.api.TaskCustomField.CUSTOM_7; import acceptance.AbstractAccTest; import java.time.Instant; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -262,7 +261,7 @@ class UpdateTaskAccTest extends AbstractAccTest { @Test void should_UpdateTaskCustomAttributes_When_UpdateTasksIsCalled() throws Exception { List taskIds = - Arrays.asList( + List.of( "TKI:000000000000000000000000000000000008", "TKI:000000000000000000000000000000000009", "TKI:000000000000000000000000000000000010"); 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 c424ad8c6..079c225ce 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/WorkOnTaskAccTest.java @@ -7,7 +7,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import acceptance.AbstractAccTest; import java.time.Duration; import java.time.Instant; -import java.util.Arrays; import java.util.List; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.junit.jupiter.api.Test; @@ -201,7 +200,7 @@ class WorkOnTaskAccTest extends AbstractAccTest { TaskService taskService = taskanaEngine.getTaskService(); String id1 = "TKI:000000000000000000000000000000000102"; String id2 = "TKI:000000000000000000000000000000003333"; - List taskIdList = Arrays.asList(id1, id2); + List taskIdList = List.of(id1, id2); BulkOperationResults results = taskService.deleteTasks(taskIdList); 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 5b6c9c511..1cad79ec6 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java @@ -4,8 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import acceptance.AbstractAccTest; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; @@ -36,7 +34,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { WorkbasketSummary workbasketSummary = workbasketService.createWorkbasketQuery().keyIn("GPK_KSC").single(); List expectedTargetIds = - Arrays.asList( + List.of( "WBI:100000000000000000000000000000000002", "WBI:100000000000000000000000000000000003", "WBI:100000000000000000000000000000000004", @@ -57,7 +55,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { WorkbasketSummary workbasketSummary = workbasketService.createWorkbasketQuery().keyIn("GPK_KSC").single(); List expectedTargetIds = - Arrays.asList( + List.of( "WBI:100000000000000000000000000000000002", "WBI:100000000000000000000000000000000003", "WBI:100000000000000000000000000000000004", @@ -265,16 +263,10 @@ class DistributionTargetsAccTest extends AbstractAccTest { List distributionSources = workbasketService.getDistributionSources("WBI:100000000000000000000000000000000004"); - assertThat(distributionSources).hasSize(2); - List expectedIds = - new ArrayList<>( - Arrays.asList( - "WBI:100000000000000000000000000000000001", - "WBI:100000000000000000000000000000000002")); - - for (WorkbasketSummary foundSummary : distributionSources) { - assertThat(expectedIds.contains(foundSummary.getId())).isTrue(); - } + assertThat(distributionSources) + .extracting(WorkbasketSummary::getId) + .containsExactlyInAnyOrder( + "WBI:100000000000000000000000000000000001", "WBI:100000000000000000000000000000000002"); } @WithAccessId(user = "teamlead-1") @@ -285,16 +277,10 @@ class DistributionTargetsAccTest extends AbstractAccTest { List distributionSources = workbasketService.getDistributionSources("TEAMLEAD-1", "DOMAIN_A"); - assertThat(distributionSources).hasSize(2); - List expectedIds = - new ArrayList<>( - Arrays.asList( - "WBI:100000000000000000000000000000000001", - "WBI:100000000000000000000000000000000002")); - - for (WorkbasketSummary foundSummary : distributionSources) { - assertThat(expectedIds.contains(foundSummary.getId())).isTrue(); - } + assertThat(distributionSources) + .extracting(WorkbasketSummary::getId) + .containsExactlyInAnyOrder( + "WBI:100000000000000000000000000000000001", "WBI:100000000000000000000000000000000002"); } @WithAccessId(user = "unknownuser") @@ -303,9 +289,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); ThrowingCallable call = - () -> { - workbasketService.getDistributionSources("WBI:100000000000000000000000000000000004"); - }; + () -> workbasketService.getDistributionSources("WBI:100000000000000000000000000000000004"); assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); } @@ -315,9 +299,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); ThrowingCallable call = - () -> { - workbasketService.getDistributionSources("WBI:10dasgibtsdochnicht00000000000000004"); - }; + () -> workbasketService.getDistributionSources("WBI:10dasgibtsdochnicht00000000000000004"); assertThatThrownBy(call).isInstanceOf(WorkbasketNotFoundException.class); } } 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 9a34e2bb6..4af142e40 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java @@ -323,8 +323,9 @@ class QueryWorkbasketAccTest extends AbstractAccTest { .orderByDomain(ASCENDING) .list(); - List expectedIds = - Arrays.asList( + assertThat(results) + .extracting(WorkbasketSummary::getId) + .containsExactlyInAnyOrder( "WBI:100000000000000000000000000000000001", "WBI:100000000000000000000000000000000002", "WBI:100000000000000000000000000000000004", @@ -335,9 +336,6 @@ class QueryWorkbasketAccTest extends AbstractAccTest { "WBI:100000000000000000000000000000000009", "WBI:100000000000000000000000000000000010", "WBI:100000000000000000000000000000000012"); - assertThat(results) - .extracting(WorkbasketSummary::getId) - .containsExactlyInAnyOrderElementsOf(expectedIds); } @WithAccessId(user = "admin") @@ -350,9 +348,10 @@ class QueryWorkbasketAccTest extends AbstractAccTest { .orderByDomain(DESCENDING) .list(); - assertThat(results).hasSize(2); - assertThat(results.get(0).getId()).isEqualTo("WBI:100000000000000000000000000000000015"); - assertThat(results.get(1).getId()).isEqualTo("WBI:100000000000000000000000000000000001"); + assertThat(results) + .extracting(WorkbasketSummary::getId) + .containsExactly( + "WBI:100000000000000000000000000000000015", "WBI:100000000000000000000000000000000001"); } @WithAccessId(user = "teamlead-1") @@ -364,8 +363,9 @@ class QueryWorkbasketAccTest extends AbstractAccTest { .customAttributeIn(WorkbasketCustomField.CUSTOM_1, "ABCQVW") .list(); - assertThat(results).hasSize(1); - assertThat(results.get(0).getId()).isEqualTo("WBI:100000000000000000000000000000000001"); + assertThat(results) + .extracting(WorkbasketSummary::getId) + .containsExactly("WBI:100000000000000000000000000000000001"); } @WithAccessId(user = "admin") 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 6ff3e5086..242c7b7ae 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java @@ -4,8 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import acceptance.AbstractAccTest; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; import org.junit.jupiter.api.Test; @@ -108,11 +106,10 @@ class QueryWorkbasketByPermissionAccTest extends AbstractAccTest { .createWorkbasketQuery() .accessIdsHavePermission(WorkbasketPermission.DISTRIBUTE, "user-1-1", GROUP_1_DN) .list(); - assertThat(results).hasSize(2); - List keys = new ArrayList<>(Arrays.asList("GPK_KSC_1", "USER-1-1")); - for (WorkbasketSummary wb : results) { - assertThat(keys.contains(wb.getKey())).isTrue(); - } + + assertThat(results) + .extracting(WorkbasketSummary::getKey) + .containsExactlyInAnyOrder("GPK_KSC_1", "USER-1-1"); } @WithAccessId(user = "user-1-1", groups = GROUP_1_DN) diff --git a/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java b/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java index 5709225f2..865ac496f 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/ArchitectureTest.java @@ -14,7 +14,6 @@ import com.tngtech.archunit.lang.ArchCondition; import com.tngtech.archunit.lang.ArchRule; import com.tngtech.archunit.lang.ConditionEvents; import com.tngtech.archunit.lang.SimpleConditionEvent; -import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -31,7 +30,7 @@ import org.junit.jupiter.api.function.ThrowingConsumer; */ class ArchitectureTest { private static final List TASKANA_SUB_PACKAGES = - Arrays.asList( + List.of( "pro.taskana.sampledata", "pro.taskana.common.internal", "pro.taskana.common.api", diff --git a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ClassificationClassificationCategoryReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ClassificationClassificationCategoryReportBuilderImplTest.java index 664ef090f..fb2aac0a8 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ClassificationClassificationCategoryReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ClassificationClassificationCategoryReportBuilderImplTest.java @@ -9,7 +9,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -51,9 +50,9 @@ class ClassificationClassificationCategoryReportBuilderImplTest { } @Test - void testGetTotalNumbersOfCatgoryReport() throws Exception { + void testGetTotalNumbersOfCategoryReport() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -109,7 +108,7 @@ class ClassificationClassificationCategoryReportBuilderImplTest { @Test void testGetCategoryReportWithReportLineItemDefinitions() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -170,7 +169,7 @@ class ClassificationClassificationCategoryReportBuilderImplTest { @Test void testListTaskIdsOfCategoryReportForSelectedItems() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -250,7 +249,7 @@ class ClassificationClassificationCategoryReportBuilderImplTest { @Test void testListCustomAttributeValuesForCustomAttributeName() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); diff --git a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ClassificationReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ClassificationReportBuilderImplTest.java index b86bbda0f..7331824e5 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ClassificationReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ClassificationReportBuilderImplTest.java @@ -10,7 +10,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,7 +66,7 @@ class ClassificationReportBuilderImplTest { @Test void testGetTotalNumbersOfClassificationReport() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -130,7 +129,7 @@ class ClassificationReportBuilderImplTest { @Test void testGetClassificationReportWithReportLineItemDefinitions() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -198,7 +197,7 @@ class ClassificationReportBuilderImplTest { @Test void testGetTotalNumbersOfDetailedClassificationReport() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -264,7 +263,7 @@ class ClassificationReportBuilderImplTest { @Test void testGetDetailedClassificationReportWithReportLineItemDefinitions() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -338,7 +337,7 @@ class ClassificationReportBuilderImplTest { @Test void testGetTaskIdsForSelectedItems() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -417,7 +416,7 @@ class ClassificationReportBuilderImplTest { @Test void testListCustomAttributeValuesForCustomAttributeName() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); diff --git a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ReportTest.java b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ReportTest.java index 039a5fff6..2e435eaff 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ReportTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ReportTest.java @@ -3,7 +3,6 @@ package pro.taskana.monitor.internal; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; @@ -127,7 +126,7 @@ class ReportTest { @Test void should_AppendItemValue_When_UsingBulkOperationToInsertItems() { // when - report.addItems(Arrays.asList(item, item)); + report.addItems(List.of(item, item)); // then assertThat(report.getRows()).hasSize(1); @@ -172,7 +171,7 @@ class ReportTest { return item; }; // when - report.addItems(Arrays.asList(item, item), preprocessor); + report.addItems(List.of(item, item), preprocessor); // then assertThat(report.getRows()).hasSize(1); diff --git a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskCustomFieldValueReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskCustomFieldValueReportBuilderImplTest.java index 203085c88..9f9dc867f 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskCustomFieldValueReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskCustomFieldValueReportBuilderImplTest.java @@ -8,7 +8,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -51,7 +50,7 @@ class TaskCustomFieldValueReportBuilderImplTest { @Test void testGetTotalNumbersOfCustomFieldValueReport() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -109,7 +108,7 @@ class TaskCustomFieldValueReportBuilderImplTest { @Test void testGetCustomFieldValueReportWithReportLineItemDefinitions() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -172,7 +171,7 @@ class TaskCustomFieldValueReportBuilderImplTest { @Test void testListCustomAttributeValuesForCustomAttributeName() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); diff --git a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskStatusReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskStatusReportBuilderImplTest.java index 9cfb28c5e..625444c65 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskStatusReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskStatusReportBuilderImplTest.java @@ -7,7 +7,6 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import java.util.Arrays; import java.util.List; import java.util.Map; import org.junit.jupiter.api.BeforeEach; @@ -63,7 +62,7 @@ class TaskStatusReportBuilderImplTest { queryItem2.setCount(30); queryItem2.setState(TaskState.COMPLETED); queryItem2.setWorkbasketKey("KEY_1"); - List queryItems = Arrays.asList(queryItem1, queryItem2); + List queryItems = List.of(queryItem1, queryItem2); when(monitorMapperMock.getTasksCountByState(null, null, null)).thenReturn(queryItems); when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Map.of()); @@ -100,7 +99,7 @@ class TaskStatusReportBuilderImplTest { queryItem2.setCount(30); queryItem2.setState(TaskState.COMPLETED); queryItem2.setWorkbasketKey("KEY_1"); - List queryItems = Arrays.asList(queryItem1, queryItem2); + List queryItems = List.of(queryItem1, queryItem2); when(monitorMapperMock.getTasksCountByState(eq(null), eq(List.of()), eq(null))) .thenReturn(queryItems); when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Map.of()); diff --git a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkbasketReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkbasketReportBuilderImplTest.java index d46009660..64f6bc34d 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkbasketReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkbasketReportBuilderImplTest.java @@ -10,7 +10,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -55,7 +54,7 @@ class WorkbasketReportBuilderImplTest { @Test void testGetTotalNumbersOfWorkbasketReportBasedOnDueDate() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -111,14 +110,14 @@ class WorkbasketReportBuilderImplTest { assertThat(actualResult).isNotNull(); assertThat(actualResult.getRow("WBI:000000000000000000000000000000000001").getTotalValue()) - .isEqualTo(1); - assertThat(actualResult.getSumRow().getTotalValue()).isEqualTo(1); + .isOne(); + assertThat(actualResult.getSumRow().getTotalValue()).isOne(); } @Test void testGetWorkbasketReportWithReportLineItemDefinitions() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -186,7 +185,7 @@ class WorkbasketReportBuilderImplTest { @Test void testGetTaskIdsOfCategoryReportForSelectedItems() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -269,7 +268,7 @@ class WorkbasketReportBuilderImplTest { @Test void testListCustomAttributeValuesForCustomAttributeName() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); @@ -331,7 +330,7 @@ class WorkbasketReportBuilderImplTest { @Test void testGetTotalNumbersOfWorkbasketReportBasedOnCreatedDate() throws Exception { final List workbasketIds = List.of("WBI:000000000000000000000000000000000001"); - final List states = Arrays.asList(TaskState.CLAIMED, TaskState.READY); + final List states = List.of(TaskState.CLAIMED, TaskState.READY); final List categories = List.of("EXTERN"); final List domains = List.of("DOMAIN_A"); final List classificationIds = List.of("L10000"); diff --git a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkingDaysToDaysReportConverterTest.java b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkingDaysToDaysReportConverterTest.java index 1053419a0..82537e737 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkingDaysToDaysReportConverterTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/monitor/internal/WorkingDaysToDaysReportConverterTest.java @@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat; import java.time.Instant; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; @@ -22,7 +21,7 @@ class WorkingDaysToDaysReportConverterTest { CustomHoliday dayOfReformation = CustomHoliday.of(31, 10); CustomHoliday allSaintsDays = CustomHoliday.of(1, 11); converter = - new WorkingDaysToDaysConverter(true, false, Arrays.asList(dayOfReformation, allSaintsDays)); + new WorkingDaysToDaysConverter(true, false, List.of(dayOfReformation, allSaintsDays)); } @Test diff --git a/lib/taskana-core/src/test/java/pro/taskana/task/internal/models/TaskModelsCloneTest.java b/lib/taskana-core/src/test/java/pro/taskana/task/internal/models/TaskModelsCloneTest.java index 0d4239052..93252e622 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/task/internal/models/TaskModelsCloneTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/task/internal/models/TaskModelsCloneTest.java @@ -6,7 +6,6 @@ import static pro.taskana.task.internal.CreateTaskModelHelper.createDummyClassif import static pro.taskana.task.internal.CreateTaskModelHelper.createUnitTestTask; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -74,9 +73,7 @@ class TaskModelsCloneTest { createUnitTestTask( "dummyTaskId", "dummyTaskName", "dummyWorkbasketKey", createDummyClassification()); List attachments = - new ArrayList<>( - Arrays.asList( - createAttachment("abc", "dummyTaskId"), createAttachment("def", "dummyTaskId"))); + List.of(createAttachment("abc", "dummyTaskId"), createAttachment("def", "dummyTaskId")); dummyTask.setAttachments(attachments); TaskImpl dummyTaskCloned = dummyTask.copy(); @@ -90,9 +87,7 @@ class TaskModelsCloneTest { createUnitTestTask( "dummyTaskId", "dummyTaskName", "workbasketKey", createDummyClassification()); List attachments = - new ArrayList<>( - Arrays.asList( - createAttachment("abc", "dummyTaskId"), createAttachment("def", "dummyTaskId"))); + List.of(createAttachment("abc", "dummyTaskId"), createAttachment("def", "dummyTaskId")); dummyTask.setAttachments(attachments); TaskImpl dummyTaskCloned = dummyTask.copy(); diff --git a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntAutocommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntAutocommitTest.java index f24e5e931..d575452d4 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntAutocommitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntAutocommitTest.java @@ -3,7 +3,6 @@ package pro.taskana.workbasket.internal; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import java.util.Arrays; import java.util.List; import javax.sql.DataSource; import org.junit.jupiter.api.BeforeAll; @@ -81,7 +80,7 @@ class WorkbasketServiceImplIntAutocommitTest { createTestWorkbasket(id2, "key2", "DOMAIN_A", "Hyperbasket", WorkbasketType.GROUP); workbasket2 = workBasketService.createWorkbasket(workbasket2); createWorkbasketWithSecurity(workbasket2, "user-1-1", true, true, false, false); - List distTargets = Arrays.asList(workbasket0.getId(), workbasket1.getId()); + List distTargets = List.of(workbasket0.getId(), workbasket1.getId()); Thread.sleep(SLEEP_TIME); workBasketService.setDistributionTargets(workbasket2.getId(), distTargets); diff --git a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntExplicitTest.java b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntExplicitTest.java index c4d6d9ac2..3f72d8bf2 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntExplicitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/workbasket/internal/WorkbasketServiceImplIntExplicitTest.java @@ -3,7 +3,6 @@ package pro.taskana.workbasket.internal; import static org.assertj.core.api.Assertions.assertThat; import java.sql.Connection; -import java.util.Arrays; import java.util.List; import javax.sql.DataSource; import org.junit.jupiter.api.AfterEach; @@ -84,7 +83,7 @@ class WorkbasketServiceImplIntExplicitTest { workbasket2 = workBasketService.createWorkbasket(workbasket2); createWorkbasketWithSecurity(workbasket2, "user-1-1", true, true, false, false); - List distTargets = Arrays.asList(workbasket0.getId(), workbasket1.getId()); + List distTargets = List.of(workbasket0.getId(), workbasket1.getId()); Thread.sleep(SLEEP_TIME); workBasketService.setDistributionTargets(workbasket2.getId(), distTargets); diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java index b796cfee3..4bbc709e0 100644 --- a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java +++ b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/jobs/AsyncUpdateJobIntTest.java @@ -4,8 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static pro.taskana.common.test.rest.RestHelper.TEMPLATE; import java.time.Instant; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -102,45 +100,44 @@ class AsyncUpdateJobIntTest { assertThat(before).isBefore(modifiedClassification.getModified()); List affectedTasks = - new ArrayList<>( - Arrays.asList( - "TKI:000000000000000000000000000000000003", - "TKI:000000000000000000000000000000000004", - "TKI:000000000000000000000000000000000005", - "TKI:000000000000000000000000000000000006", - "TKI:000000000000000000000000000000000007", - "TKI:000000000000000000000000000000000008", - "TKI:000000000000000000000000000000000009", - "TKI:000000000000000000000000000000000010", - "TKI:000000000000000000000000000000000011", - "TKI:000000000000000000000000000000000012", - "TKI:000000000000000000000000000000000013", - "TKI:000000000000000000000000000000000014", - "TKI:000000000000000000000000000000000015", - "TKI:000000000000000000000000000000000016", - "TKI:000000000000000000000000000000000017", - "TKI:000000000000000000000000000000000018", - "TKI:000000000000000000000000000000000019", - "TKI:000000000000000000000000000000000020", - "TKI:000000000000000000000000000000000021", - "TKI:000000000000000000000000000000000022", - "TKI:000000000000000000000000000000000023", - "TKI:000000000000000000000000000000000024", - "TKI:000000000000000000000000000000000025", - "TKI:000000000000000000000000000000000026", - "TKI:000000000000000000000000000000000027", - "TKI:000000000000000000000000000000000028", - "TKI:000000000000000000000000000000000029", - "TKI:000000000000000000000000000000000030", - "TKI:000000000000000000000000000000000031", - "TKI:000000000000000000000000000000000032", - "TKI:000000000000000000000000000000000033", - "TKI:000000000000000000000000000000000034", - "TKI:000000000000000000000000000000000035", - "TKI:000000000000000000000000000000000100", - "TKI:000000000000000000000000000000000101", - "TKI:000000000000000000000000000000000102", - "TKI:000000000000000000000000000000000103")); + List.of( + "TKI:000000000000000000000000000000000003", + "TKI:000000000000000000000000000000000004", + "TKI:000000000000000000000000000000000005", + "TKI:000000000000000000000000000000000006", + "TKI:000000000000000000000000000000000007", + "TKI:000000000000000000000000000000000008", + "TKI:000000000000000000000000000000000009", + "TKI:000000000000000000000000000000000010", + "TKI:000000000000000000000000000000000011", + "TKI:000000000000000000000000000000000012", + "TKI:000000000000000000000000000000000013", + "TKI:000000000000000000000000000000000014", + "TKI:000000000000000000000000000000000015", + "TKI:000000000000000000000000000000000016", + "TKI:000000000000000000000000000000000017", + "TKI:000000000000000000000000000000000018", + "TKI:000000000000000000000000000000000019", + "TKI:000000000000000000000000000000000020", + "TKI:000000000000000000000000000000000021", + "TKI:000000000000000000000000000000000022", + "TKI:000000000000000000000000000000000023", + "TKI:000000000000000000000000000000000024", + "TKI:000000000000000000000000000000000025", + "TKI:000000000000000000000000000000000026", + "TKI:000000000000000000000000000000000027", + "TKI:000000000000000000000000000000000028", + "TKI:000000000000000000000000000000000029", + "TKI:000000000000000000000000000000000030", + "TKI:000000000000000000000000000000000031", + "TKI:000000000000000000000000000000000032", + "TKI:000000000000000000000000000000000033", + "TKI:000000000000000000000000000000000034", + "TKI:000000000000000000000000000000000035", + "TKI:000000000000000000000000000000000100", + "TKI:000000000000000000000000000000000101", + "TKI:000000000000000000000000000000000102", + "TKI:000000000000000000000000000000000103"); for (String taskId : affectedTasks) { verifyTaskIsModifiedAfterOrEquals(taskId, before); } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java index 223fa2201..ce0066cc2 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java @@ -10,7 +10,6 @@ import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; import java.time.Instant; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; @@ -201,7 +200,7 @@ class ClassificationDefinitionControllerIntTest { TaskanaPagedModel clList = new TaskanaPagedModel<>( - TaskanaPagedModelKeys.CLASSIFICATIONS, Arrays.asList(classification1, classification2)); + TaskanaPagedModelKeys.CLASSIFICATIONS, List.of(classification1, classification2)); ResponseEntity response = importRequest(clList); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); @@ -216,7 +215,7 @@ class ClassificationDefinitionControllerIntTest { TaskanaPagedModel clList = new TaskanaPagedModel<>( - TaskanaPagedModelKeys.CLASSIFICATIONS, Arrays.asList(classification1, classification1)); + TaskanaPagedModelKeys.CLASSIFICATIONS, List.of(classification1, classification1)); assertThatThrownBy(() -> importRequest(clList)) .isInstanceOf(HttpClientErrorException.class) @@ -263,7 +262,7 @@ class ClassificationDefinitionControllerIntTest { TaskanaPagedModel clList = new TaskanaPagedModel<>( TaskanaPagedModelKeys.CLASSIFICATIONS, - Arrays.asList(existingClassification, newClassification)); + List.of(existingClassification, newClassification)); ResponseEntity response = importRequest(clList); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); @@ -299,7 +298,7 @@ class ClassificationDefinitionControllerIntTest { TaskanaPagedModel clList = new TaskanaPagedModel<>( TaskanaPagedModelKeys.CLASSIFICATIONS, - Arrays.asList( + List.of( classification1, classification2, classification3, @@ -335,7 +334,7 @@ class ClassificationDefinitionControllerIntTest { TaskanaPagedModel clList = new TaskanaPagedModel<>( - TaskanaPagedModelKeys.CLASSIFICATIONS, Arrays.asList(parent, wrongParent, child)); + TaskanaPagedModelKeys.CLASSIFICATIONS, List.of(parent, wrongParent, child)); ResponseEntity response = importRequest(clList); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); @@ -369,8 +368,7 @@ class ClassificationDefinitionControllerIntTest { child2.setParentKey(""); TaskanaPagedModel clList = - new TaskanaPagedModel<>( - TaskanaPagedModelKeys.CLASSIFICATIONS, Arrays.asList(child1, child2)); + new TaskanaPagedModel<>(TaskanaPagedModelKeys.CLASSIFICATIONS, List.of(child1, child2)); ResponseEntity response = importRequest(clList); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); @@ -394,7 +392,7 @@ class ClassificationDefinitionControllerIntTest { TaskanaPagedModel clList = new TaskanaPagedModel<>( - TaskanaPagedModelKeys.CLASSIFICATIONS, Arrays.asList(classification, classification)); + TaskanaPagedModelKeys.CLASSIFICATIONS, List.of(classification, classification)); assertThatThrownBy(() -> importRequest(clList)) .isInstanceOf(HttpClientErrorException.class) diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/QueryHelperTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/QueryHelperTest.java index 567e29698..08eabcfac 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/QueryHelperTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/QueryHelperTest.java @@ -13,7 +13,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static pro.taskana.common.rest.QueryHelper.applyAndRemoveSortingParams; import java.util.AbstractMap.SimpleEntry; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.stream.Stream; @@ -89,7 +88,7 @@ class QueryHelperTest { @TestFactory Stream should_CallConsumerWithDescSortDirection_When_MapDoesContainsDescSortDirection() { - Iterator testCases = Arrays.asList("desc", "DESC", "Desc", "desC", "DeSc").iterator(); + Iterator testCases = List.of("desc", "DESC", "Desc", "desC", "DeSc").iterator(); ThrowingConsumer test = desc -> { MultiValueMap map = new LinkedMultiValueMap<>(); @@ -108,7 +107,7 @@ class QueryHelperTest { @Test void should_CallConsumerMultipleTimes_When_MapContainsMultipleSortBy() throws Exception { MultiValueMap map = new LinkedMultiValueMap<>(); - map.put(QueryHelper.SORT_BY, Arrays.asList("sort-by-value1", "sort-by-value2")); + map.put(QueryHelper.SORT_BY, List.of("sort-by-value1", "sort-by-value2")); MockBiConsumer consumer = mock(MockBiConsumer.class); applyAndRemoveSortingParams(map, consumer); @@ -122,8 +121,8 @@ class QueryHelperTest { void should_MatchSortDirectionForEachSortBy_When_MapContainsMultipleSortByAndOrderBy() throws Exception { MultiValueMap map = new LinkedMultiValueMap<>(); - map.put(QueryHelper.SORT_BY, Arrays.asList("sort-by-value1", "sort-by-value2")); - map.put(QueryHelper.ORDER_DIRECTION, Arrays.asList("desc", "asc")); + map.put(QueryHelper.SORT_BY, List.of("sort-by-value1", "sort-by-value2")); + map.put(QueryHelper.ORDER_DIRECTION, List.of("desc", "asc")); MockBiConsumer consumer = mock(MockBiConsumer.class); applyAndRemoveSortingParams(map, consumer); @@ -143,7 +142,7 @@ class QueryHelperTest { @Test void should_ThrowError_When_SortByAndOrderByCountDoesNotMatch() { MultiValueMap map = new LinkedMultiValueMap<>(); - map.put(QueryHelper.SORT_BY, Arrays.asList("1", "2")); + map.put(QueryHelper.SORT_BY, List.of("1", "2")); map.put(QueryHelper.ORDER_DIRECTION, List.of("desc")); assertThatThrownBy(() -> applyAndRemoveSortingParams(map, mock(MockBiConsumer.class))) .isInstanceOf(InvalidArgumentException.class); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java index 69928896a..25255be42 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java @@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static pro.taskana.common.test.rest.RestHelper.TEMPLATE; -import java.util.Arrays; import java.util.List; import java.util.stream.Stream; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; @@ -141,7 +140,7 @@ class WorkbasketAccessItemControllerIntTest { @TestFactory Stream should_ReturnBadRequest_When_AccessIdIsInvalid() { List accessIds = - Arrays.asList( + List.of( "cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana", "cn=monitor-users,cn=groups,ou=test,o=taskana", "user-1"); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java index c09b1bb9a..4b2e6ada6 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java @@ -10,7 +10,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -271,8 +270,7 @@ class WorkbasketDefinitionControllerIntTest { HttpStatus expectedStatus, WorkbasketDefinitionRepresentationModel... workbaskets) throws Exception { TaskanaPagedModel pagedModel = - new TaskanaPagedModel<>( - TaskanaPagedModelKeys.WORKBASKET_DEFINITIONS, Arrays.asList(workbaskets)); + new TaskanaPagedModel<>(TaskanaPagedModelKeys.WORKBASKET_DEFINITIONS, List.of(workbaskets)); expectStatusWhenExecutingImportRequestOfWorkbaskets(expectedStatus, pagedModel); } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketDefinitionRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketDefinitionRepresentationModelAssemblerTest.java index f0ae68fee..680df462f 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketDefinitionRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketDefinitionRepresentationModelAssemblerTest.java @@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; -import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -43,7 +42,7 @@ class WorkbasketDefinitionRepresentationModelAssemblerTest { String id = "ID1"; workbasket.setId(id); List workbasketAccessItems = - Arrays.asList( + List.of( workbasketService.newWorkbasketAccessItem(id, "a"), workbasketService.newWorkbasketAccessItem(id, "b")); @@ -51,7 +50,7 @@ class WorkbasketDefinitionRepresentationModelAssemblerTest { WorkbasketImpl target2 = (WorkbasketImpl) workbasketService.newWorkbasket("3", "DOMAIN_A"); target1.setId("target1"); target2.setId("target2"); - List workbasketSummaries = Arrays.asList(target1, target2); + List workbasketSummaries = List.of(target1, target2); Mockito.doReturn(workbasketAccessItems).when(workbasketService).getWorkbasketAccessItems(id); Mockito.doReturn(workbasketSummaries).when(workbasketService).getDistributionTargets(id);