Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-692 - Fixed web parameter range handling for Pageables.

Browse Source 
In case the PageableHandlerMethodArgumentResolver was configured to use one-indexed parameters, it wasn't defaulting the lower bounds for the page number. This caused indexes out of the allowed bound submitted causing an invalid index handed tor PageRequest. We now apply better range shifting before the bounds are applied.
This commit is contained in:
Oliver Gierke
2015-05-13 18:00:19 +02:00
parent 5405c6e2e7
commit 9230b5f30f
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java
View File

@@ -235,9 +235,9 @@ public class PageableHandlerMethodArgumentResolver implements HandlerMethodArgum
return null;
}
int page = StringUtils.hasText(pageString) ? parseAndApplyBoundaries(pageString, 0, Integer.MAX_VALUE)
- (oneIndexedParameters ? 1 : 0) : defaultOrFallback.getPageNumber();
int pageSize = StringUtils.hasText(pageSizeString) ? parseAndApplyBoundaries(pageSizeString, 0, maxPageSize)
int page = StringUtils.hasText(pageString) ? parseAndApplyBoundaries(pageString, Integer.MAX_VALUE)
: defaultOrFallback.getPageNumber();
int pageSize = StringUtils.hasText(pageSizeString) ? parseAndApplyBoundaries(pageSizeString, maxPageSize)
: defaultOrFallback.getPageSize();
// Limit lower bound
@@ -306,17 +306,16 @@ public class PageableHandlerMethodArgumentResolver implements HandlerMethodArgum
* boundary if the {@link String} cannot be parsed.
*
* @param parameter
* @param lower
* @param upper
* @return
*/
private static int parseAndApplyBoundaries(String parameter, int lower, int upper) {
private int parseAndApplyBoundaries(String parameter, int upper) {
try {
int parsed = Integer.parseInt(parameter);
return parsed < lower ? lower : parsed > upper ? upper : parsed;
int parsed = Integer.parseInt(parameter) - (oneIndexedParameters ? 1 : 0);
return parsed < 0 ? 0 : parsed > upper ? upper : parsed;
} catch (NumberFormatException e) {
return lower;
return 0;
}
}
}