diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java index d3bbcd765..a0a73d329 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java @@ -10,33 +10,33 @@ import pro.taskana.workbasket.api.WorkbasketAccessItem; @Relation(collectionRelation = "accessItems") public class WorkbasketAccessItemResource extends ResourceSupport { - public String accessItemId; + private String accessItemId; - @NotNull public String workbasketId; + @NotNull private String workbasketId; - @NotNull public String workbasketKey; + @NotNull private String workbasketKey; - @NotNull public String accessId; + @NotNull private String accessId; - public String accessName; + private String accessName; - public boolean permRead; - public boolean permOpen; - public boolean permAppend; - public boolean permTransfer; - public boolean permDistribute; - public boolean permCustom1; - public boolean permCustom2; - public boolean permCustom3; - public boolean permCustom4; - public boolean permCustom5; - public boolean permCustom6; - public boolean permCustom7; - public boolean permCustom8; - public boolean permCustom9; - public boolean permCustom10; - public boolean permCustom11; - public boolean permCustom12; + private boolean permRead; + private boolean permOpen; + private boolean permAppend; + private boolean permTransfer; + private boolean permDistribute; + private boolean permCustom1; + private boolean permCustom2; + private boolean permCustom3; + private boolean permCustom4; + private boolean permCustom5; + private boolean permCustom6; + private boolean permCustom7; + private boolean permCustom8; + private boolean permCustom9; + private boolean permCustom10; + private boolean permCustom11; + private boolean permCustom12; public WorkbasketAccessItemResource() {} diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java index 3574e1447..0d36ee8e0 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssembler.java @@ -41,10 +41,9 @@ public class WorkbasketAccessItemResourceAssembler WorkbasketAccessItemImpl wbAccItemModel = (WorkbasketAccessItemImpl) workbasketService.newWorkbasketAccessItem( - wbAccItemResource.workbasketId, wbAccItemResource.accessId); + wbAccItemResource.getWorkbasketId(), wbAccItemResource.getAccessId()); BeanUtils.copyProperties(wbAccItemResource, wbAccItemModel); - - wbAccItemModel.setId(wbAccItemResource.accessItemId); + wbAccItemModel.setId(wbAccItemResource.getAccessItemId()); return wbAccItemModel; } 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 41baa1ac6..78cc95a19 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 @@ -1,12 +1,9 @@ package pro.taskana.rest; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.assertj.core.api.Assertions.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; @@ -45,7 +42,7 @@ class WorkbasketAccessItemControllerIntTest { HttpMethod.GET, restHelper.defaultRequest(), ParameterizedTypeReference.forType(WorkbasketAccessItemListResource.class)); - assertNotNull(response.getBody().getLink(Link.REL_SELF)); + assertThat(response.getBody().getLink(Link.REL_SELF)).isNotNull(); } @Test @@ -57,8 +54,8 @@ class WorkbasketAccessItemControllerIntTest { HttpMethod.GET, restHelper.defaultRequest(), ParameterizedTypeReference.forType(WorkbasketAccessItemListResource.class)); - assertNotNull(response.getBody().getLink(Link.REL_SELF)); - assertTrue(response.getBody().getLink(Link.REL_SELF).getHref().endsWith(parameters)); + assertThat(response.getBody().getLink(Link.REL_SELF)).isNotNull(); + assertThat(response.getBody().getLink(Link.REL_SELF).getHref().endsWith(parameters)).isTrue(); } @Test @@ -70,10 +67,10 @@ class WorkbasketAccessItemControllerIntTest { HttpMethod.GET, restHelper.defaultRequest(), ParameterizedTypeReference.forType(WorkbasketAccessItemListResource.class)); - fail(); + fail("Invalid filter is used"); } catch (HttpClientErrorException e) { - assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode()); - assertTrue(e.getResponseBodyAsString().contains("[invalid]")); + assertThat(e.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); + assertThat(e.getResponseBodyAsString().contains("[invalid]")).isTrue(); } } @@ -86,16 +83,17 @@ class WorkbasketAccessItemControllerIntTest { HttpMethod.GET, restHelper.defaultRequest(), ParameterizedTypeReference.forType(WorkbasketAccessItemListResource.class)); - assertEquals(1, response.getBody().getContent().size()); - assertEquals("user_1_1", response.getBody().getContent().iterator().next().accessId); - assertNotNull(response.getBody().getLink(Link.REL_SELF)); - assertTrue(response.getBody().getLink(Link.REL_SELF).getHref().endsWith(parameters)); - assertNotNull(response.getBody().getLink(Link.REL_FIRST)); - assertNotNull(response.getBody().getLink(Link.REL_LAST)); - assertEquals(9, response.getBody().getMetadata().getSize()); - assertEquals(1, response.getBody().getMetadata().getTotalElements()); - assertEquals(1, response.getBody().getMetadata().getTotalPages()); - assertEquals(1, response.getBody().getMetadata().getNumber()); + assertThat(response.getBody().getContent()).hasSize(1); + assertThat(response.getBody().getContent().iterator().next().getAccessId()) + .isEqualTo("user_1_1"); + assertThat(response.getBody().getLink(Link.REL_SELF)).isNotNull(); + assertThat(response.getBody().getLink(Link.REL_SELF).getHref().endsWith(parameters)).isTrue(); + assertThat(response.getBody().getLink(Link.REL_FIRST)).isNotNull(); + assertThat(response.getBody().getLink(Link.REL_LAST)).isNotNull(); + assertThat(response.getBody().getMetadata().getSize()).isEqualTo(9); + assertThat(response.getBody().getMetadata().getTotalElements()).isEqualTo(1); + assertThat(response.getBody().getMetadata().getTotalPages()).isEqualTo(1); + assertThat(response.getBody().getMetadata().getNumber()).isEqualTo(1); } @Test @@ -108,24 +106,22 @@ class WorkbasketAccessItemControllerIntTest { HttpMethod.DELETE, restHelper.defaultRequest(), ParameterizedTypeReference.forType(Void.class)); - assertNull(response.getBody()); - assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode()); + assertThat(response.getBody()).isNull(); + assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); } @Test void testGetBadRequestIfTryingToDeleteAccessItemsForGroup() { String parameters = "?access-id=cn=DevelopersGroup,ou=groups,o=TaskanaTest"; - - 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()); + assertThatThrownBy( + () -> + template.exchange( + restHelper.toUrl(Mapping.URL_WORKBASKETACCESSITEMS) + parameters, + HttpMethod.DELETE, + restHelper.defaultRequest(), + ParameterizedTypeReference.forType(Void.class))) + .isInstanceOf(HttpClientErrorException.class) + .extracting(ex -> ((HttpClientErrorException) ex).getStatusCode()) + .isEqualTo(HttpStatus.BAD_REQUEST); } } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java index e0edad40e..bc86171af 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketAccessItemResourceAssemblerTest.java @@ -1,6 +1,7 @@ package pro.taskana.rest.resource; -import org.junit.Assert; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -79,26 +80,26 @@ class WorkbasketAccessItemResourceAssemblerTest { private void testEquality( WorkbasketAccessItem accessItem, WorkbasketAccessItemResource resource) { - Assert.assertEquals(accessItem.getAccessId(), resource.accessId); - Assert.assertEquals(accessItem.getWorkbasketKey(), resource.workbasketKey); - Assert.assertEquals(accessItem.getId(), resource.accessItemId); - Assert.assertEquals(accessItem.getWorkbasketId(), resource.workbasketId); - Assert.assertEquals(accessItem.isPermAppend(), resource.permAppend); - Assert.assertEquals(accessItem.isPermCustom1(), resource.permCustom1); - Assert.assertEquals(accessItem.isPermCustom2(), resource.permCustom2); - Assert.assertEquals(accessItem.isPermCustom3(), resource.permCustom3); - Assert.assertEquals(accessItem.isPermCustom4(), resource.permCustom4); - Assert.assertEquals(accessItem.isPermCustom5(), resource.permCustom5); - Assert.assertEquals(accessItem.isPermCustom6(), resource.permCustom6); - Assert.assertEquals(accessItem.isPermCustom7(), resource.permCustom7); - Assert.assertEquals(accessItem.isPermCustom8(), resource.permCustom8); - Assert.assertEquals(accessItem.isPermCustom9(), resource.permCustom9); - Assert.assertEquals(accessItem.isPermCustom10(), resource.permCustom10); - Assert.assertEquals(accessItem.isPermCustom11(), resource.permCustom11); - Assert.assertEquals(accessItem.isPermCustom12(), resource.permCustom12); - Assert.assertEquals(accessItem.isPermDistribute(), resource.permDistribute); - Assert.assertEquals(accessItem.isPermRead(), resource.permRead); - Assert.assertEquals(accessItem.isPermOpen(), resource.permOpen); - Assert.assertEquals(accessItem.isPermTransfer(), resource.permTransfer); + assertThat(resource.getAccessId()).isEqualTo(accessItem.getAccessId()); + assertThat(resource.getWorkbasketKey()).isEqualTo(accessItem.getWorkbasketKey()); + assertThat(resource.getAccessItemId()).isEqualTo(accessItem.getId()); + assertThat(resource.getWorkbasketId()).isEqualTo(accessItem.getWorkbasketId()); + assertThat(resource.isPermAppend()).isEqualTo(accessItem.isPermAppend()); + assertThat(resource.isPermCustom1()).isEqualTo(accessItem.isPermCustom1()); + assertThat(resource.isPermCustom2()).isEqualTo(accessItem.isPermCustom2()); + assertThat(resource.isPermCustom3()).isEqualTo(accessItem.isPermCustom3()); + assertThat(resource.isPermCustom4()).isEqualTo(accessItem.isPermCustom4()); + assertThat(resource.isPermCustom5()).isEqualTo(accessItem.isPermCustom5()); + assertThat(resource.isPermCustom6()).isEqualTo(accessItem.isPermCustom6()); + assertThat(resource.isPermCustom7()).isEqualTo(accessItem.isPermCustom7()); + assertThat(resource.isPermCustom8()).isEqualTo(accessItem.isPermCustom8()); + assertThat(resource.isPermCustom9()).isEqualTo(accessItem.isPermCustom9()); + assertThat(resource.isPermCustom10()).isEqualTo(accessItem.isPermCustom10()); + assertThat(resource.isPermCustom11()).isEqualTo(accessItem.isPermCustom11()); + assertThat(resource.isPermCustom12()).isEqualTo(accessItem.isPermCustom12()); + assertThat(resource.isPermDistribute()).isEqualTo(accessItem.isPermDistribute()); + assertThat(resource.isPermRead()).isEqualTo(accessItem.isPermRead()); + assertThat(resource.isPermOpen()).isEqualTo(accessItem.isPermOpen()); + assertThat(resource.isPermTransfer()).isEqualTo(accessItem.isPermTransfer()); } }