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

DATACMNS-867 - Improvements in Chunk and PageImpl.

Browse Source 
Chunk now rejects null Pageables. Improved total calculation in PageImpl by using ….toOptional().
This commit is contained in:
Oliver Gierke
2017-03-23 10:16:54 +01:00
parent 93bb3d2e21
commit bc28a6b094
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/springframework/data/domain/Chunk.java
View File

@@ -49,6 +49,7 @@ abstract class Chunk<T> implements Slice<T>, Serializable {
public Chunk(List<T> content, Pageable pageable) {
Assert.notNull(content, "Content must not be null!");
Assert.notNull(pageable, "Pageable must not be null!");
this.content.addAll(content);
this.pageable = pageable;

6
src/main/java/org/springframework/data/domain/PageImpl.java
View File

@@ -16,7 +16,6 @@
package org.springframework.data.domain;
import java.util.List;
import java.util.Optional;
import java.util.function.Function;
/**
@@ -45,10 +44,7 @@ public class PageImpl<T> extends Chunk<T> implements Page<T> {
super(content, pageable);
this.pageable = pageable;
Optional<Pageable> foo = pageable.isPaged() ? Optional.of(pageable) : Optional.empty();
this.total = foo.filter(it -> !content.isEmpty())//
this.total = pageable.toOptional().filter(it -> !content.isEmpty())//
.filter(it -> it.getOffset() + it.getPageSize() > total)//
.map(it -> it.getOffset() + content.size())//
.orElse(total);