From 5a9865dabb191da40dd21067e97bed746c2c1d50 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 13 Feb 2018 00:47:57 +0900 Subject: [PATCH] Polish Closes gh-12004 --- .../actuate/autoconfigure/metrics/MetricsProperties.java | 2 +- .../autoconfigure/metrics/PropertiesMeterFilterTests.java | 2 +- .../metrics/ServiceLevelAgreementBoundaryTests.java | 2 +- .../encodepassword/EncodePasswordCommandTests.java | 4 ++-- .../main/asciidoc/appendix-application-properties.adoc | 4 ++-- .../context/ConfigurableWebServerApplicationContext.java | 2 +- .../boot/web/context/WebServerApplicationContext.java | 4 ++-- .../boot/context/properties/bind/JavaBeanBinderTests.java | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java index 3098e80c049..d6759f93f82 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java @@ -174,7 +174,7 @@ public class MetricsProperties { /** * Specific SLA boundaries for meter IDs starting-with the specified name. The * longest match wins, the key `all` can also be used to configure all meters. - * Counters will be published for each sepecified boundary. Values can be + * Counters will be published for each specified boundary. Values can be * specified as a long or as a Duration value (for timer meters, defaulting to ms * if no unit specified). */ diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilterTests.java index 74812274f5e..5c5e461c4ef 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilterTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilterTests.java @@ -39,7 +39,7 @@ import org.springframework.mock.env.MockEnvironment; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests fir {@link PropertiesMeterFilter}. + * Tests for {@link PropertiesMeterFilter}. * * @author Phillip Webb * @author Jon Schneider diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundaryTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundaryTests.java index eabbde15a05..99875e6467b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundaryTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/ServiceLevelAgreementBoundaryTests.java @@ -65,7 +65,7 @@ public class ServiceLevelAgreementBoundaryTests { } @Test - public void getValueForTimerWhenFromDurationStringShouldReturnDrationNanos() { + public void getValueForTimerWhenFromDurationStringShouldReturnDurationNanos() { ServiceLevelAgreementBoundary sla = ServiceLevelAgreementBoundary .valueOf("123ms"); assertThat(sla.getValue(Type.TIMER)).isEqualTo(123000000); diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommandTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommandTests.java index 1376fec812a..0c3029da550 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommandTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommandTests.java @@ -56,7 +56,7 @@ public class EncodePasswordCommandTests { } @Test - public void encodeWithNoAlgorithShouldUseBcrypt() throws Exception { + public void encodeWithNoAlgorithmShouldUseBcrypt() throws Exception { EncodePasswordCommand command = new EncodePasswordCommand(); ExitStatus status = command.run("boot"); verify(this.log).info(this.message.capture()); @@ -89,7 +89,7 @@ public class EncodePasswordCommandTests { } @Test - public void encodeWithUnkownAlgorithShouldExitWithError() throws Exception { + public void encodeWithUnknownAlgorithmShouldExitWithError() throws Exception { EncodePasswordCommand command = new EncodePasswordCommand(); ExitStatus status = command.run("--algorithm", "bad", "boot"); verify(this.log) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 5efa8656986..a0d0cbc1294 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -131,7 +131,7 @@ content into your application. Rather, pick only the properties that you need. # OUTPUT spring.output.ansi.enabled=detect # Configures the ANSI output. - # PID FILE ({sc-spring-boot}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter]) + # PID FILE ({sc-spring-boot}/context/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter]) spring.pid.fail-on-write-error= # Fails if ApplicationPidFileWriter is used but it cannot write the PID file. spring.pid.file= # Location of the PID file to write (if ApplicationPidFileWriter is used). @@ -1206,7 +1206,7 @@ content into your application. Rather, pick only the properties that you need. management.endpoint.heapdump.cache.time-to-live=0ms # Maximum time that a response can be cached. management.endpoint.heapdump.enabled= # Whether to enable the heapdump endpoint. - # HTTP TRACE ENDPOINT ({sc-spring-boot-actuator}/web/trace/HttpTraceEndpoint.{sc-ext}[HttpTraceEndpoint]) + # HTTP TRACE ENDPOINT ({sc-spring-boot-actuator}/trace/http/HttpTraceEndpoint.{sc-ext}[HttpTraceEndpoint]) management.endpoint.httptrace.cache.time-to-live=0ms # Maximum time that a response can be cached. management.endpoint.httptrace.enabled= # Whether to enable the HTTP trace endpoint. diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ConfigurableWebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ConfigurableWebServerApplicationContext.java index 3e368505024..96020914bfd 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ConfigurableWebServerApplicationContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ConfigurableWebServerApplicationContext.java @@ -31,7 +31,7 @@ public interface ConfigurableWebServerApplicationContext /** * Set the server namespace of the context. - * @param serverNamespace the server namespance + * @param serverNamespace the server namespace * @see #getServerNamespace() */ void setServerNamespace(String serverNamespace); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/WebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/WebServerApplicationContext.java index f72067cbf32..db1a27411f7 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/WebServerApplicationContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/WebServerApplicationContext.java @@ -21,7 +21,7 @@ import org.springframework.context.ApplicationContext; /** * Interface to be implemented by {@link ApplicationContext application contexts} that - * create and manage the lifecyle of an embedded {@link WebServer}. + * create and manage the lifecycle of an embedded {@link WebServer}. * * @author Phillip Webb * @since 2.0.0 @@ -37,7 +37,7 @@ public interface WebServerApplicationContext extends ApplicationContext { /** * Returns the namespace of the web server application context or {@code null} if no - * namepace has been set. Used for disambiguation when multiple web servers are + * namespace has been set. Used for disambiguation when multiple web servers are * running in the same application (for example a management context running on a * different port). * @return the server namespace diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java index 11fde425f85..509e8cd8b64 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/JavaBeanBinderTests.java @@ -212,12 +212,12 @@ public class JavaBeanBinderTests { } @Test - public void bindToClassShouldBindToCollectionWithDelimeter() { + public void bindToClassShouldBindToCollectionWithDelimiter() { MockConfigurationPropertySource source = new MockConfigurationPropertySource(); source.put("foo.collection", "foo-bar|bar-baz"); this.sources.add(source); - ExampleCollectionBeanWithDelimeter bean = this.binder - .bind("foo", Bindable.of(ExampleCollectionBeanWithDelimeter.class)).get(); + ExampleCollectionBeanWithDelimiter bean = this.binder + .bind("foo", Bindable.of(ExampleCollectionBeanWithDelimiter.class)).get(); assertThat(bean.getCollection()).containsExactly(ExampleEnum.FOO_BAR, ExampleEnum.BAR_BAZ); } @@ -629,7 +629,7 @@ public class JavaBeanBinderTests { } - public static class ExampleCollectionBeanWithDelimeter { + public static class ExampleCollectionBeanWithDelimiter { @Delimiter("|") private Collection collection;