diff --git a/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java b/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java index 58f095c92..2f90494e2 100644 --- a/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java +++ b/common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java @@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.DynamicContainer.dynamicContainer; import static org.junit.jupiter.api.DynamicTest.dynamicTest; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.function.Supplier; @@ -177,14 +176,14 @@ class JaasExtensionTest { @TestFactory List should_NotSetJaasSubject_When_AnnotationIsMissing_On_TestFactory() { assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull(); - return Collections.emptyList(); + return List.of(); } @WithAccessId(user = "testfactory") @TestFactory List should_SetJaasSubject_When_AnnotationExists_On_TestFactory() { assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("testfactory"); - return Collections.emptyList(); + return List.of(); } @WithAccessId(user = "testfactory1") @@ -193,7 +192,7 @@ class JaasExtensionTest { List should_SetJaasSubjectFromFirstAnnotation_When_MultipleAnnotationsExists_On_TestFactory() { assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("testfactory1"); - return Collections.emptyList(); + return List.of(); } // endregion 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 53fe98961..bcc8f4fef 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationCategoryReportAccTest.java @@ -6,7 +6,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -47,7 +46,7 @@ class GetTaskIdsOfClassificationCategoryReportAccTest extends AbstractReportAccT () -> MONITOR_SERVICE .createClassificationCategoryReportBuilder() - .listTaskIdsForSelectedItems(Collections.emptyList(), TaskTimestamp.DUE); + .listTaskIdsForSelectedItems(List.of(), TaskTimestamp.DUE); assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); } 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 f2ed4a29f..4d780b35a 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java @@ -6,7 +6,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -49,7 +48,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes () -> MONITOR_SERVICE .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) - .listTaskIdsForSelectedItems(Collections.emptyList(), TaskTimestamp.DUE); + .listTaskIdsForSelectedItems(List.of(), TaskTimestamp.DUE); assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); } 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 b4ebd0219..9bd841f4d 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java @@ -6,7 +6,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.stream.Stream; @@ -44,7 +43,7 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { () -> MONITOR_SERVICE .createWorkbasketReportBuilder() - .listTaskIdsForSelectedItems(Collections.emptyList(), TaskTimestamp.DUE); + .listTaskIdsForSelectedItems(List.of(), TaskTimestamp.DUE); assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); } diff --git a/lib/taskana-core/src/test/java/acceptance/task/SelectAndClaimTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/SelectAndClaimTaskAccTest.java index 627a1a7d4..37c7100db 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/SelectAndClaimTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/SelectAndClaimTaskAccTest.java @@ -46,8 +46,8 @@ class SelectAndClaimTaskAccTest extends AbstractAccTest { threads[i] = new Thread(test); threads[i].start(); } - for (int i = 0; i < threads.length; i++) { - threads[i].join(); + for (Thread thread : threads) { + thread.join(); } assertThat(selectedAndClaimedTasks) @@ -67,12 +67,8 @@ class SelectAndClaimTaskAccTest extends AbstractAccTest { @WithAccessId(user = "admin") void should_ThrowException_When_TryingToSelectAndClaimNonExistingTask() { - TaskQuery query = taskanaEngine.getTaskService().createTaskQuery(); - query.idIn("notexisting"); - ThrowingCallable call = - () -> { - taskanaEngine.getTaskService().selectAndClaim(query); - }; + TaskQuery query = taskanaEngine.getTaskService().createTaskQuery().idIn("notexisting"); + ThrowingCallable call = () -> taskanaEngine.getTaskService().selectAndClaim(query); assertThatThrownBy(call) .isInstanceOf(SystemException.class) .hasMessageContaining( @@ -81,27 +77,23 @@ class SelectAndClaimTaskAccTest extends AbstractAccTest { } private Runnable getRunnableTest(List selectedAndClaimedTasks, List accessIds) { + return () -> { + Subject subject = new Subject(); + subject.getPrincipals().add(new UserPrincipal(accessIds.remove(0))); - Runnable test = - () -> { - Subject subject = new Subject(); - subject.getPrincipals().add(new UserPrincipal(accessIds.remove(0))); - - Consumer consumer = - CheckedConsumer.wrap( - taskService -> { - Task task = taskService.selectAndClaim(getTaskQuery()); - selectedAndClaimedTasks.add(task); - }); - PrivilegedAction action = - () -> { - consumer.accept(taskanaEngine.getTaskService()); - return null; - }; - Subject.doAs(subject, action); - }; - - return test; + Consumer consumer = + CheckedConsumer.wrap( + taskService -> { + Task task = taskService.selectAndClaim(getTaskQuery()); + selectedAndClaimedTasks.add(task); + }); + PrivilegedAction action = + () -> { + consumer.accept(taskanaEngine.getTaskService()); + return null; + }; + Subject.doAs(subject, action); + }; } private TaskQuery getTaskQuery() { 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 730e41e0e..b86bbda0f 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 @@ -11,7 +11,6 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -96,7 +95,7 @@ class ClassificationReportBuilderImplTest { when(classificationService.createClassificationQuery()).thenReturn(queryMock); when(queryMock.keyIn(any())).thenReturn(queryMock); when(queryMock.domainIn(any())).thenReturn(queryMock); - when(queryMock.list()).thenReturn(Collections.emptyList()); + when(queryMock.list()).thenReturn(List.of()); final ClassificationReport actualResult = cut.createClassificationReportBuilder() @@ -162,7 +161,7 @@ class ClassificationReportBuilderImplTest { when(classificationService.createClassificationQuery()).thenReturn(queryMock); when(queryMock.keyIn(any())).thenReturn(queryMock); when(queryMock.domainIn(any())).thenReturn(queryMock); - when(queryMock.list()).thenReturn(Collections.emptyList()); + when(queryMock.list()).thenReturn(List.of()); final ClassificationReport actualResult = cut.createClassificationReportBuilder() @@ -227,7 +226,7 @@ class ClassificationReportBuilderImplTest { when(classificationService.createClassificationQuery()).thenReturn(queryMock); when(queryMock.keyIn(any())).thenReturn(queryMock); when(queryMock.domainIn(any())).thenReturn(queryMock); - when(queryMock.list()).thenReturn(Collections.emptyList()); + when(queryMock.list()).thenReturn(List.of()); final DetailedClassificationReport actualResult = cut.createClassificationReportBuilder() @@ -296,7 +295,7 @@ class ClassificationReportBuilderImplTest { when(classificationService.createClassificationQuery()).thenReturn(queryMock); when(queryMock.keyIn(any())).thenReturn(queryMock); when(queryMock.domainIn(any())).thenReturn(queryMock); - when(queryMock.list()).thenReturn(Collections.emptyList()); + when(queryMock.list()).thenReturn(List.of()); final DetailedClassificationReport actualResult = cut.createClassificationReportBuilder() 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 16b617163..039a5fff6 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 @@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; @@ -185,7 +184,7 @@ class ReportTest { @Test void should_OnlyContainTotalRows_When_ReportContainsNoHeaders() { // given - List headerList = Collections.emptyList(); + List headerList = List.of(); report = new MonitorQueryItemTimeIntervalColumnHeaderReport(headerList, new String[] {"rowDesc"}); 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 ec518757b..9cfb28c5e 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 @@ -8,8 +8,8 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.util.Arrays; -import java.util.Collections; import java.util.List; +import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -65,7 +65,7 @@ class TaskStatusReportBuilderImplTest { queryItem2.setWorkbasketKey("KEY_1"); List queryItems = Arrays.asList(queryItem1, queryItem2); when(monitorMapperMock.getTasksCountByState(null, null, null)).thenReturn(queryItems); - when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Collections.emptyMap()); + when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Map.of()); // when final TaskStatusReport report = cut.createTaskStatusReportBuilder().buildReport(); @@ -101,22 +101,20 @@ class TaskStatusReportBuilderImplTest { queryItem2.setState(TaskState.COMPLETED); queryItem2.setWorkbasketKey("KEY_1"); List queryItems = Arrays.asList(queryItem1, queryItem2); - when(monitorMapperMock.getTasksCountByState(eq(null), eq(Collections.emptyList()), eq(null))) + when(monitorMapperMock.getTasksCountByState(eq(null), eq(List.of()), eq(null))) .thenReturn(queryItems); - when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Collections.emptyMap()); + when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Map.of()); // when final TaskStatusReport report = - cut.createTaskStatusReportBuilder().stateIn(Collections.emptyList()).buildReport(); + cut.createTaskStatusReportBuilder().stateIn(List.of()).buildReport(); // then InOrder inOrder = inOrder(mocks); inOrder.verify(internalTaskanaEngineMock).getEngine(); inOrder.verify(taskanaEngineMock).checkRoleMembership(TaskanaRole.MONITOR, TaskanaRole.ADMIN); inOrder.verify(internalTaskanaEngineMock).openConnection(); - inOrder - .verify(monitorMapperMock) - .getTasksCountByState(eq(null), eq(Collections.emptyList()), eq(null)); + inOrder.verify(monitorMapperMock).getTasksCountByState(eq(null), eq(List.of()), eq(null)); inOrder.verify(internalTaskanaEngineMock).runAsAdmin(any()); inOrder.verify(internalTaskanaEngineMock).returnConnection(); inOrder.verifyNoMoreInteractions(); 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 11df3e731..d46009660 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 @@ -11,7 +11,6 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -85,7 +84,7 @@ class WorkbasketReportBuilderImplTest { customAttributeFilter, combinedClassificationFilter)) .thenReturn(expectedResult); - when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Collections.emptyMap()); + when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Map.of()); final WorkbasketReport actualResult = cut.createWorkbasketReportBuilder() @@ -151,7 +150,7 @@ class WorkbasketReportBuilderImplTest { customAttributeFilter, combinedClassificationFilter)) .thenReturn(expectedResult); - when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Collections.emptyMap()); + when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Map.of()); final WorkbasketReport actualResult = cut.createWorkbasketReportBuilder() @@ -362,7 +361,7 @@ class WorkbasketReportBuilderImplTest { combinedClassificationFilter)) .thenReturn(expectedResult); - when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Collections.emptyMap()); + when(internalTaskanaEngineMock.runAsAdmin(any())).thenReturn(Map.of()); final WorkbasketReport actualResult = cut.createWorkbasketReportBuilder() diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssemberTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssemberTest.java index f8754db3e..60a742ab2 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssemberTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssemberTest.java @@ -3,7 +3,6 @@ package pro.taskana.task.rest.assembler; import static org.assertj.core.api.Assertions.assertThat; import java.time.Instant; -import java.util.Collections; import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test;