From 5adb5a0ec3b6158da30bc1ca20ea89fbeb6f7691 Mon Sep 17 00:00:00 2001 From: Emmanuel Bruno <emmanuel.bruno@univ-tln.fr> Date: Thu, 18 Mar 2021 18:15:55 +0100 Subject: [PATCH] produces links header only when not empty. --- .../security/filter/response/PaginationLinkFilter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/univtln/bruno/samples/jaxrs/security/filter/response/PaginationLinkFilter.java b/src/main/java/fr/univtln/bruno/samples/jaxrs/security/filter/response/PaginationLinkFilter.java index 50fe23b..3ca3ff7 100644 --- a/src/main/java/fr/univtln/bruno/samples/jaxrs/security/filter/response/PaginationLinkFilter.java +++ b/src/main/java/fr/univtln/bruno/samples/jaxrs/security/filter/response/PaginationLinkFilter.java @@ -13,7 +13,6 @@ import lombok.extern.java.Log; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collector; import java.util.stream.Collectors; @Provider @@ -40,7 +39,7 @@ public class PaginationLinkFilter implements ContainerResponseFilter { UriInfo uriInfo = requestContext.getUriInfo(); Page entity = (Page) responseContext.getEntity(); - if (entity.getPageNumber()>entity.getPageTotal()) + if (entity.getPageNumber() > entity.getPageTotal()) throw new WebApplicationException(Response.Status.NOT_FOUND); //We replace the entity by the content of the page (we remove the envelope). @@ -76,7 +75,8 @@ public class PaginationLinkFilter implements ContainerResponseFilter { .build()); } - responseContext.getHeaders().add("Link", linksList.stream().map(l->l.toString()).collect(Collectors.joining(","))); + if (!linksList.isEmpty()) + responseContext.getHeaders().add("Link", linksList.stream().map(l -> l.toString()).collect(Collectors.joining(","))); //We add pagination metadata in the header responseContext.getHeaders().add(JAXRS_SAMPLE_TOTAL_COUNT, entity.getElementTotal()); responseContext.getHeaders().add(JAXRS_SAMPLE_PAGE_COUNT, entity.getPageTotal()); -- GitLab