* 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). *
* By default, tests annotated with {@code RestClientTest} will also auto-configure a diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java index 0b5804f6bf..056ff52300 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java +++ b/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); } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java index 1bdd645fa7..22d55027fc 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizerTests.java +++ b/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()); diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java index 01cf7c7d4e..ad950a062b 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManagerTests.java +++ b/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(); } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java index cd68406a37..6e38d07492 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java +++ b/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 diff --git a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java index ee64a5ec55..d93dd5daaf 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java +++ b/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) { diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPageRegistrarBeanPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPageRegistrarBeanPostProcessor.java index 956c0ff1fd..fa476f32b9 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPageRegistrarBeanPostProcessor.java +++ b/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 diff --git a/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java index 73b2dd63b3..6e3166fad9 100644 --- a/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java +++ b/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)