nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Closes #2635: Make owner-is-null=owner-is-null not valid, allow use case "owner-is-null=true"

This commit is contained in:
CRoberto1926 2024-07-25 13:12:09 +02:00 committed by Jörg Heffner
parent 3646bc08b1
commit 4ca0ae869f
6 changed files with 198 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/util/QueryParamsValidator.java
View File

@ -1,15 +1,14 @@
package pro.taskana.common.rest.util;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.servlet.http.HttpServletRequest;
import pro.taskana.common.api.exceptions.InvalidArgumentException;
public class QueryParamsValidator {
@ -35,21 +34,57 @@ public class QueryParamsValidator {
if (!providedParams.isEmpty()) {
throw new IllegalArgumentException("Unknown request parameters found: " + providedParams);
}
checkExactParam(request, "owner-is-null");
}
public static void checkExactParam(HttpServletRequest request, String queryParameter) {
String queryString = request.getQueryString();
boolean containParam = queryString != null && queryString.contains(queryParameter);
if (containParam) {
Pattern pattern = Pattern.compile("\\b" + queryParameter + "(&|$)");
Matcher matcher = pattern.matcher(queryString);
public static boolean hasQueryParameterValues(HttpServletRequest request, String queryParameter) {
boolean hasExactParam = matcher.find();
if (!hasExactParam) {
throw new InvalidArgumentException(
"It is prohibited to use the param " + queryParameter + " with values.");
}
}
Map<String, String[]> queryParametersMap = request.getParameterMap();
if (queryParametersMap.isEmpty()) {
return false;
}
String[] queryParameterValues = queryParametersMap.get(queryParameter);
if (queryParameterValues == null) {
return false;
}
boolean hasQueryParameterNotEmptyValues =
Arrays.stream(queryParameterValues).anyMatch(value -> !value.isBlank());
/* Workaround to manage the case "query-param=".
It should be safe enough to use because we have checked all other possibilities before. */
boolean hasQueryParameterEmptyValues = request.getQueryString().contains(queryParameter + "=");
return hasQueryParameterNotEmptyValues || hasQueryParameterEmptyValues;
}
public static boolean hasQueryParameterValuesOrIsNotTrue(
HttpServletRequest request, String queryParameter) {
Map<String, String[]> queryParametersMap = request.getParameterMap();
if (queryParametersMap.isEmpty()) {
return false;
}
String[] queryParameterValues = queryParametersMap.get(queryParameter);
if (queryParameterValues == null) {
return false;
}
boolean hasQueryParameterProhibitedValues =
Arrays.stream(queryParameterValues)
.anyMatch(value -> !value.isBlank() && !Boolean.parseBoolean(value));
/* Workaround to manage the case "query-param=".
It should be safe enough to use because we have checked all other possibilities before. */
boolean hasQueryParameterEmptyValues =
Arrays.stream(queryParameterValues).allMatch(String::isBlank)
&& request.getQueryString().contains(queryParameter + "=");
return hasQueryParameterProhibitedValues || hasQueryParameterEmptyValues;
}
}

13
rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskController.java
View File

@ -120,7 +120,8 @@ public class TaskController {
if (!taskRepresentationModel.getAttachments().stream()
.filter(att -> Objects.nonNull(att.getTaskId()))
.filter(att -> !att.getTaskId().equals(taskRepresentationModel.getTaskId()))
.collect(Collectors.toList()).isEmpty()) {
.collect(Collectors.toList())
.isEmpty()) {
throw new InvalidArgumentException(
"An attachments' taskId must be empty or equal to the id of the task it belongs to");
}
@ -148,6 +149,7 @@ public class TaskController {
* @param sortParameter the sort parameters
* @param pagingParameter the paging parameters
* @return the Tasks with the given filter, sort and paging options.
* @throws InvalidArgumentException if the query parameter "owner-is-null" has values
*/
@GetMapping(path = RestEndpoints.URL_TASKS)
@Transactional(readOnly = true, rollbackFor = Exception.class)
@ -167,6 +169,12 @@ public class TaskController {
TaskQueryGroupByParameter.class,
QuerySortParameter.class,
QueryPagingParameter.class);
if (QueryParamsValidator.hasQueryParameterValuesOrIsNotTrue(request, "owner-is-null")) {
throw new InvalidArgumentException(
"It is prohibited to use the param owner-is-null with values.");
}
TaskQuery query = taskService.createTaskQuery();
filterParameter.apply(query);
@ -655,7 +663,8 @@ public class TaskController {
if (!taskRepresentationModel.getAttachments().stream()
.filter(att -> Objects.nonNull(att.getTaskId()))
.filter(att -> !att.getTaskId().equals(taskRepresentationModel.getTaskId()))
.collect(Collectors.toList()).isEmpty()) {
.collect(Collectors.toList())
.isEmpty()) {
throw new InvalidArgumentException(
"An attachments' taskId must be empty or equal to the id of the task it belongs to");
}

41
rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskQueryFilterParameter.java
View File

@ -28,6 +28,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
/** Filter by what the task id shouldn't be. This is an exact match. */
@JsonProperty("task-id-not")
private final String[] taskIdNotIn;
// endregion
// region externalId
/** Filter by the external id of the Task. This is an exact match. */
@ -37,6 +38,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
/** Filter by what the external id of the Task shouldn't be. This is an exact match. */
@JsonProperty("external-id-not")
private final String[] externalIdNotIn;
// endregion
// region received
/**
@ -101,6 +103,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("received-until-not")
private final Instant receivedUntilNot;
// endregion
// region created
/**
@ -164,6 +167,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("created-until-not")
private final Instant createdUntilNot;
// endregion
// region claimed
/**
@ -183,6 +187,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("claimed-not")
private final Instant[] claimedNotWithin;
// endregion
// region modified
/**
@ -202,6 +207,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("modified-not")
private final Instant[] modifiedNotWithin;
// endregion
// region planned
/**
@ -265,6 +271,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("planned-until-not")
private final Instant plannedUntilNot;
// endregion
// region due
/**
@ -328,6 +335,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("due-until-not")
private final Instant dueUntilNot;
// endregion
// region completed
/**
@ -392,6 +400,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("completed-until-not")
private final Instant completedUntilNot;
// endregion
// region name
/** Filter by the name of the Task. This is an exact match. */
@ -417,6 +426,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("name-not-like")
private final String[] nameNotLike;
// endregion
// region creator
/** Filter by creator of the Task. This is an exact match. */
@ -442,6 +452,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("creator-not-like")
private final String[] creatorNotLike;
// endregion
// region note
/**
@ -459,6 +470,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("note-not-like")
private final String[] noteNotLike;
// endregion
// region description
/**
@ -476,6 +488,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("description-not-like")
private final String[] descriptionNotLike;
// endregion
// region priority
/** Filter by the priority of the Task. This is an exact match. */
@ -509,6 +522,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
/** Filter by excluding priority up to the given value (inclusive). */
@JsonProperty("priority-not-until")
private final Integer priorityNotUntil;
// endregion
// region state
/** Filter by the Task state. This is an exact match. */
@ -518,6 +532,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
/** Filter by what the Task state shouldn't be. This is an exact match. */
@JsonProperty("state-not")
private final TaskState[] stateNotIn;
// endregion
// region comments
/** Filter by the has comments flag of the Task. This is an exact match. */
@ -532,6 +547,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
/** Filter by what the classification id of the Task shouldn't be. This is an exact match. */
@JsonProperty("classification-id-not")
private final String[] classificationIdNotIn;
// endregion
// region classificationKey
/** Filter by the classification key of the Task. This is an exact match. */
@ -557,6 +573,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("classification-key-not-like")
private final String[] classificationKeyNotLike;
// endregion
// region classificationParentKey
/**
@ -588,6 +605,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("classification-parent-key-not-like")
private final String[] classificationParentKeyNotLike;
// endregion
// region classificationCategory
/** Filter by the classification category of the Task. This is an exact match. */
@ -615,6 +633,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("classification-category-not-like")
private final String[] classificationCategoryNotLike;
// endregion
// region classificationName
/** Filter by the classification name of the Task. This is an exact match. */
@ -640,6 +659,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("classification-name-not-like")
private final String[] classificationNameNotLike;
// endregion
// region workbasketId
/** Filter by workbasket id of the Task. This is an exact match. */
@ -649,6 +669,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
/** Filter by what the workbasket id of the Task shouldn't be. This is an exact match. */
@JsonProperty("workbasket-id-not")
private final String[] workbasketIdNotIn;
// endregion
// region workbasketKeyDomain
/**
@ -668,6 +689,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
/** Filter by domain of the Task. This is an exact match. */
@JsonProperty("domain")
private final String domain;
// endregion
// region businessProcessId
/** Filter by the business process id of the Task. This is an exact match. */
@ -754,6 +776,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("owner-is-null")
private final String ownerNull;
// endregion
// region primaryObjectReference
/**
@ -764,6 +787,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("por")
private final ObjectReference[] primaryObjectReferenceIn;
// endregion
// region primaryObjectReferenceCompany
/** Filter by the company of the primary object reference of the Task. This is an exact match. */
@ -792,6 +816,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("por-company-not-like")
private final String[] porCompanyNotLike;
// endregion
// region primaryObjectReferenceSystem
/** Filter by the system of the primary object reference of the Task. This is an exact match. */
@ -820,6 +845,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("por-system-not-like")
private final String[] porSystemNotLike;
// endregion
// region primaryObjectReferenceSystemInstance
/**
@ -851,6 +877,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("por-instance-not-like")
private final String[] porInstanceNotLike;
// endregion
// region primaryObjectReferenceSystemType
/** Filter by the type of the primary object reference of the Task. This is an exact match. */
@ -879,6 +906,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("por-type-not-like")
private final String[] porTypeNotLike;
// endregion
// region primaryObjectReferenceSystemValue
/** Filter by the value of the primary object reference of the Task. This is an exact match. */
@ -907,6 +935,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("por-value-not-like")
private final String[] porValueNotLike;
// endregion
// region secondaryObjectReference
/**
@ -917,6 +946,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("sor")
private final ObjectReference[] secondaryObjectReferenceIn;
// endregion
// region secondaryObjectReferenceCompany
/**
@ -997,11 +1027,13 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
/** Filter by the is read flag of the Task. This is an exact match. */
@JsonProperty("is-read")
private final Boolean isRead;
// endregion
// region transferred
/** Filter by the is transferred flag of the Task. This is an exact match. */
@JsonProperty("is-transferred")
private final Boolean isTransferred;
// endregion
// region attachmentClassificationId
/** Filter by the attachment classification id of the Task. This is an exact match. */
@ -1014,6 +1046,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("attachment-classification-id-not")
private final String[] attachmentClassificationIdNotIn;
// endregion
// region attachmentClassificationKey
/** Filter by the attachment classification key of the Task. This is an exact match. */
@ -1042,6 +1075,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("attachment-classification-key-not-like")
private final String[] attachmentClassificationKeyNotLike;
// endregion
// region attachmentClassificationName
/** Filter by the attachment classification name of the Task. This is an exact match. */
@ -1070,6 +1104,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("attachment-classification-name-not-like")
private final String[] attachmentClassificationNameNotLike;
// endregion
// region attachmentChannel
/** Filter by the attachment channel of the Task. This is an exact match. */
@ -1095,6 +1130,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("attachment-channel-not-like")
private final String[] attachmentChannelNotLike;
// endregion
// region attachmentReferenceValue
/** Filter by the attachment reference of the Task. This is an exact match. */
@ -1120,6 +1156,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("attachment-reference-not-like")
private final String[] attachmentReferenceNotLike;
// endregion
// region attachmentReceived
/**
@ -1139,6 +1176,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("attachment-received-not")
private final Instant[] attachmentReceivedNotWithin;
// endregion
// region withoutAttachment
/**
@ -1147,6 +1185,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("without-attachment")
private final Boolean withoutAttachment;
// endregion
// region callbackState
/** Filter by the callback state of the Task. This is an exact match. */
@ -1156,6 +1195,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
/** Filter by what the callback state of the Task shouldn't be. This is an exact match. */
@JsonProperty("callback-state-not")
private final CallbackState[] callbackStateNotIn;
// endregion
// region wildcardSearchValue
/**
@ -1173,6 +1213,7 @@ public class TaskQueryFilterParameter implements QueryParameter<TaskQuery, Void>
*/
@JsonProperty("wildcard-search-value")
private final String wildcardSearchValue;
// endregion
// region constructor

12
rest/taskana-rest-spring/src/main/java/pro/taskana/user/rest/UserController.java
View File

@ -41,7 +41,8 @@ public class UserController {
private final CurrentUserContext currentUserContext;
@Autowired
UserController(UserService userService,
UserController(
UserService userService,
UserRepresentationModelAssembler userAssembler,
CurrentUserContext currentUserContext) {
this.userService = userService;
@ -68,8 +69,8 @@ public class UserController {
/**
* This endpoint retrieves multiple Users. If a userId can't be found in the database it will be
* ignored. If none of the given userIds is valid, the returned list will be empty.
* If currentUser is set, the current User from the context will be retrieved as well
* ignored. If none of the given userIds is valid, the returned list will be empty. If currentUser
* is set, the current User from the context will be retrieved as well
*
* @title Get multiple Users
* @param request the HttpServletRequest of the request itself
@ -93,7 +94,10 @@ public class UserController {
}
if (currentUser != null) {
QueryParamsValidator.checkExactParam(request, "current-user");
if (QueryParamsValidator.hasQueryParameterValues(request, "current-user")) {
throw new InvalidArgumentException(
"It is prohibited to use the param current-user with values.");
}
users.add(userService.getUser(this.currentUserContext.getUserid()));
}

36
rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java
View File

@ -153,11 +153,11 @@ class TaskControllerIntTest {
attachmentRepresentationModel.setObjectReference(getObjectReferenceResourceSample());
ClassificationSummaryRepresentationModel classificationSummaryRepresentationModel =
new ClassificationSummaryRepresentationModel();
classificationSummaryRepresentationModel
.setClassificationId("CLI:100000000000000000000000000000000004");
classificationSummaryRepresentationModel.setClassificationId(
"CLI:100000000000000000000000000000000004");
classificationSummaryRepresentationModel.setKey("L11010");
attachmentRepresentationModel
.setClassificationSummary(classificationSummaryRepresentationModel);
attachmentRepresentationModel.setClassificationSummary(
classificationSummaryRepresentationModel);
return attachmentRepresentationModel;
}
@ -1194,8 +1194,11 @@ class TaskControllerIntTest {
@CsvSource({
"owner=user-1-1, 10",
"owner-is-null, 65",
"owner-is-null=true, 65",
"owner-is-null&owner=user-1-1, 75",
"owner-is-null=TRUE&owner=user-1-1, 75",
"state=READY&owner-is-null&owner=user-1-1, 56",
"state=READY&owner-is-null=TrUe&owner=user-1-1, 56",
})
void should_ReturnTasksWithVariousOwnerParameters_When_GettingTasks(
String queryParams, int expectedSize) {
@ -1214,7 +1217,9 @@ class TaskControllerIntTest {
List<Pair<String, String>> list =
List.of(
Pair.of("When owner-is-null=", "?owner-is-null="),
Pair.of("When owner-is-null=anyValue", "?owner-is-null=anyValue1,anyValue2"));
Pair.of("When owner-is-null=owner-is-null", "?owner-is-null=owner-is-null"),
Pair.of(
"When owner-is-null=anyValue1,anyValue2", "?owner-is-null=anyValue1,anyValue2"));
ThrowingConsumer<Pair<String, String>> testOwnerIsNull =
t -> {
String url = restHelper.toUrl(RestEndpoints.URL_TASKS) + t.getRight();
@ -1382,9 +1387,7 @@ class TaskControllerIntTest {
@Test
void should_GetAllTasksWithComments_When_FilteringByHasCommentsIsSetToTrue() {
String url =
restHelper.toUrl(RestEndpoints.URL_TASKS)
+ "?has-comments=true";
String url = restHelper.toUrl(RestEndpoints.URL_TASKS) + "?has-comments=true";
HttpEntity<String> auth = new HttpEntity<>(RestHelper.generateHeadersForUser("teamlead-1"));
ResponseEntity<TaskSummaryPagedRepresentationModel> response =
@ -1393,7 +1396,8 @@ class TaskControllerIntTest {
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getContent())
.extracting(TaskSummaryRepresentationModel::getTaskId)
.containsExactlyInAnyOrder("TKI:000000000000000000000000000000000000",
.containsExactlyInAnyOrder(
"TKI:000000000000000000000000000000000000",
"TKI:000000000000000000000000000000000001",
"TKI:000000000000000000000000000000000002",
"TKI:000000000000000000000000000000000004",
@ -1404,9 +1408,7 @@ class TaskControllerIntTest {
@Test
void should_GetAllTasksWithoutComments_When_FilteringByHasCommentsIsSetToFalse() {
String url =
restHelper.toUrl(RestEndpoints.URL_TASKS)
+ "?has-comments=false";
String url = restHelper.toUrl(RestEndpoints.URL_TASKS) + "?has-comments=false";
HttpEntity<String> auth = new HttpEntity<>(RestHelper.generateHeadersForUser("teamlead-1"));
ResponseEntity<TaskSummaryPagedRepresentationModel> response =
@ -1415,7 +1417,8 @@ class TaskControllerIntTest {
assertThat(response.getBody()).isNotNull();
assertThat(response.getBody().getContent())
.extracting(TaskSummaryRepresentationModel::getTaskId)
.doesNotContain("TKI:000000000000000000000000000000000000",
.doesNotContain(
"TKI:000000000000000000000000000000000000",
"TKI:000000000000000000000000000000000001",
"TKI:000000000000000000000000000000000002",
"TKI:000000000000000000000000000000000004",
@ -1826,8 +1829,7 @@ class TaskControllerIntTest {
@Test
void should_ThrowError_When_UpdatingTaskWithBadAttachment() {
String url =
restHelper.toUrl(RestEndpoints.URL_TASKS_ID,
"TKI:100000000000000000000000000000000000");
restHelper.toUrl(RestEndpoints.URL_TASKS_ID, "TKI:100000000000000000000000000000000000");
HttpEntity<Object> httpEntityWithoutBody =
new HttpEntity<>(RestHelper.generateHeadersForUser("teamlead-1"));
@ -1840,7 +1842,6 @@ class TaskControllerIntTest {
attachmentRepresentationModel.setTaskId(originalTask.getTaskId() + "wrongId");
originalTask.setAttachments(Lists.newArrayList(attachmentRepresentationModel));
HttpEntity<TaskRepresentationModel> httpEntity =
new HttpEntity<>(originalTask, RestHelper.generateHeadersForUser("teamlead-1"));
@ -2048,8 +2049,7 @@ class TaskControllerIntTest {
}
@TestFactory
Stream<DynamicTest>
should_ReturnFailedTasks_When_TransferringTasks() {
Stream<DynamicTest> should_ReturnFailedTasks_When_TransferringTasks() {
Iterator<Pair<Boolean, String>> iterator =
Arrays.asList(Pair.of(true, "user-1-1"), Pair.of(false, "user-1-2")).iterator();

16
rest/taskana-rest-spring/src/test/java/pro/taskana/user/rest/UserControllerIntTest.java
View File

@ -31,7 +31,7 @@ class UserControllerIntTest {
}
@Test
void should_ReturnExistingUser() throws Exception {
void should_ReturnExistingUser() {
String url = restHelper.toUrl(RestEndpoints.URL_USERS_ID, "TEAMLEAD-1");
HttpEntity<?> auth = new HttpEntity<>(RestHelper.generateHeadersForUser("teamlead-1"));
@ -45,7 +45,7 @@ class UserControllerIntTest {
}
@Test
void should_ReturnExistingUsers() throws Exception {
void should_ReturnExistingUsers() {
String url = restHelper.toUrl(RestEndpoints.URL_USERS) + "?user-id=user-1-1&user-id=USER-1-2";
HttpEntity<?> auth = new HttpEntity<>(RestHelper.generateHeadersForUser("teamlead-1"));
@ -134,8 +134,9 @@ class UserControllerIntTest {
}
@Test
void should_ReturnExistingUsersAndCurrentUser() throws Exception {
String url = restHelper.toUrl(RestEndpoints.URL_USERS)
void should_ReturnExistingUsersAndCurrentUser() {
String url =
restHelper.toUrl(RestEndpoints.URL_USERS)
+ "?user-id=user-1-1&user-id=USER-1-2&current-user";
HttpEntity<?> auth = new HttpEntity<>(RestHelper.generateHeadersForUser("teamlead-1"));
@ -154,7 +155,7 @@ class UserControllerIntTest {
}
@Test
void should_ReturnExistingUsers_When_ParameterContainsDuplicateAndInvalidIds() throws Exception {
void should_ReturnExistingUsers_When_ParameterContainsDuplicateAndInvalidIds() {
// also testing different query parameter format
String url =
restHelper.toUrl(RestEndpoints.URL_USERS)
@ -182,8 +183,7 @@ class UserControllerIntTest {
}
@Test
void should_CreateValidUser_When_CallingCreateEndpointWithAllAttributesExceptDomains()
throws Exception {
void should_CreateValidUser_When_CallingCreateEndpoint() {
UserRepresentationModel newUser = new UserRepresentationModel();
newUser.setUserId("12345");
newUser.setGroups(Set.of("group1", "group2"));
@ -262,7 +262,7 @@ class UserControllerIntTest {
}
@Test
void should_UpdateExistingUser_When_CallingUpdateEndpoint() throws Exception {
void should_UpdateExistingUser_When_CallingUpdateEndpoint() {
String url = restHelper.toUrl(RestEndpoints.URL_USERS_ID, "teamlead-1");
HttpEntity<?> auth = new HttpEntity<>(RestHelper.generateHeadersForUser("teamlead-1"));