diff --git a/core/src/main/java/de/bstly/we/controller/SystemController.java b/core/src/main/java/de/bstly/we/controller/SystemController.java index 986558b..dd1f413 100644 --- a/core/src/main/java/de/bstly/we/controller/SystemController.java +++ b/core/src/main/java/de/bstly/we/controller/SystemController.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.http.HttpStatus; @@ -57,11 +58,11 @@ public class SystemController extends BaseController { */ @PreAuthorize("hasRole('ROLE_ADMIN')") @GetMapping("/properties") - public List getProperties(@RequestParam("page") Optional pageParameter, + public Page getProperties(@RequestParam("page") Optional pageParameter, @RequestParam("size") Optional sizeParameter) { Sort sort = Sort.by("key").ascending(); - return systemPropertyRepository.findAll(PageRequest.of(pageParameter.orElse(0), sizeParameter.orElse(10), sort)) - .getContent(); + return systemPropertyRepository + .findAll(PageRequest.of(pageParameter.orElse(0), sizeParameter.orElse(10), sort)); } /** diff --git a/pom.xml b/pom.xml index a6df56d..f9bc5c7 100755 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 2.2 1.14.1 3.6.3 - 3.1.0 + 3.5.0