From 47821aae2e351acf4e6751e1af31c6157ed0acf9 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Tue, 16 Mar 2021 12:31:28 +0100 Subject: [PATCH] TSK-1594: inlined RestHelper#defaultRequest --- .../taskana/common/test/rest/RestHelper.java | 5 ---- .../TaskHistoryEventControllerIntTest.java | 23 +++++++------- .../example/wildfly/AbstractAccTest.java | 2 +- .../example/wildfly/TaskanaWildflyTest.java | 7 +++-- .../rest/ClassificationControllerIntTest.java | 14 ++++----- ...sificationDefinitionControllerIntTest.java | 6 ++-- .../rest/AccessIdControllerIntTest.java | 22 +++++++------- .../rest/GeneralExceptionHandlingTest.java | 3 +- .../rest/TaskanaEngineControllerIntTest.java | 9 +++--- .../task/rest/TaskControllerIntTest.java | 30 +++++++++---------- ...WorkbasketAccessItemControllerIntTest.java | 13 ++++---- .../rest/WorkbasketControllerIntTest.java | 23 +++++++------- ...WorkbasketDefinitionControllerIntTest.java | 2 +- 13 files changed, 81 insertions(+), 78 deletions(-) diff --git a/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/RestHelper.java b/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/RestHelper.java index 218cea038..18dbf9560 100644 --- a/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/RestHelper.java +++ b/common/taskana-common-test/src/main/java/pro/taskana/common/test/rest/RestHelper.java @@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.hateoas.MediaTypes; import org.springframework.hateoas.mediatype.hal.Jackson2HalModule; -import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.stereotype.Component; @@ -55,10 +54,6 @@ public class RestHelper { .toString(); } - public HttpEntity defaultRequest() { - return new HttpEntity<>(getHeadersTeamlead_1()); - } - public HttpHeaders getHeadersTeamlead_1() { HttpHeaders headers = new HttpHeaders(); headers.add("Authorization", AUTHORIZATION_TEAMLEAD_1); diff --git a/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/TaskHistoryEventControllerIntTest.java b/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/TaskHistoryEventControllerIntTest.java index 9148d7a5b..b52b2e6b6 100644 --- a/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/TaskHistoryEventControllerIntTest.java +++ b/history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/TaskHistoryEventControllerIntTest.java @@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.ParameterizedTypeReference; import org.springframework.hateoas.IanaLinkRelations; import org.springframework.hateoas.Link; +import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -54,7 +55,7 @@ class TaskHistoryEventControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getContent()).hasSize(45); @@ -66,7 +67,7 @@ class TaskHistoryEventControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)) @@ -84,7 +85,7 @@ class TaskHistoryEventControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)) @@ -102,7 +103,7 @@ class TaskHistoryEventControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getContent()) @@ -117,7 +118,7 @@ class TaskHistoryEventControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getContent()) @@ -135,7 +136,7 @@ class TaskHistoryEventControllerIntTest { restHelper.toUrl( HistoryRestEndpoints.URL_HISTORY_EVENTS + "?created=" + currentTime), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE); assertThatThrownBy(httpCall) .isInstanceOf(HttpClientErrorException.class) @@ -152,7 +153,7 @@ class TaskHistoryEventControllerIntTest { restHelper.toUrl( HistoryRestEndpoints.URL_HISTORY_EVENTS + "?created=" + now + "&created="), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -172,7 +173,7 @@ class TaskHistoryEventControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); @@ -227,7 +228,7 @@ class TaskHistoryEventControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS_ID, id), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)) @@ -246,7 +247,7 @@ class TaskHistoryEventControllerIntTest { HistoryRestEndpoints.URL_HISTORY_EVENTS_ID, "THI:000000000000000000000000000000000000"), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_HISTORY_EVENT_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); @@ -265,7 +266,7 @@ class TaskHistoryEventControllerIntTest { + "&anotherIllegalParam=stillIllegal" + "&sort-by=TASK_ID&order=DESCENDING&page-size=5&page=2", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE); assertThatThrownBy(httpCall) diff --git a/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java b/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java index f294a1fa4..fd3fdafde 100644 --- a/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java +++ b/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java @@ -50,7 +50,7 @@ public class AbstractAccTest { return RestHelper.TEMPLATE.exchange( restHelper.toUrl("/taskana" + HistoryRestEndpoints.URL_HISTORY_EVENTS), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType(TaskHistoryEventPagedRepresentationModel.class)); } diff --git a/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/TaskanaWildflyTest.java b/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/TaskanaWildflyTest.java index 57e9bdde1..1770d3345 100644 --- a/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/TaskanaWildflyTest.java +++ b/rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/TaskanaWildflyTest.java @@ -17,6 +17,7 @@ import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -72,7 +73,7 @@ public class TaskanaWildflyTest extends AbstractAccTest { TEMPLATE.exchange( restHelper.toUrl("/taskana" + RestEndpoints.URL_CURRENT_USER), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity<>(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType(TaskanaUserInfoRepresentationModel.class)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); TaskanaUserInfoRepresentationModel currentUser = response.getBody(); @@ -89,7 +90,7 @@ public class TaskanaWildflyTest extends AbstractAccTest { TEMPLATE.exchange( restHelper.toUrl("/taskana" + RestEndpoints.URL_ACCESS_ID + "?search-for=rig"), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity<>(restHelper.getHeadersTeamlead_1()), new ParameterizedTypeReference>() {}); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(response.getBody()).hasSize(2); @@ -104,7 +105,7 @@ public class TaskanaWildflyTest extends AbstractAccTest { "/taskana" + RestEndpoints.URL_TASKS_ID, "TKI:000000000000000000000000000000000001"), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity<>(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType(TaskRepresentationModel.class)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(response.getBody()).isNotNull(); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java index 86b147784..f5693be23 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationControllerIntTest.java @@ -51,7 +51,7 @@ class ClassificationControllerIntTest { restHelper.toUrl( RestEndpoints.URL_CLASSIFICATIONS_ID, "CLI:100000000000000000000000000000000002"), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), CLASSIFICATION_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -64,7 +64,7 @@ class ClassificationControllerIntTest { template.exchange( restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -77,7 +77,7 @@ class ClassificationControllerIntTest { restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS) + "?domain=DOMAIN_A&custom-1-like=RVNR", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); @@ -92,7 +92,7 @@ class ClassificationControllerIntTest { restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS) + "?domain=DOMAIN_A&sort-by=KEY&order=ASCENDING", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -109,7 +109,7 @@ class ClassificationControllerIntTest { restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS) + "?domain=DOMAIN_A&sort-by=KEY&order=ASCENDING&page-size=5&page=2", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getContent()).hasSize(5); @@ -242,7 +242,7 @@ class ClassificationControllerIntTest { template.exchange( restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); @@ -357,7 +357,7 @@ class ClassificationControllerIntTest { + "&anotherIllegalParam=stillIllegal" + "&sort-by=NAME&order=DESCENDING&page-size=5&page=2", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE); assertThatThrownBy(httpCall) diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java index f2d53b8f9..55a95db9d 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/classification/rest/ClassificationDefinitionControllerIntTest.java @@ -76,7 +76,7 @@ class ClassificationDefinitionControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_DEFINITIONS) + "?domain=DOMAIN_B", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType( ClassificationDefinitionCollectionRepresentationModel.class)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); @@ -98,7 +98,7 @@ class ClassificationDefinitionControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_DEFINITIONS) + "?domain=DOMAIN_B", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType( ClassificationDefinitionCollectionRepresentationModel.class)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); @@ -117,7 +117,7 @@ class ClassificationDefinitionControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_DEFINITIONS) + "?domain=ADdfe", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType( ClassificationDefinitionCollectionRepresentationModel.class)); assertThat(response.getBody()).isNotNull(); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerIntTest.java index a2ed20cd5..ca5d6f0c1 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerIntTest.java @@ -39,7 +39,7 @@ class AccessIdControllerIntTest { restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=cn=ksc-users,cn=groups,OU=Test,O=TASKANA", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ACCESS_ID_LIST_TYPE); assertThat(response.getBody()) .isNotNull() @@ -55,7 +55,7 @@ class AccessIdControllerIntTest { restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=uid=teamlead-1,cn=users,OU=Test,O=TASKANA", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ACCESS_ID_LIST_TYPE); assertThat(response.getBody()) .isNotNull() @@ -70,7 +70,7 @@ class AccessIdControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=ksc-use", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ACCESS_ID_LIST_TYPE); assertThat(response.getBody()) .isNotNull() @@ -85,7 +85,7 @@ class AccessIdControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=ksc-teamleads,cn=groups", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ACCESS_ID_LIST_TYPE); assertThat(response.getBody()).isNotNull().isEmpty(); } @@ -96,7 +96,7 @@ class AccessIdControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=rig", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ACCESS_ID_LIST_TYPE); assertThat(response.getBody()) @@ -111,7 +111,7 @@ class AccessIdControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=läf", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ACCESS_ID_LIST_TYPE); assertThat(response.getBody()) @@ -127,7 +127,7 @@ class AccessIdControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_ACCESS_ID) + "?search-for=al", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType(List.class)); assertThatThrownBy(httpCall) .isInstanceOf(HttpClientErrorException.class) @@ -142,7 +142,7 @@ class AccessIdControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_ACCESS_ID_GROUPS) + "?access-id=teamlead-2", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ACCESS_ID_LIST_TYPE); assertThat(response.getBody()) @@ -163,7 +163,7 @@ class AccessIdControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_ACCESS_ID_GROUPS) + "?access-id=user-2-1", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ACCESS_ID_LIST_TYPE); assertThat(response.getBody()) @@ -184,7 +184,7 @@ class AccessIdControllerIntTest { restHelper.toUrl(RestEndpoints.URL_ACCESS_ID_GROUPS) + "?access-id=teamlead-2,cn=users", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ACCESS_ID_LIST_TYPE); assertThatThrownBy(call) @@ -202,7 +202,7 @@ class AccessIdControllerIntTest { + "?access-id=cn=Organisationseinheit KSC 1," + "cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ACCESS_ID_LIST_TYPE); assertThat(response.getBody()) diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/GeneralExceptionHandlingTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/GeneralExceptionHandlingTest.java index be2aab635..daccc554d 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/GeneralExceptionHandlingTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/GeneralExceptionHandlingTest.java @@ -7,6 +7,7 @@ import org.assertj.core.api.ThrowableAssert.ThrowingCallable; 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.HttpMethod; import org.springframework.web.client.HttpClientErrorException; @@ -32,7 +33,7 @@ class GeneralExceptionHandlingTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS_ID, "non-existing-id"), HttpMethod.DELETE, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType( ClassificationSummaryPagedRepresentationModel.class)); assertThatThrownBy(httpCall) diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TaskanaEngineControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TaskanaEngineControllerIntTest.java index 219f0bc31..ff6aab442 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TaskanaEngineControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TaskanaEngineControllerIntTest.java @@ -6,6 +6,7 @@ import java.util.List; 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.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; @@ -34,7 +35,7 @@ class TaskanaEngineControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_DOMAIN), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType(List.class)); assertThat(response.getBody()).contains("DOMAIN_A"); } @@ -45,7 +46,7 @@ class TaskanaEngineControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_TYPES), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType(List.class)); assertThat(response.getBody()).containsExactlyInAnyOrder("TASK", "DOCUMENT"); } @@ -56,7 +57,7 @@ class TaskanaEngineControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_CATEGORIES), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType(List.class)); assertThat(response.getBody()) .containsExactlyInAnyOrder("MANUAL", "EXTERNAL", "AUTOMATIC", "PROCESS", "EXTERNAL"); @@ -68,7 +69,7 @@ class TaskanaEngineControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_CURRENT_USER), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType(TaskanaUserInfoRepresentationModel.class)); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getUserId()).isEqualTo("teamlead-1"); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java index fb364c372..78f263cf9 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java @@ -95,7 +95,7 @@ class TaskControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_TASKS), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -109,7 +109,7 @@ class TaskControllerIntTest { restHelper.toUrl(RestEndpoints.URL_TASKS) + "?workbasket-id=WBI:100000000000000000000000000000000001", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -137,7 +137,7 @@ class TaskControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_TASKS) + parameters, HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -160,7 +160,7 @@ class TaskControllerIntTest { + plannedToInstant + "&sort-by=PLANNED", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -180,7 +180,7 @@ class TaskControllerIntTest { + plannedFromInstant + "&sort-by=PLANNED", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -200,7 +200,7 @@ class TaskControllerIntTest { + "&planned-from=2020-01-19T07:44:47.453Z" + "&sort-by=planned", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThatThrownBy(httpCall) .isInstanceOf(HttpClientErrorException.class) @@ -229,7 +229,7 @@ class TaskControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_TASKS) + parameters, HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -340,7 +340,7 @@ class TaskControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_TASKS) + "?wildcard-search-value=%rt%", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThatThrownBy(httpCall) .isInstanceOf(HttpClientErrorException.class) @@ -354,7 +354,7 @@ class TaskControllerIntTest { restHelper.toUrl(RestEndpoints.URL_TASKS) + "?wildcard-search-fields=NAME,CUSTOM_3,CUSTOM_4", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThatThrownBy(httpCall2) .isInstanceOf(HttpClientErrorException.class) @@ -379,7 +379,7 @@ class TaskControllerIntTest { + dueToInstant + "&sort-by=DUE", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -399,7 +399,7 @@ class TaskControllerIntTest { + dueToInstant + "&sort-by=DUE", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -419,7 +419,7 @@ class TaskControllerIntTest { + "&due-from=2020-01-19T07:44:47.453Z" + "&sort-by=planned", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThatThrownBy(httpCall) .isInstanceOf(HttpClientErrorException.class) @@ -448,7 +448,7 @@ class TaskControllerIntTest { + "?external-id=ETI:000000000000000000000000000000000003" + "&external-id=ETI:000000000000000000000000000000000004", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -491,7 +491,7 @@ class TaskControllerIntTest { restHelper.toUrl(RestEndpoints.URL_TASKS) + "?por.type=VNR&por.value=22334455&sort-by=POR_VALUE&order=DESCENDING", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -940,7 +940,7 @@ class TaskControllerIntTest { + "&anotherIllegalParam=stillIllegal" + "&sort-by=NAME&order=DESCENDING&page-size=5&page=2", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), TASK_SUMMARY_PAGE_MODEL_TYPE); assertThatThrownBy(httpCall) diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java index b9ee719f2..55949c9b6 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java @@ -16,6 +16,7 @@ import org.junit.jupiter.api.function.ThrowingConsumer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.ParameterizedTypeReference; import org.springframework.hateoas.IanaLinkRelations; +import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -48,7 +49,7 @@ class WorkbasketAccessItemControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -62,7 +63,7 @@ class WorkbasketAccessItemControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters, HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -83,7 +84,7 @@ class WorkbasketAccessItemControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters, HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getContent()).hasSize(1); @@ -113,7 +114,7 @@ class WorkbasketAccessItemControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters, HttpMethod.DELETE, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType(Void.class)); assertThat(response.getBody()).isNull(); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); @@ -131,7 +132,7 @@ class WorkbasketAccessItemControllerIntTest { + "&anotherIllegalParam=stillIllegal" + "&sort-by=WORKBASKET_KEY&order=DESCENDING&page-size=5&page=2", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE); assertThatThrownBy(httpCall) @@ -158,7 +159,7 @@ class WorkbasketAccessItemControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters, HttpMethod.DELETE, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType(Void.class)); assertThatThrownBy(httpCall) .isInstanceOf(HttpClientErrorException.class) diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java index 0ef9f0a05..2a9495cef 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java @@ -63,7 +63,10 @@ class WorkbasketControllerIntTest { RestEndpoints.URL_WORKBASKET_ID, "WBI:100000000000000000000000000000000006"); ResponseEntity response = TEMPLATE.exchange( - url, HttpMethod.GET, restHelper.defaultRequest(), WORKBASKET_REPRESENTATION_MODEL_TYPE); + url, + HttpMethod.GET, + new HttpEntity(restHelper.getHeadersTeamlead_1()), + WORKBASKET_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)) @@ -77,7 +80,7 @@ class WorkbasketControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_WORKBASKET), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), WORKBASKET_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -89,7 +92,7 @@ class WorkbasketControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + "?required-permission=OPEN", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), WORKBASKET_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getRequiredLink(IanaLinkRelations.SELF)).isNotNull(); @@ -103,7 +106,7 @@ class WorkbasketControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + parameters, HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), WORKBASKET_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -177,7 +180,7 @@ class WorkbasketControllerIntTest { TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + parameters, HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), WORKBASKET_SUMMARY_PAGE_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getContent()).hasSize(5); @@ -235,7 +238,7 @@ class WorkbasketControllerIntTest { RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION, "WBI:100000000000000000000000000000000007"), HttpMethod.DELETE, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), Void.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); @@ -245,7 +248,7 @@ class WorkbasketControllerIntTest { RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION, "WBI:100000000000000000000000000000000002"), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), DISTRIBUTION_TARGETS_COLLECTION_REPRESENTATION_MODEL_TYPE); assertThat(response2.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(response2.getBody()).isNotNull(); @@ -262,7 +265,7 @@ class WorkbasketControllerIntTest { RestEndpoints.URL_WORKBASKET_ID_ACCESS_ITEMS, "WBI:100000000000000000000000000000000005"), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), WORKBASKET_ACCESS_ITEM_COLLECTION_REPRESENTATION_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -278,7 +281,7 @@ class WorkbasketControllerIntTest { RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION, "WBI:100000000000000000000000000000000001"), HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), DISTRIBUTION_TARGETS_COLLECTION_REPRESENTATION_MODEL_TYPE); assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); @@ -298,7 +301,7 @@ class WorkbasketControllerIntTest { + "&anotherIllegalParam=stillIllegal" + "&sort-by=KEY&order=DESCENDING&page-size=5&page=2", HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), WORKBASKET_SUMMARY_PAGE_MODEL_TYPE); assertThatThrownBy(httpCall) diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java index 92d4c5b4e..0943334fa 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketDefinitionControllerIntTest.java @@ -274,7 +274,7 @@ class WorkbasketDefinitionControllerIntTest { return TEMPLATE.exchange( restHelper.toUrl(RestEndpoints.URL_WORKBASKET_DEFINITIONS) + "?domain=" + domain, HttpMethod.GET, - restHelper.defaultRequest(), + new HttpEntity(restHelper.getHeadersTeamlead_1()), ParameterizedTypeReference.forType( WorkbasketDefinitionCollectionRepresentationModel.class)); }