nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1282: replaced Collections.emptyCollection with List/Map/Set.of

This commit is contained in:
Mustapha Zorgati 2020-10-30 11:25:24 +01:00
parent ab152f87b1
commit 4f7b1fc867
10 changed files with 40 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/taskana-common-test/src/test/java/pro/taskana/common/test/security/JaasExtensionTest.java
View File

@ -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<DynamicTest> should_NotSetJaasSubject_When_AnnotationIsMissing_On_TestFactory() {
assertThat(CURRENT_USER_CONTEXT.getUserid()).isNull();
return Collections.emptyList();
return List.of();
}
@WithAccessId(user = "testfactory")
@TestFactory
List<DynamicTest> 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<DynamicTest>
should_SetJaasSubjectFromFirstAnnotation_When_MultipleAnnotationsExists_On_TestFactory() {
assertThat(CURRENT_USER_CONTEXT.getUserid()).isEqualTo("testfactory1");
return Collections.emptyList();
return List.of();
}
// endregion

3
lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfClassificationCategoryReportAccTest.java
View File

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

3
lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java
View File

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

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

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

48
lib/taskana-core/src/test/java/acceptance/task/SelectAndClaimTaskAccTest.java
View File

@ -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<Task> selectedAndClaimedTasks, List<String> 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<TaskService> consumer =
CheckedConsumer.wrap(
taskService -> {
Task task = taskService.selectAndClaim(getTaskQuery());
selectedAndClaimedTasks.add(task);
});
PrivilegedAction<Void> action =
() -> {
consumer.accept(taskanaEngine.getTaskService());
return null;
};
Subject.doAs(subject, action);
};
return test;
Consumer<TaskService> consumer =
CheckedConsumer.wrap(
taskService -> {
Task task = taskService.selectAndClaim(getTaskQuery());
selectedAndClaimedTasks.add(task);
});
PrivilegedAction<Void> action =
() -> {
consumer.accept(taskanaEngine.getTaskService());
return null;
};
Subject.doAs(subject, action);
};
}
private TaskQuery getTaskQuery() {

9
lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ClassificationReportBuilderImplTest.java
View File

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

3
lib/taskana-core/src/test/java/pro/taskana/monitor/internal/ReportTest.java
View File

@ -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<TimeIntervalColumnHeader> headerList = Collections.emptyList();
List<TimeIntervalColumnHeader> headerList = List.of();
report =
new MonitorQueryItemTimeIntervalColumnHeaderReport(headerList, new String[] {"rowDesc"});

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

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

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

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

1
rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssemberTest.java
View File

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