From 2bd6026a2a636bed38f20d1ae55850d987918d75 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 30 Jan 2014 10:37:22 +0000 Subject: [PATCH] Exclude null and empty properties from /autoconfig --- .../actuate/endpoint/AutoConfigurationReportEndpoint.java | 3 +++ .../boot/autoconfigure/AutoConfigurationReportTests.java | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java index 7afbce612e..0f65882ed9 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java @@ -32,6 +32,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.util.StringUtils; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonPropertyOrder; /** @@ -60,6 +62,7 @@ public class AutoConfigurationReportEndpoint extends AbstractEndpoint { * Adapts {@link AutoConfigurationReport} to a JSON friendly structure. */ @JsonPropertyOrder({ "positiveMatches", "negativeMatches" }) + @JsonInclude(Include.NON_EMPTY) public static class Report { private MultiValueMap positiveMatches; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportTests.java index ce09ea47b6..e4961d7eb6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationReportTests.java @@ -112,9 +112,7 @@ public class AutoConfigurationReportTests { this.beanFactory.setParentBeanFactory(new DefaultListableBeanFactory()); AutoConfigurationReport.get((ConfigurableListableBeanFactory) this.beanFactory .getParentBeanFactory()); - this.report = AutoConfigurationReport.get(this.beanFactory); // NB: overrides - // setup - + this.report = AutoConfigurationReport.get(this.beanFactory); assertThat(this.report, not(nullValue())); assertThat(this.report, not(sameInstance(this.report.getParent()))); assertThat(this.report.getParent(), not(nullValue()));