Merge branch '1.5.x'

spring-boot-samples/spring-boot-sample-simple/pom.xml

@@ -24,6 +24,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+		</dependency>
 		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-boot-samples/spring-boot-sample-simple/src/main/java/sample/simple/SampleConfigurationProperties.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2012-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.simple;
+
+import javax.validation.constraints.NotNull;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "sample")
+public class SampleConfigurationProperties {
+
+	@NotNull
+	private String name;
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}

spring-boot-samples/spring-boot-sample-simple/src/main/resources/application.properties

@@ -1 +1,3 @@
-name: Phil
+name=Phil
+sample.name=Andy
+

spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SampleSimpleApplicationTests.java

@@ -58,6 +58,10 @@ 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

spring-boot-samples/spring-boot-sample-simple/src/test/resources/application.properties

@@ -1 +0,0 @@
-name: Phil