diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/DiscoveryRestController.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/DiscoveryRestController.java index 95d0c4fb59..60bae72f4d 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/DiscoveryRestController.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/DiscoveryRestController.java @@ -148,7 +148,7 @@ public class DiscoveryRestController implements InitializingBean { FacetResultsResource facetResultsResource = new FacetResultsResource(facetResultsRest); - halLinkService.addLinks(facetResultsResource); + halLinkService.addLinks(facetResultsResource, page); return facetResultsResource; } diff --git a/dspace-spring-rest/src/main/java/org/dspace/app/rest/link/search/FacetResultsHalLinkFactory.java b/dspace-spring-rest/src/main/java/org/dspace/app/rest/link/search/FacetResultsHalLinkFactory.java index 73b7706580..6b616addec 100644 --- a/dspace-spring-rest/src/main/java/org/dspace/app/rest/link/search/FacetResultsHalLinkFactory.java +++ b/dspace-spring-rest/src/main/java/org/dspace/app/rest/link/search/FacetResultsHalLinkFactory.java @@ -21,8 +21,8 @@ public class FacetResultsHalLinkFactory extends DiscoveryRestHalLinkFactory(list, data.getPage(), - list.size() + (data.isHasMore() ? 1 : 0)); + PageImpl page = new PageImpl<>(data.getFacetResultList(), data.getPage(), + data.getFacetResultList().size() + (data.isHasMore() ? 1 : 0)); halResource.setPageHeader(new EmbeddedPageHeader(buildFacetBaseLink(data), page, false)); }