From 885c28891bee00d136122c5f408a07afdf276aa7 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Fri, 8 Feb 2019 10:08:54 +0900 Subject: [PATCH] Polish Closes gh-15873 --- CONTRIBUTING.adoc | 2 +- .../export/dynatrace/DynatracePropertiesConfigAdapter.java | 2 +- .../src/main/asciidoc/spring-boot-features.adoc | 2 +- .../boot/web/embedded/netty/SslServerCustomizer.java | 4 +--- .../boot/web/embedded/undertow/SslBuilderCustomizer.java | 4 +--- .../boot/context/properties/bind/CollectionBinderTests.java | 6 +++--- .../boot/web/embedded/jetty/SslServerCustomizerTests.java | 3 +-- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 7b85793b348..9da4719287f 100755 --- 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 index 11e1e8d4018..1d1601777ee 100644 --- 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 @@ import org.springframework.boot.actuate.autoconfigure.metrics.export.properties. /** * Adapter to convert {@link DynatraceProperties} to a {@link DynatraceConfig}. * - * @author Andy Wilkinson * + * @author Andy Wilkinson */ class DynatracePropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapter 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 index d30865555ba..83a3013396d 100644 --- 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 @@ -6395,7 +6395,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 index 5ea9c6df47b..7c487db6761 100644 --- 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 @@ public class SslServerCustomizer implements NettyServerCustomizer { 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 index 2408cab336a..ffb4512af93 100644 --- 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 @@ class SslBuilderCustomizer implements UndertowBuilderCustomizer { 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 index 85d2e0dab37..0bb54f7f1e0 100644 --- 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 class CollectionBinderTests { 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 class CollectionBinderTests { } - public static class BeanWithEnumsetCollection { + public static class BeanWithEnumSetCollection { private List> 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 index 0e94164bac4..dde80d69ced 100644 --- 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 class SslServerCustomizerTests { } @Test - public void configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException() - throws Exception { + public void configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException() { Ssl ssl = new Ssl(); SslServerCustomizer customizer = new SslServerCustomizer(null, ssl, null, null); assertThatExceptionOfType(Exception.class)