From 622e65a2902cf064818c9ad217a171e1eee0c7fb Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 25 Oct 2017 17:54:39 +0100 Subject: [PATCH] Align simple sample with configuration properties validation change See gh-8024 --- .../java/sample/simple/SampleConfigurationProperties.java | 2 ++ .../test/java/sample/simple/SampleSimpleApplicationTests.java | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleConfigurationProperties.java b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleConfigurationProperties.java index 566e9010c5..bef6ceedb5 100644 --- a/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleConfigurationProperties.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleConfigurationProperties.java @@ -20,7 +20,9 @@ import javax.validation.constraints.NotNull; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; +@Validated @Component @ConfigurationProperties(prefix = "sample") public class SampleConfigurationProperties { diff --git a/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SampleSimpleApplicationTests.java b/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SampleSimpleApplicationTests.java index 6c3fa848a2..4b70473be4 100644 --- a/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SampleSimpleApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SampleSimpleApplicationTests.java @@ -58,10 +58,6 @@ public class SampleSimpleApplicationTests { SampleSimpleApplication.main(new String[0]); String output = this.outputCapture.toString(); assertThat(output).contains("Hello Phil"); - assertThat(output).contains("The @ConfigurationProperties bean class " - + "sample.simple.SampleConfigurationProperties contains " - + "validation constraints but had not been annotated " - + "with @Validated"); } @Test