OZG-3455 OZG-3479 handle searchBy not as optional; remove defaultValue for page

goofy-server/src/main/java/de/itvsh/goofy/RootController.java

@@ -159,7 +159,7 @@ public class RootController {
 	}
 
 	Link buildGetAllBySearchByLink(String linkRel) {
-		return linkTo(methodOn(VorgangController.class).getAllBySearchBy(0, null, Optional.empty())).withRel(linkRel);
+		return linkTo(methodOn(VorgangController.class).getAllBySearchBy(0, null, null)).withRel(linkRel);
 	}
 
 	void addViewLinksForVerwaltungPoststelle(ModelBuilder<RootResource> modelBuilder, Optional<UserId> userId) {
@@ -195,7 +195,7 @@ public class RootController {
 	}
 
 	Link buildGetAllByAssignedToAndSearchLink(UserId userId, String linkRel) {
-		return linkTo(methodOn(VorgangController.class).getAllByAssignedToAndSearchBy(0, null, userId, Optional.empty())).withRel(linkRel);
+		return linkTo(methodOn(VorgangController.class).getAllByAssignedToAndSearchBy(0, null, userId, null)).withRel(linkRel);
 	}
 
 	void addAllVorgangStatusLinks(ModelBuilder<RootResource> modelBuilder) {

goofy-server/src/main/java/de/itvsh/goofy/vorgang/VorgangController.java

@@ -64,16 +64,15 @@ public class VorgangController {
 	private VorgangModelAssembler modelAssembler;
 
 	@GetMapping(params = { PARAM_PAGE, PARAM_LIMIT })
-	public CollectionModel<EntityModel<Vorgang>> getAll(@RequestParam(defaultValue = "0") int page,
-			@RequestParam(defaultValue = "100") Integer limit) {
+	public CollectionModel<EntityModel<Vorgang>> getAll(@RequestParam int page, @RequestParam Integer limit) {
 		var requestCriteria = FindVorgaengeHeaderRequestCriteria.builder().page(page).limit(limit).build();
 
 		return handleGetAllRequest(requestCriteria);
 	}
 
 	@GetMapping(params = { PARAM_PAGE, PARAM_LIMIT, PARAM_STATUS })
-	public CollectionModel<EntityModel<Vorgang>> getAllByStatus(@RequestParam(defaultValue = "0") int page,
-			@RequestParam Integer limit, @RequestParam VorgangStatus status) {
+	public CollectionModel<EntityModel<Vorgang>> getAllByStatus(@RequestParam int page, @RequestParam Integer limit,
+			@RequestParam VorgangStatus status) {
 		var requestCriteria = FindVorgaengeHeaderRequestCriteria.builder().page(page).limit(limit)
 				.status(Optional.of(status))
 				.build();
@@ -82,18 +81,18 @@ public class VorgangController {
 	}
 
 	@GetMapping(params = { PARAM_PAGE, PARAM_LIMIT, PARAM_SEARCH })
-	public CollectionModel<EntityModel<Vorgang>> getAllBySearchBy(@RequestParam(defaultValue = "0") int page,
-			@RequestParam Integer limit, @RequestParam Optional<String> searchBy) {
+	public CollectionModel<EntityModel<Vorgang>> getAllBySearchBy(@RequestParam int page, @RequestParam Integer limit,
+			@RequestParam String searchBy) {
 		var requestCriteria = FindVorgaengeHeaderRequestCriteria.builder().page(page).limit(limit)
-				.searchBy(searchBy)
+				.searchBy(Optional.of(searchBy))
 				.build();
 
 		return handleGetAllRequest(requestCriteria);
 	}
 
 	@GetMapping(params = { PARAM_PAGE, PARAM_LIMIT, PARAM_ASSIGNED_TO })
-	public CollectionModel<EntityModel<Vorgang>> getAllByAssignedTo(@RequestParam(defaultValue = "0") int page,
-			@RequestParam Integer limit, @RequestParam UserId assignedTo) {
+	public CollectionModel<EntityModel<Vorgang>> getAllByAssignedTo(@RequestParam int page, @RequestParam Integer limit,
+			@RequestParam UserId assignedTo) {
 		var requestCriteria = FindVorgaengeHeaderRequestCriteria.builder().page(page).limit(limit)
 				.assignedTo(Optional.of(assignedTo))
 				.build();
@@ -102,18 +101,18 @@ public class VorgangController {
 	}
 
 	@GetMapping(params = { PARAM_PAGE, PARAM_LIMIT, PARAM_ASSIGNED_TO, PARAM_SEARCH })
-	public CollectionModel<EntityModel<Vorgang>> getAllByAssignedToAndSearchBy(@RequestParam(defaultValue = "0") int page,
-			@RequestParam Integer limit, @RequestParam UserId assignedTo, @RequestParam Optional<String> searchBy) {
+	public CollectionModel<EntityModel<Vorgang>> getAllByAssignedToAndSearchBy(@RequestParam int page, @RequestParam Integer limit,
+			@RequestParam UserId assignedTo, @RequestParam String searchBy) {
 		var requestCriteria = FindVorgaengeHeaderRequestCriteria.builder().page(page).limit(limit)
-				.searchBy(searchBy)
+				.searchBy(Optional.of(searchBy))
 				.assignedTo(Optional.of(assignedTo)).build();
 
 		return handleGetAllRequest(requestCriteria);
 	}
 
 	@GetMapping(params = { PARAM_PAGE, PARAM_LIMIT, PARAM_ASSIGNED_TO, PARAM_STATUS })
-	public CollectionModel<EntityModel<Vorgang>> getAllByAssignedToAndStatus(@RequestParam(defaultValue = "0") int page,
-			@RequestParam Integer limit, @RequestParam UserId assignedTo, @RequestParam VorgangStatus status) {
+	public CollectionModel<EntityModel<Vorgang>> getAllByAssignedToAndStatus(@RequestParam int page, @RequestParam Integer limit,
+			@RequestParam UserId assignedTo, @RequestParam VorgangStatus status) {
 		var requestCriteria = FindVorgaengeHeaderRequestCriteria.builder().page(page).limit(limit)
 				.assignedTo(Optional.of(assignedTo))
 				.status(Optional.of(status))

goofy-server/src/test/java/de/itvsh/goofy/RootControllerTest.java

@@ -371,7 +371,7 @@ class RootControllerTest {
 				controller.addSearchAllLink(modelBuilder);
 
 				assertThat(modelBuilder.buildModel().getLink(RootController.SEARCH_ALL_REL))
-						.get().extracting(Link::getHref).isEqualTo("/api/vorgangs?page=0&limit={limit}{&searchBy}");
+						.get().extracting(Link::getHref).isEqualTo("/api/vorgangs?page=0&limit={limit}&searchBy={searchBy}");
 			}
 
 			@Test
@@ -419,7 +419,7 @@ class RootControllerTest {
 
 				assertThat(modelBuilder.buildModel().getLink(RootController.SEARCH_MY_VORGEANGE_REL))
 						.get().extracting(Link::getHref)
-						.isEqualTo("/api/vorgangs?page=0&limit={limit}&assignedTo=" + UserProfileTestFactory.ID.toString() + "{&searchBy}");
+						.isEqualTo("/api/vorgangs?page=0&limit={limit}&assignedTo=" + UserProfileTestFactory.ID.toString() + "&searchBy={searchBy}");
 			}
 
 			@Test