diff --git a/src/main/java/org/springframework/data/elasticsearch/core/FacetedPageImpl.java b/src/main/java/org/springframework/data/elasticsearch/core/FacetedPageImpl.java index f5a37f713..a3de48b47 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/FacetedPageImpl.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/FacetedPageImpl.java @@ -40,6 +40,8 @@ import org.springframework.data.elasticsearch.core.facet.result.StatisticalResul import org.springframework.data.elasticsearch.core.facet.result.Term; import org.springframework.data.elasticsearch.core.facet.result.TermResult; +import static java.util.Optional.ofNullable; + /** * Container for query result and facet results * @@ -61,7 +63,7 @@ public abstract class FacetedPageImpl extends PageImpl implements FacetedP } public FacetedPageImpl(List content, Pageable pageable, long total) { - super(content, pageable, total); + super(content, ofNullable(pageable).orElse(Pageable.unpaged()), total); } @Override