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

Refactor PageableExecutionUtils.

Browse Source 
Closes #3103
Original pull request #3113
This commit is contained in:
erie0210
2024-06-24 19:08:09 +09:00
committed by Jens Schauder
parent ec3ba10954
commit 47109d4bb1
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/springframework/data/support/PageableExecutionUtils.java
View File

@@ -31,6 +31,7 @@ import org.springframework.util.Assert;
* @author Oliver Gierke
* @author Christoph Strobl
* @author Jens Schauder
* @author Jay Lee
* @since 2.4
*/
public abstract class PageableExecutionUtils {
@@ -54,19 +55,30 @@ public abstract class PageableExecutionUtils {
Assert.notNull(pageable, "Pageable must not be null");
Assert.notNull(totalSupplier, "TotalSupplier must not be null");
if (pageable.isUnpaged() || pageable.getOffset() == 0) {
if (pageable.isUnpaged() || pageable.getPageSize() > content.size()) {
return new PageImpl<>(content, pageable, content.size());
}
return new PageImpl<>(content, pageable, totalSupplier.getAsLong());
if (pageable.isUnpaged()) {
return new PageImpl<>(content, pageable, content.size());
}
if (content.size() != 0 && pageable.getPageSize() > content.size()) {
if (isFirstPage(pageable) && isPartialPage(content, pageable)) {
return new PageImpl<>(content, pageable, content.size());
}
if (isSubsequentPage(pageable) && !content.isEmpty() && isPartialPage(content, pageable)) {
return new PageImpl<>(content, pageable, pageable.getOffset() + content.size());
}
return new PageImpl<>(content, pageable, totalSupplier.getAsLong());
}
private static <T> boolean isPartialPage(List<T> content, Pageable pageable) {
return pageable.getPageSize() > content.size();
}
private static boolean isFirstPage(Pageable pageable) {
return pageable.getOffset() == 0;
}
private static boolean isSubsequentPage(Pageable pageable) {
return !isFirstPage(pageable);
}
}