From 694079df04aaf20e2c8dd5b37a5f2ab24b5a5657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Grande=20P=C3=A9rez?= Date: Mon, 28 Oct 2019 14:44:11 +0100 Subject: [PATCH] DATAREST-1446 - DefaultExcerptProjector now declines presence of projection if metadata returns Optional.empty(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If no excerpt projection is exposed by the underlying ResourceMetadata, DefaultExcerptProjector now also properly declines its existence in ….hasExcerptProjection(…). Previously, it always indicated a presence as it improperly used a null check rather than calling Optional.isPresent(). Original pull request: #366. --- .../data/rest/webmvc/support/DefaultExcerptProjector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java index 5bc22a43c..f82adb4d1 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/DefaultExcerptProjector.java @@ -64,6 +64,6 @@ public class DefaultExcerptProjector implements ExcerptProjector { public boolean hasExcerptProjection(Class type) { ResourceMetadata metadata = mappings.getMetadataFor(type); - return metadata == null ? false : metadata.getExcerptProjection() != null; + return metadata == null ? false : metadata.getExcerptProjection().isPresent(); } }