Merge branch '2.0.x'

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfiguration.java

@@ -81,11 +81,9 @@ public class ServletEndpointManagementContextConfiguration {
 
 		private Set<String> getServletPaths(WebEndpointProperties properties,
 				DispatcherServletPathProvider servletPathProvider) {
-			Set<String> servletPaths = servletPathProvider.getServletPaths();
-			return servletPaths.stream().map((p) -> {
-				String path = cleanServletPath(p);
-				return path + properties.getBasePath();
-			}).collect(Collectors.toSet());
+			return servletPathProvider.getServletPaths().stream()
+					.map((p) -> cleanServletPath(p) + properties.getBasePath())
+					.collect(Collectors.toSet());
 		}
 
 		private String cleanServletPath(String servletPath) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsAutoConfiguration.java

@@ -82,12 +82,12 @@ public class RestTemplateMetricsAutoConfiguration {
 	}
 
 	/**
-	 * {@link MeterFilter} to deny further client requests and log a warning.
+	 * {@link MeterFilter} to deny further URI tags and log a warning.
 	 */
 	private static class MaximumUriTagsReachedMeterFilter implements MeterFilter {
 
 		private final Logger logger = LoggerFactory
-				.getLogger(RestTemplateMetricsAutoConfiguration.class);
+				.getLogger(MaximumUriTagsReachedMeterFilter.class);
 
 		private final String metricName;
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java

@@ -58,6 +58,12 @@ public abstract class AbstractDependsOnBeanFactoryPostProcessor
 		this.dependsOn = dependsOn;
 	}
 
+	/**
+	 * Create an instance with target bean class and dependencies.
+	 * @param beanClass target bean class
+	 * @param dependsOn dependencies
+	 * @since 2.0.4
+	 */
 	protected AbstractDependsOnBeanFactoryPostProcessor(Class<?> beanClass,
 			String... dependsOn) {
 		this(beanClass, null, dependsOn);

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

@@ -210,7 +210,7 @@ public class FlywayAutoConfiguration {
 
 		/**
 		 * Additional configuration to ensure that {@link EntityManagerFactory} beans
-		 * depend-on the {@code flywayInitializer} bean.
+		 * depend on the {@code flywayInitializer} bean.
 		 */
 		@Configuration
 		@ConditionalOnClass(LocalContainerEntityManagerFactoryBean.class)
@@ -225,7 +225,7 @@ public class FlywayAutoConfiguration {
 		}
 
 		/**
-		 * Additional configuration to ensure that {@link JdbcOperations} beans depend-on
+		 * Additional configuration to ensure that {@link JdbcOperations} beans depend on
 		 * the {@code flywayInitializer} bean.
 		 */
 		@Configuration
@@ -243,8 +243,8 @@ public class FlywayAutoConfiguration {
 	}
 
 	/**
-	 * Additional configuration to ensure that {@link EntityManagerFactory} beans
-	 * depend-on the {@code flyway} bean.
+	 * Additional configuration to ensure that {@link EntityManagerFactory} beans depend
+	 * on the {@code flyway} bean.
 	 */
 	@Configuration
 	@ConditionalOnClass(LocalContainerEntityManagerFactoryBean.class)
@@ -259,16 +259,16 @@ public class FlywayAutoConfiguration {
 	}
 
 	/**
-	 * Additional configuration to ensure that {@link JdbcOperations} beans depend-on the
+	 * Additional configuration to ensure that {@link JdbcOperations} beans depend on the
 	 * {@code flyway} bean.
 	 */
 	@Configuration
 	@ConditionalOnClass(JdbcOperations.class)
 	@ConditionalOnBean(JdbcOperations.class)
-	protected static class FlywayJdbcDependencyConfiguration
+	protected static class FlywayJdbcOperationsDependencyConfiguration
 			extends JdbcOperationsDependsOnPostProcessor {
 
-		public FlywayJdbcDependencyConfiguration() {
+		public FlywayJdbcOperationsDependencyConfiguration() {
 			super("flyway");
 		}
 

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

 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -33,7 +33,7 @@ import org.springframework.orm.jpa.AbstractEntityManagerFactoryBean;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 
 /**
- * Additional configuration to ensure that {@link EntityManagerFactory} beans depend-on
+ * Additional configuration to ensure that {@link EntityManagerFactory} beans depend on
  * the {@code hazelcastInstance} bean.
  *
  * @author Stephane Nicoll

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

@@ -183,8 +183,8 @@ public class LiquibaseAutoConfiguration {
 	}
 
 	/**
-	 * Additional configuration to ensure that {@link EntityManagerFactory} beans
-	 * depend-on the liquibase bean.
+	 * Additional configuration to ensure that {@link EntityManagerFactory} beans depend
+	 * on the liquibase bean.
 	 */
 	@Configuration
 	@ConditionalOnClass(LocalContainerEntityManagerFactoryBean.class)
@@ -199,7 +199,7 @@ public class LiquibaseAutoConfiguration {
 	}
 
 	/**
-	 * Additional configuration to ensure that {@link JdbcOperations} beans depend-on the
+	 * Additional configuration to ensure that {@link JdbcOperations} beans depend on the
 	 * liquibase bean.
 	 */
 	@Configuration