Closes gh-15873
pull/15889/head
Johnny Lim 6 years ago committed by Stephane Nicoll
parent 7bdcee5e3d
commit 885c28891b

@ -181,7 +181,7 @@ work with m2eclipse, we provide an additional Eclipse plugin that you can instal
===== Install the Spring Formatter plugin ===== Install the Spring Formatter plugin
* Select "`Help`" -> "`Install New Software`". * Select "`Help`" -> "`Install New Software`".
* Add `https://dl.bintray.com/spring/javaformat-eclipse/` as a site. * 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 NOTE: The plugin is optional. Projects can be imported without the plugins, your code
changes just won't be automatically formatted. changes just won't be automatically formatted.

@ -23,7 +23,7 @@ import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.
/** /**
* Adapter to convert {@link DynatraceProperties} to a {@link DynatraceConfig}. * Adapter to convert {@link DynatraceProperties} to a {@link DynatraceConfig}.
* *
* @author Andy Wilkinson * * @author Andy Wilkinson
*/ */
class DynatracePropertiesConfigAdapter class DynatracePropertiesConfigAdapter
extends StepRegistryPropertiesConfigAdapter<DynatraceProperties> extends StepRegistryPropertiesConfigAdapter<DynatraceProperties>

@ -6395,7 +6395,7 @@ configured as it requires an `AsyncTaskExecutor` implementation (named
an `AsyncConfigurer` wrapping your custom `Executor`. an `AsyncConfigurer` wrapping your custom `Executor`.
The auto-configured `TaskExecutorBuilder` allows you to easily create instances that 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 The thread pool uses 8 core threads that can grow and shrink according to the load. Those

@ -152,9 +152,7 @@ public class SslServerCustomizer implements NettyServerCustomizer {
if (resource == null) { if (resource == null) {
return 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, private KeyStore loadStore(String type, String provider, String resource,

@ -182,9 +182,7 @@ class SslBuilderCustomizer implements UndertowBuilderCustomizer {
if (resource == null) { if (resource == null) {
return 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, private KeyStore loadStore(String type, String provider, String resource,

@ -450,8 +450,8 @@ public class CollectionBinderTests {
MockConfigurationPropertySource source = new MockConfigurationPropertySource(); MockConfigurationPropertySource source = new MockConfigurationPropertySource();
source.put("foo.values[0]", "foo-bar,bar-baz"); source.put("foo.values[0]", "foo-bar,bar-baz");
this.sources.add(source); this.sources.add(source);
BeanWithEnumsetCollection result = this.binder BeanWithEnumSetCollection result = this.binder
.bind("foo", Bindable.of(BeanWithEnumsetCollection.class)).get(); .bind("foo", Bindable.of(BeanWithEnumSetCollection.class)).get();
assertThat(result.getValues().get(0)).containsExactly(ExampleEnum.FOO_BAR, assertThat(result.getValues().get(0)).containsExactly(ExampleEnum.FOO_BAR,
ExampleEnum.BAR_BAZ); ExampleEnum.BAR_BAZ);
} }
@ -574,7 +574,7 @@ public class CollectionBinderTests {
} }
public static class BeanWithEnumsetCollection { public static class BeanWithEnumSetCollection {
private List<EnumSet<ExampleEnum>> values; private List<EnumSet<ExampleEnum>> values;

@ -82,8 +82,7 @@ public class SslServerCustomizerTests {
} }
@Test @Test
public void configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException() public void configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException() {
throws Exception {
Ssl ssl = new Ssl(); Ssl ssl = new Ssl();
SslServerCustomizer customizer = new SslServerCustomizer(null, ssl, null, null); SslServerCustomizer customizer = new SslServerCustomizer(null, ssl, null, null);
assertThatExceptionOfType(Exception.class) assertThatExceptionOfType(Exception.class)

Loading…
Cancel
Save