Merge branch '2.1.x'

snicoll · snicoll · commit 380d7ec01ced · 2019-02-08T09:21:06.000+01:00
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
@@ -181,7 +181,7 @@ work with m2eclipse, we provide an additional Eclipse plugin that you can instal
 ===== Install the Spring Formatter plugin
 * Select "`Help`" -> "`Install New Software`".
 * Add `https://dl.bintray.com/spring/javaformat-eclipse/` as a site.
-* Install "Spring Java Format"
+* Install "Spring Java Format".
 
 NOTE: The plugin is optional. Projects can be imported without the plugins, your code
 changes just won't be automatically formatted.
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapter.java
@@ -23,7 +23,7 @@
 /**
  * Adapter to convert {@link DynatraceProperties} to a {@link DynatraceConfig}.
  *
- * @author Andy Wilkinson *
+ * @author Andy Wilkinson
  */
 class DynatracePropertiesConfigAdapter
 		extends StepRegistryPropertiesConfigAdapter<DynatraceProperties>
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -6397,7 +6397,7 @@ configured as it requires an `AsyncTaskExecutor` implementation (named
 an `AsyncConfigurer` wrapping your custom `Executor`.
 
 The auto-configured `TaskExecutorBuilder` allows you to easily create instances that
-reproduces what the auto-configuration does by default.
+reproduce what the auto-configuration does by default.
 ====
 
 The thread pool uses 8 core threads that can grow and shrink according to the load. Those
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java
@@ -152,9 +152,7 @@ private KeyStore loadTrustStore(String type, String provider, String resource,
 		if (resource == null) {
 			return null;
 		}
-		else {
-			return loadStore(type, provider, resource, password);
-		}
+		return loadStore(type, provider, resource, password);
 	}
 
 	private KeyStore loadStore(String type, String provider, String resource,
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/SslBuilderCustomizer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/SslBuilderCustomizer.java
@@ -182,9 +182,7 @@ private KeyStore loadTrustStore(String type, String provider, String resource,
 		if (resource == null) {
 			return null;
 		}
-		else {
-			return loadStore(type, provider, resource, password);
-		}
+		return loadStore(type, provider, resource, password);
 	}
 
 	private KeyStore loadStore(String type, String provider, String resource,
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java
@@ -450,8 +450,8 @@ public void bindToBeanWithEnumSetCollection() {
 		MockConfigurationPropertySource source = new MockConfigurationPropertySource();
 		source.put("foo.values[0]", "foo-bar,bar-baz");
 		this.sources.add(source);
-		BeanWithEnumsetCollection result = this.binder
-				.bind("foo", Bindable.of(BeanWithEnumsetCollection.class)).get();
+		BeanWithEnumSetCollection result = this.binder
+				.bind("foo", Bindable.of(BeanWithEnumSetCollection.class)).get();
 		assertThat(result.getValues().get(0)).containsExactly(ExampleEnum.FOO_BAR,
 				ExampleEnum.BAR_BAZ);
 	}
@@ -574,7 +574,7 @@ public List<String> getValues() {
 
 	}
 
-	public static class BeanWithEnumsetCollection {
+	public static class BeanWithEnumSetCollection {
 
 		private List<EnumSet<ExampleEnum>> values;
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/SslServerCustomizerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/SslServerCustomizerTests.java
@@ -82,8 +82,7 @@ public void alpnConnectionFactoryHasNullDefaultProtocolToAllowNegotiationToHttp1
 	}
 
 	@Test
-	public void configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException()
-			throws Exception {
+	public void configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException() {
 		Ssl ssl = new Ssl();
 		SslServerCustomizer customizer = new SslServerCustomizer(null, ssl, null, null);
 		assertThatExceptionOfType(Exception.class)

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`/**`
`24`	`24`	`* Adapter to convert {@link DynatraceProperties} to a {@link DynatraceConfig}.`
`25`	`25`	`*`
`26`		`- * @author Andy Wilkinson *`
	`26`	`+ * @author Andy Wilkinson`
`27`	`27`	`*/`
`28`	`28`	`class DynatracePropertiesConfigAdapter`
`29`	`29`	`extends StepRegistryPropertiesConfigAdapter<DynatraceProperties>`
Original file line number	Diff line number	Diff line change
`@@ -152,9 +152,7 @@ private KeyStore loadTrustStore(String type, String provider, String resource,`
`152`	`152`	`if (resource == null) {`
`153`	`153`	`return null;`
`154`	`154`	`}`
`155`		`- else {`
`156`		`- return loadStore(type, provider, resource, password);`
`157`		`- }`
	`155`	`+ return loadStore(type, provider, resource, password);`
`158`	`156`	`}`
`159`	`157`
`160`	`158`	`private KeyStore loadStore(String type, String provider, String resource,`
Original file line number	Diff line number	Diff line change
`@@ -182,9 +182,7 @@ private KeyStore loadTrustStore(String type, String provider, String resource,`
`182`	`182`	`if (resource == null) {`
`183`	`183`	`return null;`
`184`	`184`	`}`
`185`		`- else {`
`186`		`- return loadStore(type, provider, resource, password);`
`187`		`- }`
	`185`	`+ return loadStore(type, provider, resource, password);`
`188`	`186`	`}`
`189`	`187`
`190`	`188`	`private KeyStore loadStore(String type, String provider, String resource,`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,7 @@ public void alpnConnectionFactoryHasNullDefaultProtocolToAllowNegotiationToHttp1`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Test`
`85`		`- public void configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException()`
`86`		`- throws Exception {`
	`85`	`+ public void configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException() {`
`87`	`86`	`Ssl ssl = new Ssl();`
`88`	`87`	`SslServerCustomizer customizer = new SslServerCustomizer(null, ssl, null, null);`
`89`	`88`	`assertThatExceptionOfType(Exception.class)`