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

TSK-1954: Clean up codesmells

This commit is contained in:
ryzheboka 2022-09-07 14:15:58 +02:00 committed by Elena Mokeeva
parent c145e66e30
commit 084dc2b99b
3 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,15 +149,17 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes
.stateIn(List.of(TaskState.READY))
.listTaskIdsForSelectedItems(selectedItems, TaskTimestamp.DUE);
assertThat(ids).hasSize(8);
assertThat(ids.contains("TKI:000000000000000000000000000000000002")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000006")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000009")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000020")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000024")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000027")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000029")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000033")).isTrue();
assertThat(ids)
.hasSize(8)
.containsExactlyInAnyOrder(
"TKI:000000000000000000000000000000000002",
"TKI:000000000000000000000000000000000006",
"TKI:000000000000000000000000000000000009",
"TKI:000000000000000000000000000000000020",
"TKI:000000000000000000000000000000000024",
"TKI:000000000000000000000000000000000027",
"TKI:000000000000000000000000000000000029",
"TKI:000000000000000000000000000000000033");
}
@WithAccessId(user = "monitor")
@ -176,10 +178,12 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes
.classificationCategoryIn(categories)
.listTaskIdsForSelectedItems(selectedItems, TaskTimestamp.DUE);
assertThat(ids).hasSize(3);
assertThat(ids.contains("TKI:000000000000000000000000000000000006")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000009")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000029")).isTrue();
assertThat(ids)
.hasSize(3)
.containsExactlyInAnyOrder(
"TKI:000000000000000000000000000000000006",
"TKI:000000000000000000000000000000000009",
"TKI:000000000000000000000000000000000029");
}
@WithAccessId(user = "monitor")
@ -197,10 +201,12 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes
.domainIn(List.of("DOMAIN_A"))
.listTaskIdsForSelectedItems(selectedItems, TaskTimestamp.DUE);
assertThat(ids).hasSize(3);
assertThat(ids.contains("TKI:000000000000000000000000000000000009")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000020")).isTrue();
assertThat(ids.contains("TKI:000000000000000000000000000000000033")).isTrue();
assertThat(ids)
.hasSize(3)
.containsExactlyInAnyOrder(
"TKI:000000000000000000000000000000000009",
"TKI:000000000000000000000000000000000020",
"TKI:000000000000000000000000000000000033");
}
@WithAccessId(user = "monitor")

4
lib/taskana-core/src/test/java/acceptance/task/complete/TerminateTaskAccTest.java
View File

@ -54,7 +54,7 @@ class TerminateTaskAccTest extends AbstractAccTest {
void should_TerminateTask_When_TaskStateIsClaimed() throws Exception {
List<TaskSummary> taskSummaries =
taskService.createTaskQuery().stateIn(TaskState.CLAIMED).list();
assertThat(taskSummaries.size()).isEqualTo(21);
assertThat(taskSummaries).hasSize(21);
long numTasksTerminated = taskService.createTaskQuery().stateIn(TaskState.TERMINATED).count();
assertThat(numTasksTerminated).isEqualTo(5);
@ -71,7 +71,7 @@ class TerminateTaskAccTest extends AbstractAccTest {
void should_ThrowException_When_TerminateTaskWithTaskStateCompleted() {
List<TaskSummary> taskSummaries =
taskService.createTaskQuery().stateIn(TaskState.COMPLETED).list();
assertThat(taskSummaries.size()).isEqualTo(10);
assertThat(taskSummaries).hasSize(10);
ThrowingCallable taskanaCall = () -> taskService.terminateTask(taskSummaries.get(0).getId());
assertThatThrownBy(taskanaCall).isInstanceOf(InvalidStateException.class);

4
rest/taskana-rest-spring-example-wildfly/src/main/java/pro/taskana/example/wildfly/security/ElytronToJaasFilter.java
View File

@ -31,10 +31,10 @@ public class ElytronToJaasFilter extends GenericFilterBean {
Roles roles = securityIdentity.getRoles();
Subject subject = obtainSubject();
if (subject != null) {
if (subject.getPrincipals().size() == 0) {
if (subject.getPrincipals().isEmpty()) {
subject.getPrincipals().add(securityIdentity.getPrincipal());
}
if (subject.getPrincipals(GroupPrincipal.class).size() == 0) {
if (subject.getPrincipals(GroupPrincipal.class).isEmpty()) {
roles.forEach(role -> subject.getPrincipals().add(new GroupPrincipal(role)));
}
if (logger.isDebugEnabled()) {