From 426ef749dbea02f2cb847b954f515478787a520f Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 3 Jul 2019 10:10:01 +0900 Subject: [PATCH] Polish See gh-17413 --- .../ReactiveWebServerFactoryAutoConfigurationTests.java | 5 ++--- .../boot/devtools/DevToolsEnablementDeducer.java | 2 +- .../src/main/asciidoc/production-ready-features.adoc | 2 +- .../src/main/asciidoc/spring-boot-features.adoc | 6 +++--- .../test/context/SpringBootTestContextBootstrapper.java | 2 +- .../boot/test/mock/mockito/MockDefinition.java | 5 +++-- .../boot/test/mock/mockito/SpyDefinition.java | 4 +++- .../boot/web/reactive/error/DefaultErrorAttributes.java | 2 +- .../properties/ConfigurationPropertiesScanTests.java | 4 ++-- .../webservices/client/WebServiceTemplateBuilderTests.java | 5 ++--- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java index aa33d05b385..e627122ac31 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java @@ -21,7 +21,6 @@ import org.apache.catalina.connector.Connector; import org.apache.catalina.startup.Tomcat; import org.eclipse.jetty.server.Server; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import reactor.netty.http.server.HttpServer; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -275,7 +274,7 @@ class ReactiveWebServerFactoryAutoConfigurationTests { @Bean HttpHandler httpHandler() { - return Mockito.mock(HttpHandler.class); + return mock(HttpHandler.class); } } @@ -285,7 +284,7 @@ class ReactiveWebServerFactoryAutoConfigurationTests { @Bean HttpHandler additionalHttpHandler() { - return Mockito.mock(HttpHandler.class); + return mock(HttpHandler.class); } } diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/DevToolsEnablementDeducer.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/DevToolsEnablementDeducer.java index e176ad58d3b..907906b6cf6 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/DevToolsEnablementDeducer.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/DevToolsEnablementDeducer.java @@ -46,7 +46,7 @@ public final class DevToolsEnablementDeducer { * Checks if a specific {@link StackTraceElement} in the current thread's stacktrace * should cause devtools to be disabled. * @param thread the current thread - * @return {@code true} if devtools should be enabled skipped + * @return {@code true} if devtools should be enabled */ public static boolean shouldEnable(Thread thread) { for (StackTraceElement element : thread.getStackTrace()) { diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index bd4b2fa1e17..161e6d90bfc 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -1982,7 +1982,7 @@ following information: |`status` |Response's HTTP status code if available (for example, `200` or `500`), -or `IO_ERROR` in case or I/O issues, `CLIENT_ERROR` otherwise +or `IO_ERROR` in case of I/O issues, `CLIENT_ERROR` otherwise |`uri` |Request's URI template prior to variable substitution, if possible (for example, diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 359303fbccd..f8d4f4b46ce 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -3560,12 +3560,12 @@ The following code shows a typical example: public MyService(RSocketRequester.Builder rsocketRequesterBuilder) { this.rsocketRequester = rsocketRequesterBuilder - .connectTcp("example.org", 9090).block(); + .connectTcp("example.org", 9090).block(); } public Mono someRSocketCall(String name) { - return this.requester.route("user").data(payload) - .retrieveMono(User.class); + return this.requester.route("user").data(name) + .retrieveMono(User.class); } } diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java index c11feda6936..d7956977d30 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java @@ -191,7 +191,7 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr * Determines the resource base path for web applications using the value of * {@link WebAppConfiguration @WebAppConfiguration}, if any, on the test class of the * given {@code configuration}. Defaults to {@code src/main/webapp} in its absence. - * @param configuration the configure to examine + * @param configuration the configuration to examine * @return the resource base path * @since 2.1.6 */ diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java index 30047ae0814..8b874e0618e 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java @@ -23,7 +23,6 @@ import java.util.Set; import org.mockito.Answers; import org.mockito.MockSettings; -import org.mockito.Mockito; import org.springframework.core.ResolvableType; import org.springframework.core.style.ToStringCreator; @@ -32,6 +31,8 @@ import org.springframework.util.ClassUtils; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; +import static org.mockito.Mockito.mock; + /** * A complete definition that can be used to create a Mockito mock. * @@ -150,7 +151,7 @@ class MockDefinition extends Definition { if (this.serializable) { settings.serializable(); } - return (T) Mockito.mock(this.typeToMock.resolve(), settings); + return (T) mock(this.typeToMock.resolve(), settings); } } diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java index 5c1d9b2f84c..937230df23a 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpyDefinition.java @@ -28,6 +28,8 @@ import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; +import static org.mockito.Mockito.mock; + /** * A complete definition that can be used to create a Mockito spy. * @@ -98,7 +100,7 @@ class SpyDefinition extends Definition { if (this.isProxyTargetAware()) { settings.verificationStartedListeners(new SpringAopBypassingVerificationStartedListener()); } - return (T) Mockito.mock(instance.getClass(), settings); + return (T) mock(instance.getClass(), settings); } /** diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java index de602b8518d..f67aaf7e7f4 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java @@ -46,7 +46,7 @@ import org.springframework.web.server.ServerWebExchange; *
  • errors - Any {@link ObjectError}s from a {@link BindingResult} exception *
  • trace - The exception stack trace
    • *
  • path - The URL path when the exception was raised
    • - *
  • requestId - Unique Id associated with the current request
    • + *
  • requestId - Unique ID associated with the current request
    • * * * @author Brian Clozel diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanTests.java index 53b37279beb..1ecccfc97ca 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesScanTests.java @@ -19,7 +19,6 @@ package org.springframework.boot.context.properties; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Mockito; import org.springframework.boot.context.properties.scan.valid.a.AScanConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -29,6 +28,7 @@ import org.springframework.core.io.DefaultResourceLoader; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.willCallRealMethod; +import static org.mockito.Mockito.mock; /** * Integration tests for {@link ConfigurationPropertiesScan @ConfigurationPropertiesScan}. @@ -71,7 +71,7 @@ class ConfigurationPropertiesScanTests { @Test void scanImportBeanRegistrarShouldBeResourceLoaderAwareWithRequiredResource() { - DefaultResourceLoader resourceLoader = Mockito.mock(DefaultResourceLoader.class); + DefaultResourceLoader resourceLoader = mock(DefaultResourceLoader.class); this.context.setResourceLoader(resourceLoader); willCallRealMethod().given(resourceLoader).getClassLoader(); given(resourceLoader.getResource("test")).willReturn(new ByteArrayResource("test".getBytes())); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java index 3182ccf6889..ec60cb6ea8a 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java @@ -26,7 +26,6 @@ import javax.xml.transform.sax.SAXTransformerFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.springframework.http.client.ClientHttpRequestFactory; @@ -199,8 +198,8 @@ class WebServiceTemplateBuilderTests { @Test void additionalInterceptorsShouldAddToExistingWebServiceTemplate() { - ClientInterceptor f1 = Mockito.mock(ClientInterceptor.class); - ClientInterceptor f2 = Mockito.mock(ClientInterceptor.class); + ClientInterceptor f1 = mock(ClientInterceptor.class); + ClientInterceptor f2 = mock(ClientInterceptor.class); WebServiceTemplate webServiceTemplate = new WebServiceTemplate(); webServiceTemplate.setInterceptors(new ClientInterceptor[] { f1 }); this.builder.additionalInterceptors(f2).configure(webServiceTemplate);