From b86f3e5b65e998bc1fa7c4a1247cfd8417d9e175 Mon Sep 17 00:00:00 2001 From: Benjamin Eckstein <13351939+benjamineckstein@users.noreply.github.com> Date: Thu, 23 Jan 2020 16:02:44 +0100 Subject: [PATCH] TSK-987: Fix Spotbugs - Dead store to local variable --- .../GetTaskIdsOfCategoryReportAccTest.java | 2 - ...askIdsOfCustomFieldValueReportAccTest.java | 2 - .../GetTaskIdsOfWorkbasketReportAccTest.java | 2 - .../acceptance/task/CallbackStateAccTest.java | 2 +- .../workbasket/CreateWorkbasketAccTest.java | 6 +-- .../impl/CategoryReportBuilderImplTest.java | 1 - .../ClassificationReportBuilderImplTest.java | 1 - ...CustomFieldValueReportBuilderImplTest.java | 1 - .../impl/WorkbasketReportBuilderImplTest.java | 1 - .../impl/WorkbasketServiceImplTest.java | 9 +--- ...ificationServiceImplIntAutoCommitTest.java | 6 +-- .../java/pro/taskana/TaskanaComponent.java | 2 +- .../taskana/rest/TaskControllerIntTest.java | 41 ++++++++++--------- .../rest/TaskanaEngineControllerIntTest.java | 5 --- ...WorkbasketAccessItemControllerIntTest.java | 23 ++++++----- 15 files changed, 44 insertions(+), 60 deletions(-) diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java index 3bdf4531c..72928cafc 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCategoryReportAccTest.java @@ -31,8 +31,6 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest { void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); - List columnHeaders = getListOfColumnHeaders(); - List selectedItems = new ArrayList<>(); Assertions.assertThrows( diff --git a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java index ac14c2e26..712432101 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfCustomFieldValueReportAccTest.java @@ -31,8 +31,6 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest { void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); - List columnHeaders = getListOfColumnHeaders(); - List selectedItems = new ArrayList<>(); Assertions.assertThrows( 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 477aff448..e80db9027 100644 --- a/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfWorkbasketReportAccTest.java @@ -26,8 +26,6 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest { void testRoleCheck() { TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService(); - List columnHeaders = getListOfColumnHeaders(); - List selectedItems = new ArrayList<>(); Assertions.assertThrows( 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 9ea6d2d5e..00f8bdc59 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CallbackStateAccTest.java @@ -273,7 +273,7 @@ class CallbackStateAccTest extends AbstractAccTest { // claim two tasks createdTask1 = (TaskImpl) taskService.forceClaim(createdTask1.getId()); - createdTask2 = (TaskImpl) taskService.forceClaim(createdTask2.getId()); + taskService.forceClaim(createdTask2.getId()); // It's only allowed to claim a task if the TaskState equals CLAIMED and the CallbackState // equals REQUIRED diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java index 880eda136..c769ba3d0 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java @@ -161,7 +161,7 @@ class CreateWorkbasketAccTest extends AbstractAccTest { Workbasket workbasket = workbasketService.newWorkbasket("X123456", "DOMAIN_A"); workbasket.setName("Personal Workbasket for UID X123456"); workbasket.setType(WorkbasketType.PERSONAL); - workbasket = workbasketService.createWorkbasket(workbasket); + workbasketService.createWorkbasket(workbasket); Workbasket duplicateWorkbasketWithSmallX = workbasketService.newWorkbasket("x123456", "DOMAIN_A"); @@ -185,7 +185,7 @@ class CreateWorkbasketAccTest extends AbstractAccTest { Workbasket wb = workbasketService.newWorkbasket("newKey", "DOMAIN_A"); wb.setType(WorkbasketType.GROUP); wb.setName("this name"); - wb = workbasketService.createWorkbasket(wb); + workbasketService.createWorkbasket(wb); // Second create a new Workbasket with same Key and Domain. Workbasket sameKeyAndDomain = workbasketService.newWorkbasket("newKey", "DOMAIN_A"); @@ -206,7 +206,7 @@ class CreateWorkbasketAccTest extends AbstractAccTest { InvalidWorkbasketException, WorkbasketAlreadyExistException, DomainNotFoundException, WorkbasketAccessItemAlreadyExistException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - int before = workbasketService.createWorkbasketQuery().domainIn("DOMAIN_A").list().size(); + workbasketService.createWorkbasketQuery().domainIn("DOMAIN_A").list().size(); Workbasket workbasket = workbasketService.newWorkbasket("WBAIT1234", "DOMAIN_A"); workbasket.setName("MyNewBasket"); diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java index cce58d272..aea3460da 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java @@ -274,7 +274,6 @@ class CategoryReportBuilderImplTest { selectedItem.setKey("EXTERN"); selectedItem.setLowerAgeLimit(1); selectedItem.setUpperAgeLimit(5); - final List selectedItems = Collections.singletonList(selectedItem); List expectedResult = Collections.singletonList("Geschaeftsstelle A"); when(taskMonitorMapperMock.getCustomAttributeValuesForReport( diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java index be0ba1a02..13867f700 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java @@ -418,7 +418,6 @@ class ClassificationReportBuilderImplTest { selectedItem.setKey("EXTERN"); selectedItem.setLowerAgeLimit(1); selectedItem.setUpperAgeLimit(5); - final List selectedItems = Collections.singletonList(selectedItem); final List expectedResult = Collections.singletonList("Geschaeftsstelle A"); when(taskMonitorMapperMock.getCustomAttributeValuesForReport( diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java index 097dfda32..9d5fef373 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java @@ -197,7 +197,6 @@ class CustomFieldValueReportBuilderImplTest { selectedItem.setKey("EXTERN"); selectedItem.setLowerAgeLimit(1); selectedItem.setUpperAgeLimit(5); - List selectedItems = Collections.singletonList(selectedItem); List expectedResult = Collections.singletonList("Geschaeftsstelle A"); when(taskMonitorMapperMock.getCustomAttributeValuesForReport( diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java index 92b173ed5..077bc199b 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java @@ -297,7 +297,6 @@ class WorkbasketReportBuilderImplTest { selectedItem.setKey("EXTERN"); selectedItem.setLowerAgeLimit(1); selectedItem.setUpperAgeLimit(5); - List selectedItems = Collections.singletonList(selectedItem); List expectedResult = Collections.singletonList("Geschaeftsstelle A"); when(taskMonitorMapperMock.getCustomAttributeValuesForReport( diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java index 639777b45..6c0cd1df9 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java @@ -13,7 +13,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import org.junit.jupiter.api.Assertions; @@ -27,7 +26,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import pro.taskana.TaskQuery; import pro.taskana.TaskService; -import pro.taskana.TaskSummary; import pro.taskana.TaskanaEngine; import pro.taskana.Workbasket; import pro.taskana.WorkbasketType; @@ -155,12 +153,9 @@ class WorkbasketServiceImplTest { @Test void testDeleteWorkbasketIsUsed() throws NotAuthorizedException, WorkbasketNotFoundException { Workbasket wb = createTestWorkbasket("WBI:0", "wb-key"); - List usages = Arrays.asList(new TaskSummaryImpl(), new TaskSummaryImpl()); - WorkbasketNotFoundException e = - Assertions.assertThrows( - WorkbasketNotFoundException.class, - () -> workbasketServiceSpy.deleteWorkbasket(wb.getId())); + Assertions.assertThrows( + WorkbasketNotFoundException.class, () -> workbasketServiceSpy.deleteWorkbasket(wb.getId())); verify(internalTaskanaEngineMock, times(2)).openConnection(); verify(workbasketServiceSpy, times(1)).getWorkbasket(wb.getId()); diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java index c078fa5a1..d9764e418 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java @@ -105,7 +105,7 @@ class ClassificationServiceImplIntAutoCommitTest { throws NotAuthorizedException, ClassificationAlreadyExistException, InvalidArgumentException, DomainNotFoundException { Classification classification = this.createDummyClassificationWithUniqueKey("DOMAIN_A", "TASK"); - classification = classificationService.createClassification(classification); + classificationService.createClassification(classification); List list = classificationService @@ -131,7 +131,7 @@ class ClassificationServiceImplIntAutoCommitTest { classificationService.createClassificationQuery().validInDomainEquals(true).list(); assertEquals(1, list.size()); - classification = classificationService.updateClassification(classification); + classificationService.updateClassification(classification); list = classificationService.createClassificationQuery().list(); assertEquals(2, list.size()); @@ -153,7 +153,7 @@ class ClassificationServiceImplIntAutoCommitTest { classification1 = classificationService.createClassification(classification1); classification1.setParentId(classification.getId()); - classification1 = classificationService.updateClassification(classification1); + classificationService.updateClassification(classification1); List list = classificationService.createClassificationQuery().parentIdIn("").list(); diff --git a/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java b/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java index f3a6c5490..d692499cf 100644 --- a/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java +++ b/lib/taskana-spring/src/test/java/pro/taskana/TaskanaComponent.java @@ -34,7 +34,7 @@ public class TaskanaComponent { objRef.setValue("aValue"); task.setPrimaryObjRef(objRef); - task = taskService.createTask(task); + taskService.createTask(task); throw new RuntimeException(); } } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java index 0a27bfbff..0686dad34 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskControllerIntTest.java @@ -112,17 +112,19 @@ class TaskControllerIntTest { HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", "Basic dXNlcl8xXzI6dXNlcl8xXzI="); // user_1_2 HttpEntity request = new HttpEntity(headers); - try { - ResponseEntity response = - template.exchange( - restHelper.toUrl(Mapping.URL_TASKS) + "?workbasket-key=USER_1_2", - HttpMethod.GET, - request, - ParameterizedTypeReference.forType(TaskSummaryListResource.class)); - fail(); - } catch (HttpClientErrorException e) { - assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode()); - } + + HttpClientErrorException e = + Assertions.assertThrows( + HttpClientErrorException.class, + () -> { + ResponseEntity response = + template.exchange( + restHelper.toUrl(Mapping.URL_TASKS) + "?workbasket-key=USER_1_2", + HttpMethod.GET, + request, + ParameterizedTypeReference.forType(TaskSummaryListResource.class)); + }); + assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode()); } @Test @@ -395,15 +397,14 @@ class TaskControllerIntTest { taskResource.setPlanned(now.toString()); taskResource.setDue(now.toString()); - HttpClientErrorException ex = - Assertions.assertThrows( - HttpClientErrorException.class, - () -> - template.exchange( - restHelper.toUrl(Mapping.URL_TASKS), - HttpMethod.POST, - new HttpEntity<>(taskResource, restHelper.getHeaders()), - ParameterizedTypeReference.forType(TaskResource.class))); + Assertions.assertThrows( + HttpClientErrorException.class, + () -> + template.exchange( + restHelper.toUrl(Mapping.URL_TASKS), + HttpMethod.POST, + new HttpEntity<>(taskResource, restHelper.getHeaders()), + ParameterizedTypeReference.forType(TaskResource.class))); } @Test diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java index 307be74c1..bc958269c 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java @@ -9,8 +9,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; @@ -58,9 +56,6 @@ class TaskanaEngineControllerIntTest { @Test void testClassificationCategories() { - HttpHeaders headers = new HttpHeaders(); - headers.add("Authorization", "Basic dGVhbWxlYWRfMTp0ZWFtbGVhZF8x"); - HttpEntity request = new HttpEntity(headers); ResponseEntity> response = template.exchange( restHelper.toUrl(Mapping.URL_CLASSIFICATIONCATEGORIES), diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java index 6ca408d20..41baa1ac6 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/WorkbasketAccessItemControllerIntTest.java @@ -6,6 +6,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; @@ -114,15 +115,17 @@ class WorkbasketAccessItemControllerIntTest { @Test void testGetBadRequestIfTryingToDeleteAccessItemsForGroup() { String parameters = "?access-id=cn=DevelopersGroup,ou=groups,o=TaskanaTest"; - try { - ResponseEntity response = - template.exchange( - restHelper.toUrl(Mapping.URL_WORKBASKETACCESSITEMS) + parameters, - HttpMethod.DELETE, - restHelper.defaultRequest(), - ParameterizedTypeReference.forType(Void.class)); - } catch (HttpClientErrorException e) { - assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode()); - } + + HttpClientErrorException e = + Assertions.assertThrows( + HttpClientErrorException.class, + () -> + template.exchange( + restHelper.toUrl(Mapping.URL_WORKBASKETACCESSITEMS) + parameters, + HttpMethod.DELETE, + restHelper.defaultRequest(), + ParameterizedTypeReference.forType(Void.class))); + + assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode()); } }