Merge branch '2.0.x'

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 <T> the result type

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/Binder.java

@@ -96,7 +96,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<ConfigurationPropertySource> sources,
 			PlaceholdersResolver placeholdersResolver) {
@@ -106,7 +106,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})
 	 */
@@ -119,7 +119,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
@@ -140,7 +140,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
@@ -153,7 +153,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
@@ -166,7 +166,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
@@ -179,7 +179,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
@@ -192,7 +192,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

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);
 

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 {
 

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!");