From f4589e7cc3f1f67e20f535cfe623392383ae8139 Mon Sep 17 00:00:00 2001 From: izeye Date: Wed, 15 Jul 2015 20:16:30 +0900 Subject: [PATCH] Fix typos Closes gh-3504 --- .../boot/autoconfigure/cache/CacheProperties.java | 2 +- .../jdbc/metadata/CommonsDbcpDataSourcePoolMetadata.java | 2 +- .../jms/artemis/ArtemisConnectionFactoryFactory.java | 2 +- .../boot/autoconfigure/web/WebMvcProperties.java | 4 ++-- .../boot/devtools/livereload/ConnectionInputStream.java | 2 +- .../src/main/asciidoc/appendix-application-properties.adoc | 2 +- .../src/main/asciidoc/appendix-configuration-metadata.adoc | 2 +- .../src/main/asciidoc/appendix-executable-jar-format.adoc | 2 +- spring-boot-docs/src/main/asciidoc/deployment.adoc | 2 +- spring-boot-docs/src/main/asciidoc/getting-started.adoc | 2 +- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 4 ++-- .../java/sample/data/gemfire/service/GemstoneService.java | 2 +- .../java/sample/data/gemfire/service/GemstoneServiceImpl.java | 2 +- .../configurationsample/specific/InnerClassProperties.java | 2 +- .../org/springframework/boot/loader/tools/LaunchScript.java | 2 +- .../boot/context/config/AnsiOutputApplicationListener.java | 2 +- .../boot/context/embedded/ServletRegistrationBean.java | 4 ++-- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java index 729cb1968b..d697532562 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java @@ -94,7 +94,7 @@ public class CacheProperties { * Resolve the config location if set. * @param config the config resource * @return the location or {@code null} if it is not set - * @throws IllegalArgumentException if the config attribute is set to a unknown + * @throws IllegalArgumentException if the config attribute is set to an unknown * location */ public Resource resolveConfigLocation(Resource config) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/CommonsDbcpDataSourcePoolMetadata.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/CommonsDbcpDataSourcePoolMetadata.java index 963564d5bf..b1ed90370a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/CommonsDbcpDataSourcePoolMetadata.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/CommonsDbcpDataSourcePoolMetadata.java @@ -21,7 +21,7 @@ import javax.sql.DataSource; import org.apache.commons.dbcp.BasicDataSource; /** - * {@link DataSourcePoolMetadata} for a Apache Commons DBCP {@link DataSource}. + * {@link DataSourcePoolMetadata} for an Apache Commons DBCP {@link DataSource}. * * @author Stephane Nicoll * @since 1.2.0 diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java index 322f963da6..fcf28579d9 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java @@ -32,7 +32,7 @@ import org.springframework.util.Assert; import org.springframework.util.ClassUtils; /** - * Factory to create a Artemis {@link ActiveMQConnectionFactory} instance from properties + * Factory to create an Artemis {@link ActiveMQConnectionFactory} instance from properties * defined in {@link ArtemisProperties}. * * @author EddĂș MelĂ©ndez diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java index c2fb8844ce..05ccb499ef 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java @@ -49,7 +49,7 @@ public class WebMvcProperties { private String dateFormat; /** - * If the the content of the "default" model should be ignored during redirect + * If the content of the "default" model should be ignored during redirect * scenarios. */ private boolean ignoreDefaultModelOnRedirect = true; @@ -127,7 +127,7 @@ public class WebMvcProperties { private String prefix; /** - * Spring MVC view suffx. + * Spring MVC view suffix. */ @Value("${spring.view.suffix:}") private String suffix; diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java index 74196d334b..fd1a068e83 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java @@ -83,7 +83,7 @@ class ConnectionInputStream extends FilterInputStream { } /** - * Read a a number of bytes from the stream (checking that the end of the stream + * Read a number of bytes from the stream (checking that the end of the stream * hasn't been reached) * @param buffer the destination buffer * @param offset the buffer offset diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index cf44601ec9..37c62aa7ee 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -133,7 +133,7 @@ content into your application; rather pick only the properties that you need. spring.mvc.date-format= # set fixed date format, e.g. dd/MM/yyyy spring.mvc.favicon.enabled=true spring.mvc.message-codes-resolver-format= # PREFIX_ERROR_CODE / POSTFIX_ERROR_CODE - spring.mvc.ignore-default-model-on-redirect=true # if the the content of the "default" model should be ignored redirects + spring.mvc.ignore-default-model-on-redirect=true # if the content of the "default" model should be ignored redirects spring.mvc.async.request-timeout= # async request timeout in milliseconds spring.mvc.view.prefix= # MVC view prefix spring.mvc.view.suffix= # ... and suffix 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 c4d291f951..53f2d2d128 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc @@ -538,7 +538,7 @@ value but could highlight valid packages and class names that are not available project's classpath. The meta-data snippet below corresponds to the standard `logging.level` property, keys -are _logger names_ and values correspond to the the standard log levels or any custom +are _logger names_ and values correspond to the standard log levels or any custom level: [source,json,indent=0] diff --git a/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc b/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc index 9dd787df47..fb5504a45d 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc @@ -21,7 +21,7 @@ without unpacking. To solve this problem, many developers use "`shaded`" jars. A shaded jar simply packages all classes, from all jars, into a single 'uber jar'. The problem with shaded jars is that it becomes hard to see which libraries you are actually using in your application. -It can also be problematic if the the same filename is used (but with different content) +It can also be problematic if the same filename is used (but with different content) in multiple jars. Spring Boot takes a different approach and allows you to actually nest jars directly. diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc index 3253eec97a..aeffdc5e8e 100644 --- a/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -348,7 +348,7 @@ or `systemd`. [[deployment-initd-service]] -==== Installation as a init.d service (System V) +==== Installation as an init.d service (System V) The default executable script that can be embedded into Spring Boot jars will act as an `init.d` script when it is symlinked to `/etc/init.d`. The standard `start`, `stop`, `restart` and `status` commands can be used. The script supports the following features: diff --git a/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-docs/src/main/asciidoc/getting-started.adoc index d66ef86675..549281fdf7 100644 --- a/spring-boot-docs/src/main/asciidoc/getting-started.adoc +++ b/spring-boot-docs/src/main/asciidoc/getting-started.adoc @@ -705,7 +705,7 @@ distribute a self-contained application. To solve this problem, many developers use "`uber`" jars. An uber jar simply packages all classes, from all jars, into a single archive. The problem with this approach is that it becomes hard to see which libraries you are actually using in your application. It can -also be problematic if the the same filename is used (but with different content) in +also be problematic if the same filename is used (but with different content) in multiple jars. Spring Boot takes a < * - * @return a Iterable object to iterate over the list of Gemstones currently stored in + * @return an Iterable object to iterate over the list of Gemstones currently stored in * the GemFire Cache. * @see java.lang.Iterable * @see sample.data.gemfire.domain.Gemstone diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java index 292504a261..391f671c59 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/InnerClassProperties.java @@ -20,7 +20,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties; import org.springframework.boot.configurationsample.NestedConfigurationProperty; /** - * Demonstrate the auto-detection of a inner config classes. + * Demonstrate the auto-detection of inner config classes. * * @author Stephane Nicoll */ diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LaunchScript.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LaunchScript.java index f9b3bfada4..9f0c5f25e1 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LaunchScript.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LaunchScript.java @@ -25,7 +25,7 @@ package org.springframework.boot.loader.tools; public interface LaunchScript { /** - * The the content of the launch script as a byte array. + * The content of the launch script as a byte array. * @return the script bytes */ byte[] toByteArray(); diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java index fea52e4d93..d85cbef391 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java @@ -24,7 +24,7 @@ import org.springframework.context.ApplicationListener; import org.springframework.core.Ordered; /** - * An {@link ApplicationListener} that configures {@link AnsiOutput} depending on the the + * An {@link ApplicationListener} that configures {@link AnsiOutput} depending on the * value of the property {@code spring.output.ansi.enabled}. See {@link Enabled} for valid * values. * diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java index 473689b210..91c1ac0f9d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java @@ -153,8 +153,8 @@ public class ServletRegistrationBean extends RegistrationBean { } /** - * Set the the {@link MultipartConfigElement multi-part configuration}. - * @param multipartConfig the muti-part configuration to set or {@code null} + * Set the {@link MultipartConfigElement multi-part configuration}. + * @param multipartConfig the multi-part configuration to set or {@code null} */ public void setMultipartConfig(MultipartConfigElement multipartConfig) { this.multipartConfig = multipartConfig;