Skip to content

Commit 9e65767

Browse files
committed
Clarify Javadoc for FallbackPageable in PageableHandlerMethodArgumentResolverSupport.
Closes #2551
1 parent 3ec4063 commit 9e65767

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolverSupport.java

+5-8
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,11 @@ public abstract class PageableHandlerMethodArgumentResolverSupport {
6363
private boolean oneIndexedParameters = false;
6464

6565
/**
66-
* Configures the {@link Pageable} to be used as fallback in case no {@link PageableDefault} or
67-
* {@link PageableDefault} (the latter only supported in legacy mode) can be found at the method parameter to be
68-
* resolved.
66+
* Configures the {@link Pageable} to be used as fallback in case no {@link PageableDefault} can be found at the
67+
* method parameter to be resolved.
6968
* <p>
70-
* If you set this to {@literal Optional#empty()}, be aware that you controller methods will get {@literal null}
71-
* handed into them in case no {@link Pageable} data can be found in the request. Note, that doing so will require you
72-
* supply bot the page <em>and</em> the size parameter with the requests as there will be no default for any of the
73-
* parameters available.
69+
* If you set this to {@literal Pageable#unpaged()}, be aware that your controller methods will get an {@code unpaged}
70+
* instance handed into them in case no {@link Pageable} data can be found in the request.
7471
*
7572
* @param fallbackPageable the {@link Pageable} to be used as general fallback.
7673
*/
@@ -254,7 +251,7 @@ private Pageable getDefaultFromAnnotationOrFallback(MethodParameter methodParame
254251

255252
private static Pageable getDefaultPageRequestFrom(MethodParameter parameter, PageableDefault defaults) {
256253

257-
Integer defaultPageNumber = defaults.page();
254+
int defaultPageNumber = defaults.page();
258255
Integer defaultPageSize = getSpecificPropertyOrDefaultFromValue(defaults, "size");
259256

260257
if (defaultPageSize < 1) {

0 commit comments

Comments
 (0)