Merge branch 'gh-7579' into 1.5.x

Author: philwebb

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java

@@ -26,7 +26,7 @@
  * @author Christian Dupuis
  * @since 1.2.0
  */
-@ConfigurationProperties("management.health.status")
+@ConfigurationProperties(prefix = "management.health.status")
 public class HealthIndicatorProperties {
 
 	/**

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java

@@ -20,15 +20,16 @@
 import java.util.Arrays;
 import java.util.List;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpSession;
-import javax.validation.constraints.NotNull;
 
 import org.springframework.boot.autoconfigure.security.SecurityPrerequisite;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.embedded.Ssl;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
+import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
@@ -78,7 +79,6 @@ public class ManagementServerProperties implements SecurityPrerequisite {
 	/**
 	 * Management endpoint context-path.
 	 */
-	@NotNull
 	private String contextPath = "";
 
 	/**
@@ -88,6 +88,11 @@ public class ManagementServerProperties implements SecurityPrerequisite {
 
 	private final Security security = new Security();
 
+	@PostConstruct
+	private void validate() {
+		Assert.notNull(this.contextPath, "ContextPath must not be null");
+	}
+
 	/**
 	 * Returns the management port or {@code null} if the
 	 * {@link ServerProperties#getPort() server port} should be used.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterProperties.java

@@ -29,7 +29,7 @@
  * @author Phillip Webb
  * @since 1.4.0
  */
-@ConfigurationProperties("endpoints.metrics.filter")
+@ConfigurationProperties(prefix = "endpoints.metrics.filter")
 public class MetricFilterProperties {
 
 	/**

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractEndpoint.java

@@ -16,11 +16,13 @@
 
 package org.springframework.boot.actuate.endpoint;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import java.util.regex.Pattern;
+
+import javax.annotation.PostConstruct;
 
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
+import org.springframework.util.Assert;
 
 /**
  * Abstract base for {@link Endpoint} implementations.
@@ -31,14 +33,14 @@
  */
 public abstract class AbstractEndpoint<T> implements Endpoint<T>, EnvironmentAware {
 
+	private static final Pattern ID_PATTERN = Pattern.compile("\\w+");
+
 	private Environment environment;
 
 	/**
 	 * Endpoint identifier. With HTTP monitoring the identifier of the endpoint is mapped
 	 * to a URL (e.g. 'foo' is mapped to '/foo').
 	 */
-	@NotNull
-	@Pattern(regexp = "\\w+", message = "ID must only contains letters, numbers and '_'")
 	private String id;
 
 	private final boolean sensitiveDefault;
@@ -53,6 +55,13 @@ public abstract class AbstractEndpoint<T> implements Endpoint<T>, EnvironmentAwa
 	 */
 	private Boolean enabled;
 
+	@PostConstruct
+	private void validate() {
+		Assert.notNull(this.id, "Id must not be null");
+		Assert.isTrue(ID_PATTERN.matcher(this.id).matches(),
+				"ID must only contains letters, numbers and '_'");
+	}
+
 	/**
 	 * Create a new sensitive endpoint instance. The endpoint will enabled flag will be
 	 * based on the spring {@link Environment} unless explicitly set.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java

@@ -62,9 +62,11 @@ public List<LiquibaseReport> invoke() {
 		for (Map.Entry<String, SpringLiquibase> entry : this.liquibases.entrySet()) {
 			try {
 				DataSource dataSource = entry.getValue().getDataSource();
-				JdbcConnection connection = new JdbcConnection(dataSource.getConnection());
+				JdbcConnection connection = new JdbcConnection(
+						dataSource.getConnection());
 				try {
-					Database database = factory.findCorrectDatabaseImplementation(connection);
+					Database database = factory
+							.findCorrectDatabaseImplementation(connection);
 					reports.add(new LiquibaseReport(entry.getKey(),
 							service.queryDatabaseChangeLogTable(database)));
 				}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AbstractMvcEndpoint.java

@@ -16,13 +16,13 @@
 
 package org.springframework.boot.actuate.endpoint.mvc;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import javax.annotation.PostConstruct;
 
 import org.springframework.boot.actuate.endpoint.Endpoint;
 import org.springframework.boot.actuate.endpoint.EndpointProperties;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
+import org.springframework.util.Assert;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 /**
@@ -41,8 +41,6 @@ public abstract class AbstractMvcEndpoint extends WebMvcConfigurerAdapter
 	/**
 	 * Endpoint URL path.
 	 */
-	@NotNull
-	@Pattern(regexp = "/.*|^$", message = "Path must start with / or be empty")
 	private String path;
 
 	/**
@@ -68,6 +66,13 @@ public AbstractMvcEndpoint(String path, boolean sensitive, boolean enabled) {
 		this.enabled = enabled;
 	}
 
+	@PostConstruct
+	private void validate() {
+		Assert.notNull(this.path, "Path must not be null");
+		Assert.isTrue(this.path.length() == 0 || this.path.startsWith("/"),
+				"Path must start with / or be empty");
+	}
+
 	@Override
 	public void setEnvironment(Environment environment) {
 		this.environment = environment;

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/DocsMvcEndpoint.java

@@ -27,7 +27,7 @@
  * @author Dave Syer
  * @since 1.3.0
  */
-@ConfigurationProperties("endpoints.docs")
+@ConfigurationProperties(prefix = "endpoints.docs")
 public class DocsMvcEndpoint extends AbstractNamedMvcEndpoint {
 
 	private static final String DOCS_LOCATION = "classpath:/META-INF/resources/spring-boot-actuator/docs/";

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java

@@ -31,7 +31,7 @@
  * @author Andy Wilkinson
  * @since 1.3.0
  */
-@ConfigurationProperties("endpoints.actuator")
+@ConfigurationProperties(prefix = "endpoints.actuator")
 public class HalJsonMvcEndpoint extends AbstractNamedMvcEndpoint {
 
 	private final ManagementServletContext managementServletContext;

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java

@@ -54,7 +54,7 @@
  * @author Phillip Webb
  * @since 1.4.0
  */
-@ConfigurationProperties("endpoints.heapdump")
+@ConfigurationProperties(prefix = "endpoints.heapdump")
 @HypermediaDisabled
 public class HeapdumpMvcEndpoint extends AbstractNamedMvcEndpoint {
 

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicatorProperties.java

@@ -27,7 +27,7 @@
  * @author Andy Wilkinson
  * @since 1.2.0
  */
-@ConfigurationProperties("management.health.diskspace")
+@ConfigurationProperties(prefix = "management.health.diskspace")
 public class DiskSpaceHealthIndicatorProperties {
 
 	private static final int MEGABYTES = 1024 * 1024;

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java

@@ -32,7 +32,7 @@
  * @author Simon Buettner
  * @since 1.3.0
  */
-@ConfigurationProperties("spring.metrics.export")
+@ConfigurationProperties(prefix = "spring.metrics.export")
 public class MetricExportProperties extends TriggerProperties {
 
 	/**

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java

@@ -26,7 +26,7 @@
  * @author Vedran Pavic
  * @since 1.2.0
  */
-@ConfigurationProperties("spring.batch")
+@ConfigurationProperties(prefix = "spring.batch")
 public class BatchProperties {
 
 	private static final String DEFAULT_SCHEMA_LOCATION = "classpath:org/springframework/"

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java

@@ -27,7 +27,7 @@
  * @author Stephane Nicoll
  * @since 1.3.0
  */
-@ConfigurationProperties("spring.data.rest")
+@ConfigurationProperties(prefix = "spring.data.rest")
 public class RepositoryRestProperties {
 
 	/**

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java

@@ -27,7 +27,7 @@
  * @author Stephane Nicoll
  * @since 1.4.0
  */
-@ConfigurationProperties("spring.elasticsearch.jest")
+@ConfigurationProperties(prefix = "spring.elasticsearch.jest")
 public class JestProperties {
 
 	/**

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java

@@ -37,10 +37,11 @@
 public class FlywayProperties {
 
 	/**
-	 * Locations of migrations scripts. Can contain the special "{vendor}" placeholder
-	 * to use vendor-specific locations.
+	 * Locations of migrations scripts. Can contain the special "{vendor}" placeholder to
+	 * use vendor-specific locations.
 	 */
-	private List<String> locations = new ArrayList<String>(Collections.singletonList("db/migration"));
+	private List<String> locations = new ArrayList<String>(
+			Collections.singletonList("db/migration"));
 
 	/**
 	 * Check that migration scripts location exists.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleProperties.java

@@ -16,10 +16,10 @@
 
 package org.springframework.boot.autoconfigure.h2;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import javax.annotation.PostConstruct;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.util.Assert;
 
 /**
  * Configuration properties for H2's console.
@@ -35,8 +35,6 @@ public class H2ConsoleProperties {
 	/**
 	 * Path at which the console will be available.
 	 */
-	@NotNull
-	@Pattern(regexp = "/[^?#]*", message = "Path must start with /")
 	private String path = "/h2-console";
 
 	/**
@@ -46,6 +44,13 @@ public class H2ConsoleProperties {
 
 	private final Settings settings = new Settings();
 
+	@PostConstruct
+	private void validate() {
+		Assert.notNull(this.path, "Path must not be null");
+		Assert.isTrue(this.path.length() == 0 || this.path.startsWith("/"),
+				"Path must start with / or be empty");
+	}
+
 	public String getPath() {
 		return this.path;
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastProperties.java

@@ -26,7 +26,7 @@
  * @author Stephane Nicoll
  * @since 1.3.0
  */
-@ConfigurationProperties("spring.hazelcast")
+@ConfigurationProperties(prefix = "spring.hazelcast")
 public class HazelcastProperties {
 
 	/**

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoProperties.java

@@ -28,7 +28,7 @@
  * @author Stephane Nicoll
  * @since 1.4.0
  */
-@ConfigurationProperties("spring.info")
+@ConfigurationProperties(prefix = "spring.info")
 public class ProjectInfoProperties {
 
 	private final Build build = new Build();

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java

@@ -50,7 +50,7 @@ protected <T> T createDataSource(DataSourceProperties properties,
 	static class Tomcat extends DataSourceConfiguration {
 
 		@Bean
-		@ConfigurationProperties("spring.datasource.tomcat")
+		@ConfigurationProperties(prefix = "spring.datasource.tomcat")
 		public org.apache.tomcat.jdbc.pool.DataSource dataSource(
 				DataSourceProperties properties) {
 			org.apache.tomcat.jdbc.pool.DataSource dataSource = createDataSource(
@@ -75,7 +75,7 @@ public org.apache.tomcat.jdbc.pool.DataSource dataSource(
 	static class Hikari extends DataSourceConfiguration {
 
 		@Bean
-		@ConfigurationProperties("spring.datasource.hikari")
+		@ConfigurationProperties(prefix = "spring.datasource.hikari")
 		public HikariDataSource dataSource(DataSourceProperties properties) {
 			return createDataSource(properties, HikariDataSource.class);
 		}
@@ -93,7 +93,7 @@ public HikariDataSource dataSource(DataSourceProperties properties) {
 	static class Dbcp extends DataSourceConfiguration {
 
 		@Bean
-		@ConfigurationProperties("spring.datasource.dbcp")
+		@ConfigurationProperties(prefix = "spring.datasource.dbcp")
 		public org.apache.commons.dbcp.BasicDataSource dataSource(
 				DataSourceProperties properties) {
 			org.apache.commons.dbcp.BasicDataSource dataSource = createDataSource(
@@ -118,7 +118,7 @@ public org.apache.commons.dbcp.BasicDataSource dataSource(
 	static class Dbcp2 extends DataSourceConfiguration {
 
 		@Bean
-		@ConfigurationProperties("spring.datasource.dbcp2")
+		@ConfigurationProperties(prefix = "spring.datasource.dbcp2")
 		public org.apache.commons.dbcp2.BasicDataSource dataSource(
 				DataSourceProperties properties) {
 			return createDataSource(properties,

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java

@@ -29,7 +29,7 @@
  * @author Stephane Nicoll
  * @since 1.2.0
  */
-@ConfigurationProperties("spring.jersey")
+@ConfigurationProperties(prefix = "spring.jersey")
 public class JerseyProperties {
 
 	/**

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java

@@ -54,7 +54,7 @@ static class PooledConnectionFactoryConfiguration {
 
 		@Bean(destroyMethod = "stop")
 		@ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "true", matchIfMissing = false)
-		@ConfigurationProperties("spring.activemq.pool.configuration")
+		@ConfigurationProperties(prefix = "spring.activemq.pool.configuration")
 		public PooledConnectionFactory pooledJmsConnectionFactory(
 				ActiveMQProperties properties) {
 			PooledConnectionFactory pooledConnectionFactory = new PooledConnectionFactory(

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java

@@ -19,11 +19,12 @@
 import java.io.File;
 import java.util.Map;
 
-import javax.validation.constraints.NotNull;
+import javax.annotation.PostConstruct;
 
 import liquibase.integration.spring.SpringLiquibase;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.util.Assert;
 
 /**
  * Configuration properties to configure {@link SpringLiquibase}.
@@ -37,7 +38,6 @@ public class LiquibaseProperties {
 	/**
 	 * Change log configuration path.
 	 */
-	@NotNull
 	private String changeLog = "classpath:/db/changelog/db.changelog-master.yaml";
 
 	/**
@@ -96,6 +96,11 @@ public class LiquibaseProperties {
 	 */
 	private File rollbackFile;
 
+	@PostConstruct
+	private void validate() {
+		Assert.notNull(this.changeLog, "ChangeLog must not be null");
+	}
+
 	public String getChangeLog() {
 		return this.changeLog;
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverProperties.java

@@ -24,7 +24,7 @@
  * @author Stephane Nicoll
  * @since 1.2.0
  */
-@ConfigurationProperties("spring.mobile.devicedelegatingviewresolver")
+@ConfigurationProperties(prefix = "spring.mobile.devicedelegatingviewresolver")
 public class DeviceDelegatingViewResolverProperties {
 
 	/**