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

Polishing.

Browse Source 
Ternary ifs and less nesting.

Related: GH-3094
Original pull request: GH-2865
This commit is contained in:
Oliver Drotbohm
2024-05-14 11:38:36 +02:00
parent 7ecdbdf3d8
commit be30ca46a9
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,15 +83,12 @@ public class PageableHandlerMethodArgumentResolver extends PageableHandlerMethod
Sort sort = sortResolver.resolveArgument(methodParameter, mavContainer, webRequest, binderFactory);
Pageable pageable = getPageable(methodParameter, page, pageSize);
if (sort.isSorted()) {
if (pageable.isPaged()) {
pageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), sort);
}
else {
pageable = Pageable.unpaged(sort);
}
if (!sort.isSorted()) {
return pageable;
}
return pageable;
return pageable.isPaged()
? PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), sort)
: Pageable.unpaged(sort);
}
}

13
src/main/java/org/springframework/data/web/ReactivePageableHandlerMethodArgumentResolver.java
View File

@@ -78,15 +78,12 @@ public class ReactivePageableHandlerMethodArgumentResolver extends PageableHandl
Sort sort = sortResolver.resolveArgumentValue(parameter, bindingContext, exchange);
Pageable pageable = getPageable(parameter, page, pageSize);
if (sort.isSorted()) {
if (pageable.isPaged()) {
pageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), sort);
}
else {
pageable = Pageable.unpaged(sort);
}
if (!sort.isSorted()) {
return pageable;
}
return pageable;
return pageable.isPaged()
? PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), sort)
: Pageable.unpaged(sort);
}
}