Merge branch '2.0.x'

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java

@@ -80,14 +80,13 @@ public class PropertiesMeterFilter implements MeterFilter {
 	@Override
 	public DistributionStatisticConfig configure(Meter.Id id,
 			DistributionStatisticConfig config) {
-		DistributionStatisticConfig.Builder builder = DistributionStatisticConfig
-				.builder();
 		Distribution distribution = this.properties.getDistribution();
-		builder.percentilesHistogram(
+		return DistributionStatisticConfig.builder()
-				lookup(distribution.getPercentilesHistogram(), id, null));
+				.percentilesHistogram(
-		builder.percentiles(lookup(distribution.getPercentiles(), id, null));
+						lookup(distribution.getPercentilesHistogram(), id, null))
-		builder.sla(convertSla(id.getType(), lookup(distribution.getSla(), id, null)));
+				.percentiles(lookup(distribution.getPercentiles(), id, null))
-		return builder.build().merge(config);
+				.sla(convertSla(id.getType(), lookup(distribution.getSla(), id, null)))
+				.build().merge(config);
 	}
 
 	private long[] convertSla(Meter.Type meterType, ServiceLevelAgreementBoundary[] sla) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequestTests.java

@@ -139,7 +139,7 @@ public class EndpointRequestTests {
 	}
 
 	@Test
-	public void toLinksWhenServletPathNotEmptyShouldNotMatch() {
+	public void toLinksWhenServletPathNotEmptyShouldMatch() {
 		RequestMatcher matcher = EndpointRequest.toLinks();
 		RequestMatcherAssert assertMatcher = assertMatcher(matcher, "/actuator",
 				"/spring");

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java

@@ -328,7 +328,7 @@ public class HibernateJpaAutoConfigurationTests
 	}
 
 	@Test
-	public void hibernatePropertiesCustomizerTakePrecedenceOverStrategyInstancesAndNamingStrategyProperties() {
+	public void hibernatePropertiesCustomizerTakesPrecedenceOverStrategyInstancesAndNamingStrategyProperties() {
 		contextRunner()
 				.withUserConfiguration(
 						TestHibernatePropertiesCustomizerConfiguration.class,

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/quartz/tables_h2.sql

@@ -2,7 +2,7 @@
 
 CREATE TABLE QRTZ_TEST_TABLE (
   SCHED_NAME VARCHAR(120) NOT NULL,
-  CALENDAR_NAME VARCHAR (200)  NOT NULL
+  CALENDAR_NAME VARCHAR (200) NOT NULL
 );
 
 ## Another comment

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -913,7 +913,7 @@ Lombok does not generate any particular constructor for such a type, as it is us
 automatically by the container to instantiate the object.
 
 Finally, only standard Java Bean properties are considered and binding on static
-properties are not supported.
+properties is not supported.
 ====
 
 TIP: See also the <<boot-features-external-config-vs-value,differences between `@Value`
@@ -4680,7 +4680,7 @@ relevant annotation to its method, as shown in the following example:
 
 [source,java,indent=0]
 ----
-    import org.springframework.cache.annotation.Cacheable;
+	import org.springframework.cache.annotation.Cacheable;
 	import org.springframework.stereotype.Component;
 
 	@Component
@@ -6258,7 +6258,7 @@ method's application class>>.
 
 The underlying component scan configuration of `@SpringBootApplication` defines exclude
 filters that are used to make sure slicing works as expected. If you are using an explicit
-`@ComponentScan` directive on your `@SpringBootApplication`-annoted class, be aware that
+`@ComponentScan` directive on your `@SpringBootApplication`-annotated class, be aware that
 those filters will be disabled. If you are using slicing, you should define them again.
 ====
 
@@ -8033,7 +8033,7 @@ instance lifecycle to "per-class"].
 * https://try.kotlinlang.org/[Try Kotlin in your browser]
 * https://blog.jetbrains.com/kotlin/[Kotlin blog]
 * https://kotlin.link/[Awesome Kotlin]
-* https://spring.io/guides/tutorials/spring-boot-kotlin/[Tutorial: building web applications with Spring Boot and Kotlin ]
+* https://spring.io/guides/tutorials/spring-boot-kotlin/[Tutorial: building web applications with Spring Boot and Kotlin]
 * https://spring.io/blog/2016/02/15/developing-spring-boot-applications-with-kotlin[Developing Spring Boot applications with Kotlin]
 * https://spring.io/blog/2016/03/20/a-geospatial-messenger-with-kotlin-spring-boot-and-postgresql[A Geospatial Messenger with Kotlin, Spring Boot and PostgreSQL]
 * https://spring.io/blog/2017/01/04/introducing-kotlin-support-in-spring-framework-5-0[Introducing Kotlin support in Spring Framework 5.0]

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java

@@ -384,7 +384,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
 	 * @param element the parent element of the field (i.e. its holding class)
 	 * @param getter {@code true} to look for the read accessor, {@code false} for the
 	 * write accessor
-	 * @return {@code true} if this field is a public accessor of the specified type
+	 * @return {@code true} if this field has a public accessor of the specified type
 	 */
 	private boolean hasLombokPublicAccessor(VariableElement field, TypeElement element,
 			boolean getter) {