From ee6fc8d9177d043616e904f07e62a6ecb8993d2d Mon Sep 17 00:00:00 2001 From: izeye Date: Tue, 28 Jul 2015 11:47:52 +0900 Subject: [PATCH] Fix typos Closes gh-3608 --- .../boot/autoconfigure/web/ServerProperties.java | 4 ++-- .../tunnel/payload/HttpTunnelPayloadForwarderTests.java | 2 +- .../src/main/asciidoc/appendix-configuration-metadata.adoc | 2 +- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 2 +- .../java/org/springframework/boot/ApplicationArguments.java | 4 ++-- .../main/java/org/springframework/boot/ApplicationRunner.java | 2 +- .../boot/DefaultApplicationArgumentsTests.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index 6d034d04ce..4818783449 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -206,7 +206,7 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer, Ord } /** - * Set the session timeout + * Get the session timeout * @return the session timeout * @deprecated since 1.3.0 in favor of {@code session.timeout}. */ @@ -217,7 +217,7 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer, Ord } /** - * Get the session timeout + * Set the session timeout * @param sessionTimeout the session timeout * @deprecated since 1.3.0 in favor of {@code session.timeout}. */ diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarderTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarderTests.java index 28d007b78f..62f0212dbe 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarderTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarderTests.java @@ -41,7 +41,7 @@ public class HttpTunnelPayloadForwarderTests { public ExpectedException thrown = ExpectedException.none(); @Test - public void targetChannelMustNoBeNull() throws Exception { + public void targetChannelMustNotBeNull() throws Exception { this.thrown.expect(IllegalArgumentException.class); this.thrown.expectMessage("TargetChannel must not be null"); new HttpTunnelPayloadForwarder(null); diff --git a/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc b/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc index 955c7a039a..efd77301a4 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc @@ -499,7 +499,7 @@ on the classpath. This provider supports these parameters: The following types can be used: -* Any `java.lang.Enum` that list the possible values for the property (By all means, try to +* Any `java.lang.Enum` that lists the possible values for the property (By all means, try to define the property with the `Enum` type instead as no further hint should be required for the IDE to auto-complete the values). * `java.nio.charset.Charset`: auto-completion of charset/encoding values (e.g. `UTF-8`) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index e61105729e..1292868dcb 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -1880,7 +1880,7 @@ provider for more flexibility). To limit the scope that the client asks for when it obtains an access token you can set `security.oauth2.client.scope` (comma separated or an array in YAML). By default the scope -is empty and it is up to to Authorization Server to decide what the defaults should be, +is empty and it is up to Authorization Server to decide what the defaults should be, usually depending on the settings in the client registration that it holds. NOTE: There is also a setting for `security.oauth2.client.client-authentication-scheme` diff --git a/spring-boot/src/main/java/org/springframework/boot/ApplicationArguments.java b/spring-boot/src/main/java/org/springframework/boot/ApplicationArguments.java index d7c08c0795..94b61b6eba 100644 --- a/spring-boot/src/main/java/org/springframework/boot/ApplicationArguments.java +++ b/spring-boot/src/main/java/org/springframework/boot/ApplicationArguments.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Set; /** - * Provides access to the arguments that were used run a {@link SpringApplication}. + * Provides access to the arguments that were used to run a {@link SpringApplication}. * * @author Phillip Webb * @since 1.3.0 @@ -44,7 +44,7 @@ public interface ApplicationArguments { * Return whether the set of option arguments parsed from the arguments contains an * option with the given name. * @param name the name to check - * @return {@code true} if the arguments contains an option with the given name + * @return {@code true} if the arguments contain an option with the given name */ boolean containsOption(String name); diff --git a/spring-boot/src/main/java/org/springframework/boot/ApplicationRunner.java b/spring-boot/src/main/java/org/springframework/boot/ApplicationRunner.java index f87abaadb8..1765032b3e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/ApplicationRunner.java +++ b/spring-boot/src/main/java/org/springframework/boot/ApplicationRunner.java @@ -21,7 +21,7 @@ import org.springframework.core.annotation.Order; /** * Interface used to indicate that a bean should run when it is contained within - * a {@link SpringApplication}. Multiple {@link ApplicationArguments} beans can be defined + * a {@link SpringApplication}. Multiple {@link ApplicationRunner} beans can be defined * within the same application context and can be ordered using the {@link Ordered} * interface or {@link Order @Order} annotation. * diff --git a/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java b/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java index 3596e325a9..fbbad162cb 100644 --- a/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java @@ -42,7 +42,7 @@ public class DefaultApplicationArgumentsTests { public ExpectedException thrown = ExpectedException.none(); @Test - public void argumentsMustNoBeNull() throws Exception { + public void argumentsMustNotBeNull() throws Exception { this.thrown.expect(IllegalArgumentException.class); this.thrown.expectMessage("Args must not be null"); new DefaultApplicationArguments(null);