From 6e4bdeb4a544bb3d0f3a549e0c7dd36b42e9f5a4 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 17 Feb 2022 14:33:59 +0100 Subject: [PATCH] Clarify Javadoc for `FallbackPageable` in `PageableHandlerMethodArgumentResolverSupport`. Closes #2551 --- ...ageableHandlerMethodArgumentResolverSupport.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverSupport.java b/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverSupport.java index 748640b44..801e37f07 100644 --- a/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverSupport.java +++ b/src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverSupport.java @@ -63,14 +63,11 @@ public abstract class PageableHandlerMethodArgumentResolverSupport { private boolean oneIndexedParameters = false; /** - * Configures the {@link Pageable} to be used as fallback in case no {@link PageableDefault} or - * {@link PageableDefault} (the latter only supported in legacy mode) can be found at the method parameter to be - * resolved. + * Configures the {@link Pageable} to be used as fallback in case no {@link PageableDefault} can be found at the + * method parameter to be resolved. *

- * If you set this to {@literal Optional#empty()}, be aware that you controller methods will get {@literal null} - * handed into them in case no {@link Pageable} data can be found in the request. Note, that doing so will require you - * supply bot the page and the size parameter with the requests as there will be no default for any of the - * parameters available. + * If you set this to {@literal Pageable#unpaged()}, be aware that your controller methods will get an {@code unpaged} + * instance handed into them in case no {@link Pageable} data can be found in the request. * * @param fallbackPageable the {@link Pageable} to be used as general fallback. */ @@ -254,7 +251,7 @@ public abstract class PageableHandlerMethodArgumentResolverSupport { private static Pageable getDefaultPageRequestFrom(MethodParameter parameter, PageableDefault defaults) { - Integer defaultPageNumber = defaults.page(); + int defaultPageNumber = defaults.page(); Integer defaultPageSize = getSpecificPropertyOrDefaultFromValue(defaults, "size"); if (defaultPageSize < 1) {