Merge pull request #11871 from izeye:polish-20180201

* pr/11871:
  Polish

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

@@ -27,7 +27,7 @@ import org.springframework.boot.actuate.endpoint.web.ExposableServletEndpoint;
 import org.springframework.util.Assert;
 
 /**
- * A discovered {@link ExposableServletEndpoint controller endpoint}.
+ * A discovered {@link ExposableServletEndpoint servlet endpoint}.
  *
  * @author Phillip Webb
  */

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/PathRequestTests.java

@@ -19,9 +19,7 @@ package org.springframework.boot.autoconfigure.security.servlet;
 import javax.servlet.http.HttpServletRequest;
 
 import org.assertj.core.api.AssertDelegateTarget;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -39,9 +37,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class PathRequestTests {
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
-
 	@Test
 	public void toStaticResourcesShouldReturnStaticResourceRequest() {
 		assertThat(PathRequest.toStaticResources())

spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc

@@ -322,8 +322,7 @@ and the following command:
 This is one of the easiest ways to get to AWS, but there are more things to cover, such as
 how to integrate Elastic Beanstalk into any CI / CD tool, use the Elastic Beanstalk Maven
 plugin instead of the CLI, and others. There is a
-https://exampledriven.wordpress.com/2017/01/09/spring-boot-aws-elastic-beanstalk-example/
+https://exampledriven.wordpress.com/2017/01/09/spring-boot-aws-elastic-beanstalk-example/[blog post] covering these topics more in detail.
-[blog post] covering these topics more in detail.
 
 
 
@@ -348,13 +347,11 @@ the following:
 ----
 
 See the https://boxfuse.com/docs/commandline/run.html[`boxfuse run` documentation] for
-more options. If there is a https://boxfuse.com/docs/commandline/#configuration
+more options. If there is a https://boxfuse.com/docs/commandline/#configuration[`boxfuse.conf`] file present in the current directory, it is considered.
-[`boxfuse.conf`] file present in the current directory, it is considered.
 
 TIP: By default, Boxfuse activates a Spring profile named `boxfuse` on startup. If your
 executable jar or war contains an
-https://boxfuse.com/docs/payloads/springboot.html#configuration
+https://boxfuse.com/docs/payloads/springboot.html#configuration[`application-boxfuse.properties`] file, Boxfuse bases its configuration on the
-[`application-boxfuse.properties`] file, Boxfuse bases its configuration on the
 properties it contains.
 
 At this point, `boxfuse` creates an image for your application, uploads it, and configures

spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc

@@ -1372,7 +1372,7 @@ include::{code-examples}/web/client/RestTemplateProxyCustomizationExample.java[t
 
 Spring Boot has no mandatory logging dependency, except for the Commons Logging API, which
 is typically provided by Spring Framework's `spring-jcl` module. To use
-http://logback.qos.ch[Logback], you need to include it and `sprign-jcl` on the classpath.
+http://logback.qos.ch[Logback], you need to include it and `spring-jcl` on the classpath.
 The simplest way to do that is through the starters, which all depend on
 `spring-boot-starter-logging`. For a web application, you need only
 `spring-boot-starter-web`, since it depends transitively on the logging starter. If you

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java

@@ -170,7 +170,7 @@ class TypeUtils {
 	}
 
 	/**
-	 * A visitor that extracts the full qualified name of a type, including generic
+	 * A visitor that extracts the fully qualified name of a type, including generic
 	 * information.
 	 */
 	private static class TypeExtractor extends SimpleTypeVisitor8<String, Void> {
@@ -186,7 +186,7 @@ class TypeUtils {
 			TypeElement enclosingElement = getEnclosingTypeElement(type);
 			if (enclosingElement != null) {
 				return getQualifiedName(enclosingElement) + "$"
-						+ type.asElement().getSimpleName().toString();
+						+ type.asElement().getSimpleName();
 			}
 			String qualifiedName = getQualifiedName(type.asElement());
 			if (type.getTypeArguments().isEmpty()) {
@@ -217,8 +217,7 @@ class TypeUtils {
 			TypeElement enclosingElement = getEnclosingTypeElement(element.asType());
 			if (enclosingElement != null) {
 				return getQualifiedName(enclosingElement) + "$"
-						+ ((DeclaredType) element.asType()).asElement().getSimpleName()
+						+ ((DeclaredType) element.asType()).asElement().getSimpleName();
-								.toString();
 			}
 			if (element instanceof TypeElement) {
 				return ((TypeElement) element).getQualifiedName().toString();

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/asciidoc/reacting.adoc

@@ -33,7 +33,7 @@ plugin:
 When {kotlin-plugin}[Kotlin's Gradle plugin] is applied to a project, the Spring Boot
 plugin:
 
-1. Aligns the Koltin version used in Spring Boot's dependency management with the version
+1. Aligns the Kotlin version used in Spring Boot's dependency management with the version
    of the plugin. This is achieved by setting the `kotlin.version` property with a value
    that matches the version of the Kotlin plugin.
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/util/LambdaSafe.java

@@ -165,7 +165,7 @@ public final class LambdaSafe {
 					if (!isLambdaGenericProblem(ex)) {
 						throw ex;
 					}
-					logNonMachingType(callbackInstance, ex);
+					logNonMatchingType(callbackInstance, ex);
 				}
 			}
 			return InvocationResult.noResult();
@@ -202,7 +202,7 @@ public final class LambdaSafe {
 			return false;
 		}
 
-		private void logNonMachingType(C callback, ClassCastException ex) {
+		private void logNonMatchingType(C callback, ClassCastException ex) {
 			if (this.logger.isDebugEnabled()) {
 				Class<?> expectedType = ResolvableType.forClass(this.callbackType)
 						.resolveGeneric();

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListenerTests.java

@@ -59,7 +59,7 @@ public class LiquibaseServiceLocatorApplicationListenerTests {
 		SpringApplication application = new SpringApplication(Conf.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
 		this.context = application.run();
-		Object resolver = getServiceLocator();
+		Object resolver = getClassResolver();
 		assertThat(resolver).isInstanceOf(SpringPackageScanClassResolver.class);
 	}
 
@@ -73,11 +73,11 @@ public class LiquibaseServiceLocatorApplicationListenerTests {
 				new ClassHidingClassLoader(CustomResolverServiceLocator.class));
 		application.setResourceLoader(resourceLoader);
 		this.context = application.run();
-		Object resolver = getServiceLocator();
+		Object resolver = getClassResolver();
 		assertThat(resolver).isInstanceOf(DefaultPackageScanClassResolver.class);
 	}
 
-	private Object getServiceLocator() throws IllegalAccessException {
+	private Object getClassResolver() throws IllegalAccessException {
 		ServiceLocator instance = ServiceLocator.getInstance();
 		Field field = ReflectionUtils.findField(ServiceLocator.class, "classResolver");
 		field.setAccessible(true);

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/util/LambdaSafeTests.java

@@ -442,7 +442,7 @@ public class LambdaSafeTests {
 
 	interface GenericMultiArgCallback<T extends CharSequence> {
 
-		void handle(Integer numner, T argument, Boolean bool);
+		void handle(Integer number, T argument, Boolean bool);
 
 	}
 
@@ -468,7 +468,7 @@ public class LambdaSafeTests {
 
 	interface GenericMultiArgFactory<T extends CharSequence> {
 
-		Integer handle(Integer numner, T argument, Boolean bool);
+		Integer handle(Integer number, T argument, Boolean bool);
 
 	}