TSK-1594: now using type inference to automatically detenct the type of any HttpEntity

This commit is contained in:
Mustapha Zorgati 2021-03-16 12:35:07 +01:00
parent 47821aae2e
commit 327747cbd8
13 changed files with 91 additions and 91 deletions

View File

@ -55,7 +55,7 @@ class TaskHistoryEventControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getContent()).hasSize(45);
@ -67,7 +67,7 @@ class TaskHistoryEventControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getLink(IanaLinkRelations.SELF))
@ -85,7 +85,7 @@ class TaskHistoryEventControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getLink(IanaLinkRelations.SELF))
@ -103,7 +103,7 @@ class TaskHistoryEventControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getContent())
@ -118,7 +118,7 @@ class TaskHistoryEventControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getContent())
@ -136,7 +136,7 @@ class TaskHistoryEventControllerIntTest {
restHelper.toUrl(
HistoryRestEndpoints.URL_HISTORY_EVENTS + "?created=" + currentTime),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
assertThatThrownBy(httpCall)
.isInstanceOf(HttpClientErrorException.class)
@ -153,7 +153,7 @@ class TaskHistoryEventControllerIntTest {
restHelper.toUrl(
HistoryRestEndpoints.URL_HISTORY_EVENTS + "?created=" + now + "&created="),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
@ -173,7 +173,7 @@ class TaskHistoryEventControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS + parameters),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
@ -228,7 +228,7 @@ class TaskHistoryEventControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(HistoryRestEndpoints.URL_HISTORY_EVENTS_ID, id),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getLink(IanaLinkRelations.SELF))
@ -247,7 +247,7 @@ class TaskHistoryEventControllerIntTest {
HistoryRestEndpoints.URL_HISTORY_EVENTS_ID,
"THI:000000000000000000000000000000000000"),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_HISTORY_EVENT_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
@ -266,7 +266,7 @@ class TaskHistoryEventControllerIntTest {
+ "&anotherIllegalParam=stillIllegal"
+ "&sort-by=TASK_ID&order=DESCENDING&page-size=5&page=2",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_HISTORY_EVENT_PAGED_REPRESENTATION_MODEL_TYPE);
assertThatThrownBy(httpCall)

View File

@ -58,7 +58,7 @@ class AsyncUpdateJobIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS_ID, CLASSIFICATION_ID),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(ClassificationRepresentationModel.class));
assertThat(response.getBody()).isNotNull();
@ -86,7 +86,7 @@ class AsyncUpdateJobIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS_ID, CLASSIFICATION_ID),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(ClassificationRepresentationModel.class));
assertThat(repeatedResponse.getBody()).isNotNull();

View File

@ -50,7 +50,7 @@ public class AbstractAccTest {
return RestHelper.TEMPLATE.exchange(
restHelper.toUrl("/taskana" + HistoryRestEndpoints.URL_HISTORY_EVENTS),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(TaskHistoryEventPagedRepresentationModel.class));
}

View File

@ -51,7 +51,7 @@ class ClassificationControllerIntTest {
restHelper.toUrl(
RestEndpoints.URL_CLASSIFICATIONS_ID, "CLI:100000000000000000000000000000000002"),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
CLASSIFICATION_SUMMARY_PAGE_MODEL_TYPE);
assertThatThrownBy(httpCall)

View File

@ -76,7 +76,7 @@ class ClassificationDefinitionControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_DEFINITIONS) + "?domain=DOMAIN_B",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(
ClassificationDefinitionCollectionRepresentationModel.class));
assertThat(response.getBody()).isNotNull();

View File

@ -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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ACCESS_ID_LIST_TYPE);
assertThat(response.getBody())

View File

@ -33,7 +33,7 @@ class GeneralExceptionHandlingTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATIONS_ID, "non-existing-id"),
HttpMethod.DELETE,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(
ClassificationSummaryPagedRepresentationModel.class));
assertThatThrownBy(httpCall)

View File

@ -35,7 +35,7 @@ class TaskanaEngineControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_DOMAIN),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(List.class));
assertThat(response.getBody()).contains("DOMAIN_A");
}
@ -46,7 +46,7 @@ class TaskanaEngineControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_TYPES),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(List.class));
assertThat(response.getBody()).containsExactlyInAnyOrder("TASK", "DOCUMENT");
}
@ -57,7 +57,7 @@ class TaskanaEngineControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_CLASSIFICATION_CATEGORIES),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(List.class));
assertThat(response.getBody())
.containsExactlyInAnyOrder("MANUAL", "EXTERNAL", "AUTOMATIC", "PROCESS", "EXTERNAL");
@ -69,7 +69,7 @@ class TaskanaEngineControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_CURRENT_USER),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(TaskanaUserInfoRepresentationModel.class));
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getUserId()).isEqualTo("teamlead-1");

View File

@ -49,7 +49,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
urlToNonExistingTaskComment,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersAdmin()),
new HttpEntity<>(restHelper.getHeadersAdmin()),
ParameterizedTypeReference.forType(TaskCommentRepresentationModel.class));
assertThatThrownBy(httpCall)
.extracting(ex -> ((HttpClientErrorException) ex).getStatusCode())
@ -68,7 +68,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
urlToNotVisibleTask,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersUser_1_1()),
new HttpEntity<>(restHelper.getHeadersUser_1_1()),
TASK_COMMENT_PAGE_MODEL_TYPE);
assertThatThrownBy(httpCall)
.extracting(ex -> ((HttpClientErrorException) ex).getStatusCode())
@ -87,7 +87,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
url + "?sort-by=MODIFIED&order=DESCENDING",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersAdmin()),
new HttpEntity<>(restHelper.getHeadersAdmin()),
TASK_COMMENT_PAGE_MODEL_TYPE);
assertThat(getTaskCommentsSortedByModifiedOrderedByDescendingResponse.getBody()).isNotNull();
@ -101,7 +101,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
url + "?sort-by=MODIFIED",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersAdmin()),
new HttpEntity<>(restHelper.getHeadersAdmin()),
TASK_COMMENT_PAGE_MODEL_TYPE);
assertThat(getTaskCommentsSortedByModifiedOrderedByAscendingResponse.getBody()).isNotNull();
@ -115,7 +115,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
url + "?sort-by=CREATED&order=DESCENDING",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersAdmin()),
new HttpEntity<>(restHelper.getHeadersAdmin()),
TASK_COMMENT_PAGE_MODEL_TYPE);
assertThat(getTaskCommentsSortedByCreatedOrderedByDescendingResponse.getBody()).isNotNull();
@ -129,7 +129,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
url + "?sort-by=CREATED",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersAdmin()),
new HttpEntity<>(restHelper.getHeadersAdmin()),
TASK_COMMENT_PAGE_MODEL_TYPE);
assertThat(getTaskCommentsSortedByCreatedOrderedByAscendingResponse.getBody()).isNotNull();
@ -151,7 +151,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
url + "?sort-by=invalidSortParam",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersUser_1_1()),
new HttpEntity<>(restHelper.getHeadersUser_1_1()),
TASK_COMMENT_PAGE_MODEL_TYPE);
assertThatThrownBy(httpCall)
.extracting(ex -> ((HttpClientErrorException) ex).getStatusCode())
@ -170,7 +170,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
urlToNotVisibleTask,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersUser_1_2()),
new HttpEntity<>(restHelper.getHeadersUser_1_2()),
ParameterizedTypeReference.forType(TaskCommentRepresentationModel.class));
assertThatThrownBy(httpCall)
.extracting(ex -> ((HttpClientErrorException) ex).getStatusCode())
@ -230,7 +230,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
url,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersAdmin()),
new HttpEntity<>(restHelper.getHeadersAdmin()),
ParameterizedTypeReference.forType(TaskCommentRepresentationModel.class));
TaskCommentRepresentationModel taskCommentToUpdate = getTaskCommentResponse.getBody();
assertThat(taskCommentToUpdate).isNotNull();
@ -262,7 +262,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
url,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersUser_1_1()),
new HttpEntity<>(restHelper.getHeadersUser_1_1()),
ParameterizedTypeReference.forType(TaskCommentRepresentationModel.class));
TaskCommentRepresentationModel taskComment = getTaskCommentResponse.getBody();
assertThat(taskComment).isNotNull();
@ -295,7 +295,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
url,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersAdmin()),
new HttpEntity<>(restHelper.getHeadersAdmin()),
ParameterizedTypeReference.forType(TaskCommentRepresentationModel.class));
assertThat(getTaskCommentResponse.getBody()).isNotNull();
assertThat(getTaskCommentResponse.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
@ -329,7 +329,7 @@ class TaskCommentControllerIntTest {
restHelper.toUrl(
RestEndpoints.URL_TASK_COMMENTS, "TKI:000000000000000000000000000000000001"),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersUser_1_2()),
new HttpEntity<>(restHelper.getHeadersUser_1_2()),
TASK_COMMENT_PAGE_MODEL_TYPE);
assertThat(getTaskCommentsBeforeDeleteionResponse.getBody()).isNotNull();
assertThat(getTaskCommentsBeforeDeleteionResponse.getBody().getContent()).hasSize(2);
@ -343,7 +343,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
url,
HttpMethod.DELETE,
new HttpEntity<String>(restHelper.getHeadersUser_1_2()),
new HttpEntity<>(restHelper.getHeadersUser_1_2()),
ParameterizedTypeReference.forType(TaskCommentRepresentationModel.class));
assertThatThrownBy(httpCall)
.isInstanceOf(HttpClientErrorException.class)
@ -362,7 +362,7 @@ class TaskCommentControllerIntTest {
TEMPLATE.exchange(
url,
HttpMethod.DELETE,
new HttpEntity<String>(restHelper.getHeadersAdmin()),
new HttpEntity<>(restHelper.getHeadersAdmin()),
ParameterizedTypeReference.forType(TaskCommentRepresentationModel.class));
assertThatThrownBy(httpCall)
.extracting(ex -> ((HttpClientErrorException) ex).getStatusCode())

View File

@ -95,7 +95,7 @@ class TaskControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_TASKS),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_SUMMARY_PAGE_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
@ -246,7 +246,7 @@ class TaskControllerIntTest {
+ "&wildcard-search-fields=CUSTOM_3"
+ "&wildcard-search-fields=CUSTOM_4",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersAdmin()),
new HttpEntity<>(restHelper.getHeadersAdmin()),
TASK_SUMMARY_PAGE_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
@ -325,7 +325,7 @@ class TaskControllerIntTest {
+ "&task-id=TKI:000000000000000000000000000000000038"
+ "&custom14=abc",
HttpMethod.DELETE,
new HttpEntity<String>(restHelper.getHeadersAdmin()),
new HttpEntity<>(restHelper.getHeadersAdmin()),
TASK_SUMMARY_COLLECTION_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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
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,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_SUMMARY_PAGE_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
@ -920,7 +920,7 @@ class TaskControllerIntTest {
template.exchange(
url,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersUser_b_1()),
new HttpEntity<>(restHelper.getHeadersUser_b_1()),
ParameterizedTypeReference.forType(TaskRepresentationModel.class));
assertThatThrownBy(httpCall)
@ -940,7 +940,7 @@ class TaskControllerIntTest {
+ "&anotherIllegalParam=stillIllegal"
+ "&sort-by=NAME&order=DESCENDING&page-size=5&page=2",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
TASK_SUMMARY_PAGE_MODEL_TYPE);
assertThatThrownBy(httpCall)

View File

@ -49,7 +49,7 @@ class WorkbasketAccessItemControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
@ -63,7 +63,7 @@ class WorkbasketAccessItemControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
@ -84,7 +84,7 @@ class WorkbasketAccessItemControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getContent()).hasSize(1);
@ -114,7 +114,7 @@ class WorkbasketAccessItemControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
HttpMethod.DELETE,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(Void.class));
assertThat(response.getBody()).isNull();
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
@ -132,7 +132,7 @@ class WorkbasketAccessItemControllerIntTest {
+ "&anotherIllegalParam=stillIllegal"
+ "&sort-by=WORKBASKET_KEY&order=DESCENDING&page-size=5&page=2",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_ACCESS_ITEM_PAGED_REPRESENTATION_MODEL_TYPE);
assertThatThrownBy(httpCall)
@ -159,7 +159,7 @@ class WorkbasketAccessItemControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters,
HttpMethod.DELETE,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(Void.class));
assertThatThrownBy(httpCall)
.isInstanceOf(HttpClientErrorException.class)

View File

@ -65,7 +65,7 @@ class WorkbasketControllerIntTest {
TEMPLATE.exchange(
url,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
@ -80,7 +80,7 @@ class WorkbasketControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
@ -92,7 +92,7 @@ class WorkbasketControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + "?required-permission=OPEN",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getRequiredLink(IanaLinkRelations.SELF)).isNotNull();
@ -106,7 +106,7 @@ class WorkbasketControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + parameters,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
@ -128,7 +128,7 @@ class WorkbasketControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ID, workbasketId),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_REPRESENTATION_MODEL_TYPE);
WorkbasketRepresentationModel workbasketRepresentationModel =
@ -164,7 +164,7 @@ class WorkbasketControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ID, workbasketId),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersBusinessAdmin()),
new HttpEntity<>(restHelper.getHeadersBusinessAdmin()),
WORKBASKET_REPRESENTATION_MODEL_TYPE);
assertThatThrownBy(httpCall)
.isInstanceOf(HttpClientErrorException.class)
@ -180,7 +180,7 @@ class WorkbasketControllerIntTest {
TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET) + parameters,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getContent()).hasSize(5);
@ -238,7 +238,7 @@ class WorkbasketControllerIntTest {
RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION,
"WBI:100000000000000000000000000000000007"),
HttpMethod.DELETE,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
Void.class);
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
@ -248,7 +248,7 @@ class WorkbasketControllerIntTest {
RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION,
"WBI:100000000000000000000000000000000002"),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
DISTRIBUTION_TARGETS_COLLECTION_REPRESENTATION_MODEL_TYPE);
assertThat(response2.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(response2.getBody()).isNotNull();
@ -265,7 +265,7 @@ class WorkbasketControllerIntTest {
RestEndpoints.URL_WORKBASKET_ID_ACCESS_ITEMS,
"WBI:100000000000000000000000000000000005"),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_ACCESS_ITEM_COLLECTION_REPRESENTATION_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
@ -281,7 +281,7 @@ class WorkbasketControllerIntTest {
RestEndpoints.URL_WORKBASKET_ID_DISTRIBUTION,
"WBI:100000000000000000000000000000000001"),
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
DISTRIBUTION_TARGETS_COLLECTION_REPRESENTATION_MODEL_TYPE);
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull();
@ -301,7 +301,7 @@ class WorkbasketControllerIntTest {
+ "&anotherIllegalParam=stillIllegal"
+ "&sort-by=KEY&order=DESCENDING&page-size=5&page=2",
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
WORKBASKET_SUMMARY_PAGE_MODEL_TYPE);
assertThatThrownBy(httpCall)

View File

@ -274,7 +274,7 @@ class WorkbasketDefinitionControllerIntTest {
return TEMPLATE.exchange(
restHelper.toUrl(RestEndpoints.URL_WORKBASKET_DEFINITIONS) + "?domain=" + domain,
HttpMethod.GET,
new HttpEntity<String>(restHelper.getHeadersTeamlead_1()),
new HttpEntity<>(restHelper.getHeadersTeamlead_1()),
ParameterizedTypeReference.forType(
WorkbasketDefinitionCollectionRepresentationModel.class));
}