TSK-987: Fix Spotbugs - Dead store to local variable

This commit is contained in:
Benjamin Eckstein 2020-01-23 16:02:44 +01:00
parent 2f7d0d359b
commit b86f3e5b65
15 changed files with 44 additions and 60 deletions

View File

@ -31,8 +31,6 @@ class GetTaskIdsOfCategoryReportAccTest extends AbstractReportAccTest {
void testRoleCheck() {
TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
List<SelectedItem> selectedItems = new ArrayList<>();
Assertions.assertThrows(

View File

@ -31,8 +31,6 @@ class GetTaskIdsOfCustomFieldValueReportAccTest extends AbstractReportAccTest {
void testRoleCheck() {
TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
List<SelectedItem> selectedItems = new ArrayList<>();
Assertions.assertThrows(

View File

@ -26,8 +26,6 @@ class GetTaskIdsOfWorkbasketReportAccTest extends AbstractReportAccTest {
void testRoleCheck() {
TaskMonitorService taskMonitorService = taskanaEngine.getTaskMonitorService();
List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
List<SelectedItem> selectedItems = new ArrayList<>();
Assertions.assertThrows(

View File

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

View File

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

View File

@ -274,7 +274,6 @@ class CategoryReportBuilderImplTest {
selectedItem.setKey("EXTERN");
selectedItem.setLowerAgeLimit(1);
selectedItem.setUpperAgeLimit(5);
final List<SelectedItem> selectedItems = Collections.singletonList(selectedItem);
List<String> expectedResult = Collections.singletonList("Geschaeftsstelle A");
when(taskMonitorMapperMock.getCustomAttributeValuesForReport(

View File

@ -418,7 +418,6 @@ class ClassificationReportBuilderImplTest {
selectedItem.setKey("EXTERN");
selectedItem.setLowerAgeLimit(1);
selectedItem.setUpperAgeLimit(5);
final List<SelectedItem> selectedItems = Collections.singletonList(selectedItem);
final List<String> expectedResult = Collections.singletonList("Geschaeftsstelle A");
when(taskMonitorMapperMock.getCustomAttributeValuesForReport(

View File

@ -197,7 +197,6 @@ class CustomFieldValueReportBuilderImplTest {
selectedItem.setKey("EXTERN");
selectedItem.setLowerAgeLimit(1);
selectedItem.setUpperAgeLimit(5);
List<SelectedItem> selectedItems = Collections.singletonList(selectedItem);
List<String> expectedResult = Collections.singletonList("Geschaeftsstelle A");
when(taskMonitorMapperMock.getCustomAttributeValuesForReport(

View File

@ -297,7 +297,6 @@ class WorkbasketReportBuilderImplTest {
selectedItem.setKey("EXTERN");
selectedItem.setLowerAgeLimit(1);
selectedItem.setUpperAgeLimit(5);
List<SelectedItem> selectedItems = Collections.singletonList(selectedItem);
List<String> expectedResult = Collections.singletonList("Geschaeftsstelle A");
when(taskMonitorMapperMock.getCustomAttributeValuesForReport(

View File

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

View File

@ -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<ClassificationSummary> 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<ClassificationSummary> list =
classificationService.createClassificationQuery().parentIdIn("").list();

View File

@ -34,7 +34,7 @@ public class TaskanaComponent {
objRef.setValue("aValue");
task.setPrimaryObjRef(objRef);
task = taskService.createTask(task);
taskService.createTask(task);
throw new RuntimeException();
}
}

View File

@ -112,17 +112,19 @@ class TaskControllerIntTest {
HttpHeaders headers = new HttpHeaders();
headers.add("Authorization", "Basic dXNlcl8xXzI6dXNlcl8xXzI="); // user_1_2
HttpEntity<String> request = new HttpEntity<String>(headers);
try {
ResponseEntity<TaskSummaryListResource> 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<TaskSummaryListResource> 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

View File

@ -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<String> request = new HttpEntity<String>(headers);
ResponseEntity<List<String>> response =
template.exchange(
restHelper.toUrl(Mapping.URL_CLASSIFICATIONCATEGORIES),

View File

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