From a86ba6495c0f09dc69bee6aa9462831c40319c40 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Fri, 12 Oct 2018 18:21:39 -0700 Subject: [PATCH] Polish --- .../boot/context/properties/bind/BindResult.java | 2 +- .../boot/context/properties/bind/Binder.java | 16 ++++++++-------- .../properties/bind/PlaceholdersResolver.java | 4 ++-- .../ReactiveWebServerApplicationContext.java | 2 +- ...ReactiveWebServerApplicationContextTests.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindResult.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindResult.java index f1ff739fa7..5f3e7f0086 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindResult.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindResult.java @@ -26,7 +26,7 @@ import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; /** - * A container object to return result of a {@link Binder} bind operation. May contain + * A container object to return the result of a {@link Binder} bind operation. May contain * either a successfully bound object or an empty result. * * @param the result type diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java index b458beef5b..9e4bed89a5 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java @@ -97,7 +97,7 @@ public class Binder { /** * Create a new {@link Binder} instance for the specified sources. * @param sources the sources used for binding - * @param placeholdersResolver strategy to resolve any property place-holders + * @param placeholdersResolver strategy to resolve any property placeholders */ public Binder(Iterable sources, PlaceholdersResolver placeholdersResolver) { @@ -107,7 +107,7 @@ public class Binder { /** * Create a new {@link Binder} instance for the specified sources. * @param sources the sources used for binding - * @param placeholdersResolver strategy to resolve any property place-holders + * @param placeholdersResolver strategy to resolve any property placeholders * @param conversionService the conversion service to convert values (or {@code null} * to use {@link ApplicationConversionService}) */ @@ -120,7 +120,7 @@ public class Binder { /** * Create a new {@link Binder} instance for the specified sources. * @param sources the sources used for binding - * @param placeholdersResolver strategy to resolve any property place-holders + * @param placeholdersResolver strategy to resolve any property placeholders * @param conversionService the conversion service to convert values (or {@code null} * to use {@link ApplicationConversionService}) * @param propertyEditorInitializer initializer used to configure the property editors @@ -141,7 +141,7 @@ public class Binder { } /** - * Bind the specified target {@link Class} using this binders + * Bind the specified target {@link Class} using this binder's * {@link ConfigurationPropertySource property sources}. * @param name the configuration property name to bind * @param target the target class @@ -154,7 +154,7 @@ public class Binder { } /** - * Bind the specified target {@link Bindable} using this binders + * Bind the specified target {@link Bindable} using this binder's * {@link ConfigurationPropertySource property sources}. * @param name the configuration property name to bind * @param target the target bindable @@ -167,7 +167,7 @@ public class Binder { } /** - * Bind the specified target {@link Bindable} using this binders + * Bind the specified target {@link Bindable} using this binder's * {@link ConfigurationPropertySource property sources}. * @param name the configuration property name to bind * @param target the target bindable @@ -180,7 +180,7 @@ public class Binder { } /** - * Bind the specified target {@link Bindable} using this binders + * Bind the specified target {@link Bindable} using this binder's * {@link ConfigurationPropertySource property sources}. * @param name the configuration property name to bind * @param target the target bindable @@ -193,7 +193,7 @@ public class Binder { } /** - * Bind the specified target {@link Bindable} using this binders + * Bind the specified target {@link Bindable} using this binder's * {@link ConfigurationPropertySource property sources}. * @param name the configuration property name to bind * @param target the target bindable diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/PlaceholdersResolver.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/PlaceholdersResolver.java index 5bc2900d58..0df74b89d7 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/PlaceholdersResolver.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/PlaceholdersResolver.java @@ -35,9 +35,9 @@ public interface PlaceholdersResolver { PlaceholdersResolver NONE = (value) -> value; /** - * Called to resolve any place holders in the given value. + * Called to resolve any placeholders in the given value. * @param value the source value - * @return a value with place holders resolved + * @return a value with placeholders resolved */ Object resolvePlaceholders(Object value); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java index fddab189f2..c8fb42d227 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java @@ -189,7 +189,7 @@ public class ReactiveWebServerApplicationContext /** * Internal class used to manage the server and the {@link HttpHandler}, taking care - * not to initialize the hander too early. + * not to initialize the handler too early. */ static final class ServerManager implements HttpHandler { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContextTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContextTests.java index 134d63ab74..1656687cc1 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContextTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContextTests.java @@ -135,7 +135,7 @@ public class AnnotationConfigReactiveWebServerApplicationContextTests { } @Bean - public HttpHandler httpHander() { + public HttpHandler httpHandler() { if (!addedListener) { throw new RuntimeException( "Handlers should be added after listeners, we're being initialized too early!");