Merge pull request #6114 from izeye:typo-20160603

* pr/6114:
  Fix typos

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/Jackson2ObjectMapperBuilderCustomizer.java

@@ -31,8 +31,8 @@ import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 public interface Jackson2ObjectMapperBuilderCustomizer {
 
 	/**
-	 * Customize the jacksonObjectMapperBuilder.
-	 * @param jacksonObjectMapperBuilder the jacksonObjectMapperBuilder to customize
+	 * Customize the JacksonObjectMapperBuilder.
+	 * @param jacksonObjectMapperBuilder the JacksonObjectMapperBuilder to customize
 	 */
 	void customize(Jackson2ObjectMapperBuilder jacksonObjectMapperBuilder);
 

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebClientAutoConfigurationTests.java

@@ -75,7 +75,7 @@ public class WebClientAutoConfigurationTests {
 	}
 
 	@Test
-	public void restTemplateWhenHasCustomMesssageConvertersShouldHaveMessageConverters() {
+	public void restTemplateWhenHasCustomMessageConvertersShouldHaveMessageConverters() {
 		load(CustomHttpMessageConverter.class,
 				HttpMessageConvertersAutoConfiguration.class, RestTemplateConfig.class);
 		RestTemplate restTemplate = this.context.getBean(RestTemplate.class);

spring-boot-samples/spring-boot-sample-cache/README.adoc

@@ -75,7 +75,7 @@ the underlying `HazelcastInstance`.
 
 
 === Infinispan
-Add the org.infinispan:infinispan-spring4-embedded` dependency to enable support for
+Add the `org.infinispan:infinispan-spring4-embedded` dependency to enable support for
 Infinispan. There is no default location that Infinispan uses to look for a config file
 so if you don't specify anything it will bootstrap on a hardcoded default. You can set
 the `spring.cache.infinispan.config` property to use the provided `infinispan.xml`

spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/RestClientTest.java

@@ -42,7 +42,7 @@ import org.springframework.web.client.RestTemplate;
  * <strong>only</strong> on beans that use {@link RestTemplateBuilder}.
  * <p>
  * Using this annotation will disable full auto-configuration and instead apply only
- * configuration relevant to rest client tests (i.e. Jackson or GSON auto-configureation
+ * configuration relevant to rest client tests (i.e. Jackson or GSON auto-configuration
  * and {@code @JsonComponent} beans, but not regular {@link Component @Component} beans).
  * <p>
  * By default, tests annotated with {@code RestClientTest} will also auto-configure a

spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java

@@ -82,7 +82,7 @@ public class MockServerRestTemplateCustomizer implements RestTemplateCustomizer
 
 	@Override
 	public void customize(RestTemplate restTemplate) {
-		RequestExpectationManager expectationManager = createExpecationManager();
+		RequestExpectationManager expectationManager = createExpectationManager();
 		if (this.detectRootUri) {
 			expectationManager = RootUriRequestExpectationManager
 					.forRestTemplate(restTemplate, expectationManager);
@@ -93,7 +93,7 @@ public class MockServerRestTemplateCustomizer implements RestTemplateCustomizer
 		this.servers.put(restTemplate, server);
 	}
 
-	protected RequestExpectationManager createExpecationManager() {
+	protected RequestExpectationManager createExpectationManager() {
 		return BeanUtils.instantiate(this.expectationManager);
 	}
 

spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java

@@ -65,7 +65,7 @@ public class MockServerRestTemplateCustomizerTests {
 	}
 
 	@Test
-	public void createShouldUseExpectationMangerClass() throws Exception {
+	public void createShouldUseExpectationManagerClass() throws Exception {
 		MockServerRestTemplateCustomizer customizer = new MockServerRestTemplateCustomizer(
 				UnorderedRequestExpectationManager.class);
 		customizer.customize(new RestTemplate());

spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java

@@ -86,7 +86,7 @@ public class RootUriRequestExpectationManagerTests {
 	}
 
 	@Test
-	public void expectRequestShouldDelegateToExpecationManager() throws Exception {
+	public void expectRequestShouldDelegateToExpectationManager() throws Exception {
 		ExpectedCount count = mock(ExpectedCount.class);
 		RequestMatcher requestMatcher = mock(RequestMatcher.class);
 		this.manager.expectRequest(count, requestMatcher);
@@ -128,7 +128,7 @@ public class RootUriRequestExpectationManagerTests {
 	}
 
 	@Test
-	public void resetRequestShouldDelegateToExpecationManager() throws Exception {
+	public void resetRequestShouldDelegateToExpectationManager() throws Exception {
 		this.manager.reset();
 		verify(this.delegate).reset();
 	}

spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java

@@ -28,7 +28,7 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 /**
- * {@link BeanPostProcessor} that apply all {@link EmbeddedServletContainerCustomizer}s
+ * {@link BeanPostProcessor} that applies all {@link EmbeddedServletContainerCustomizer}s
  * from the bean factory to {@link ConfigurableEmbeddedServletContainer} beans.
  *
  * @author Dave Syer

spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java

@@ -260,7 +260,7 @@ public class RestTemplateBuilder {
 	/**
 	 * Set the {@link ResponseErrorHandler} that should be used with the
 	 * {@link RestTemplate}.
-	 * @param errorHandler the error hander to use
+	 * @param errorHandler the error handler to use
 	 * @return a new builder instance
 	 */
 	public RestTemplateBuilder errorHandler(ResponseErrorHandler errorHandler) {

spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPageRegistrarBeanPostProcessor.java

@@ -28,7 +28,7 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
 /**
- * {@link BeanPostProcessor} that apply all {@link ErrorPageRegistrar}s from the bean
+ * {@link BeanPostProcessor} that applies all {@link ErrorPageRegistrar}s from the bean
  * factory to {@link ErrorPageRegistry} beans.
  *
  * @author Phillip Webb

spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java

@@ -141,7 +141,7 @@ public class RestTemplateBuilderTests {
 	}
 
 	@Test
-	public void messageConvertersShouldRepalceExisting() throws Exception {
+	public void messageConvertersShouldReplaceExisting() throws Exception {
 		RestTemplate template = this.builder
 				.messageConverters(new ResourceHttpMessageConverter())
 				.messageConverters(Collections.singleton(this.messageConverter)).build();
@@ -308,7 +308,7 @@ public class RestTemplateBuilderTests {
 	}
 
 	@Test
-	public void customizersShouldRepalceExisting() throws Exception {
+	public void customizersShouldReplaceExisting() throws Exception {
 		RestTemplateCustomizer customizer1 = mock(RestTemplateCustomizer.class);
 		RestTemplateCustomizer customizer2 = mock(RestTemplateCustomizer.class);
 		RestTemplate template = this.builder.customizers(customizer1)