Merge branch '2.0.x'

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/package-info.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for JDBC metrics.
+ * Auto-configuration for JPA metrics.
  */
 package org.springframework.boot.actuate.autoconfigure.metrics.jdbc;

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredEndpoint.java

@@ -20,7 +20,7 @@ import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
 import org.springframework.boot.actuate.endpoint.Operation;
 
 /**
- * An {@link ExposableEndpoint endpoint} discovered by a {@link EndpointDiscoverer}.
+ * An {@link ExposableEndpoint endpoint} discovered by an {@link EndpointDiscoverer}.
  *
  * @param <O> The operation type
  * @author Phillip Webb

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/DiscoveredOperationMethod.java

@@ -27,7 +27,7 @@ import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.util.Assert;
 
 /**
- * A {@link OperationMethod} discovered by a {@link EndpointDiscoverer}.
+ * An {@link OperationMethod} discovered by an {@link EndpointDiscoverer}.
  *
  * @author Phillip Webb
  * @since 2.0.0

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java

@@ -354,7 +354,7 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
 			DiscoveredOperationMethod operationMethod, OperationInvoker invoker);
 
 	/**
-	 * Create a {@link OperationKey} for the given operation.
+	 * Create an {@link OperationKey} for the given operation.
 	 * @param operation the source operation
 	 * @return the operation key
 	 */

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/MBeanInfoFactory.java

@@ -30,7 +30,7 @@ import javax.management.modelmbean.ModelMBeanOperationInfo;
 import org.springframework.boot.actuate.endpoint.OperationType;
 
 /**
- * Factory to create {@link MBeanInfo} from a {@link ExposableJmxEndpoint}.
+ * Factory to create {@link MBeanInfo} from an {@link ExposableJmxEndpoint}.
  *
  * @author Stephane Nicoll
  * @author Phillip Webb

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import org.springframework.data.elasticsearch.repository.config.EnableElasticsea
  * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's Elasticsearch
  * support.
  * <p>
- * Registers a {@link ElasticsearchTemplate} if no other bean of the same type is
+ * Registers an {@link ElasticsearchTemplate} if no other bean of the same type is
  * configured.
  *
  * @author Artur Konczak

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanner.java

@@ -32,7 +32,7 @@ import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * An entity scanner that searches the classpath from a {@link EntityScan @EntityScan}
+ * An entity scanner that searches the classpath from an {@link EntityScan @EntityScan}
  * specified packages.
  *
  * @author Phillip Webb

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDataProperties.java

@@ -24,8 +24,8 @@ import lombok.Setter;
 import org.springframework.boot.configurationsample.ConfigurationProperties;
 
 /**
- * Configuration properties using lombok @Data on element level and overwriting behaviour
- * with @Getter und @Setter at field level.
+ * Configuration properties using Lombok @Data on element level and overwriting behaviour
+ * with @Getter and @Setter at field level.
  *
  * @author Jonas Keßler
  */

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java

@@ -29,7 +29,7 @@ import org.springframework.core.env.SystemEnvironmentPropertySource;
 import org.springframework.util.ObjectUtils;
 
 /**
- * {@link ConfigurationPropertySource} backed by a {@link EnumerablePropertySource}.
+ * {@link ConfigurationPropertySource} backed by an {@link EnumerablePropertySource}.
  * Extends {@link SpringConfigurationPropertySource} with full "relaxed" mapping support.
  * In order to use this adapter the underlying {@link PropertySource} must be fully
  * enumerable. A security restricted {@link SystemEnvironmentPropertySource} cannot be

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/Origin.java

@@ -35,7 +35,7 @@ public interface Origin {
 
 	/**
 	 * Find the {@link Origin} that an object originated from. Checks if the source object
-	 * is a {@link OriginProvider} and also searches exception stacks.
+	 * is an {@link OriginProvider} and also searches exception stacks.
 	 * @param source the source object or {@code null}
 	 * @return an optional {@link Origin}
 	 */

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/OriginTrackedValue.java

@@ -19,7 +19,7 @@ package org.springframework.boot.origin;
 import org.springframework.util.ObjectUtils;
 
 /**
- * An wrapper for a {@link Object} value and {@link Origin}.
+ * A wrapper for an {@link Object} value and {@link Origin}.
  *
  * @author Madhura Bhave
  * @author Phillip Webb
@@ -79,7 +79,7 @@ public class OriginTrackedValue implements OriginProvider {
 	 * the resulting {@link OriginTrackedValue}.
 	 * @param value the source value
 	 * @param origin the origin
-	 * @return a {@link OriginTrackedValue} or {@code null} if the source value was
+	 * @return an {@link OriginTrackedValue} or {@code null} if the source value was
 	 * {@code null}.
 	 */
 	public static OriginTrackedValue of(Object value, Origin origin) {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/PropertySourceOrigin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,8 +67,8 @@ public class PropertySourceOrigin implements Origin {
 	}
 
 	/**
-	 * Get a {@link Origin} for the given {@link PropertySource} and {@code propertyName}.
-	 * Will either return an {@link OriginLookup} result or a
+	 * Get an {@link Origin} for the given {@link PropertySource} and
+	 * {@code propertyName}. Will either return an {@link OriginLookup} result or a
 	 * {@link PropertySourceOrigin}.
 	 * @param propertySource the origin property source
 	 * @param name the property name

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringConfigurationPropertySourceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -160,7 +160,7 @@ public class SpringConfigurationPropertySourceTests {
 	}
 
 	/**
-	 * Test {@link PropertySource} that's also a {@link OriginLookup}.
+	 * Test {@link PropertySource} that's also an {@link OriginLookup}.
 	 */
 	private static class OriginCapablePropertySource<T> extends PropertySource<T>
 			implements OriginLookup<String> {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySourceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -158,7 +158,7 @@ public class SpringIterableConfigurationPropertySourceTests {
 	}
 
 	/**
-	 * Test {@link PropertySource} that's also a {@link OriginLookup}.
+	 * Test {@link PropertySource} that's also an {@link OriginLookup}.
 	 */
 	private static class OriginCapablePropertySource<T>
 			extends EnumerablePropertySource<T> implements OriginLookup<String> {