Polish

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/MessageChannelMetricWriterTests.java

@@ -27,8 +27,8 @@ import org.springframework.boot.actuate.metrics.Metric;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.verify;
 
 /**

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/AbstractHttpClientMockTests.java

@@ -35,9 +35,9 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.util.StreamUtils;
 
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.mock;
 
 /**

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java

@@ -41,9 +41,9 @@ import org.mockito.stubbing.Answer;
 import org.springframework.boot.cli.testutil.SystemProperties;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 
 /**
  * Tests for {@link SettingsXmlRepositorySystemSessionAutoConfiguration}.

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/SpringBootMockUtil.java

@@ -95,19 +95,17 @@ final class SpringBootMockUtil {
 
 	private static class Mockito1MockUtilAdapter implements MockUtilAdapter {
 
-		private final MockUtil mockUtil = BeanUtils.instantiate(MockUtil.class);
+		private final MockUtil mockUtil = BeanUtils.instantiateClass(MockUtil.class);
 
 		private final Method getMockSettingsMethod = ReflectionUtils
 				.findMethod(MockUtil.class, "getMockSettings", Object.class);
 
-		private static final MockingProgress mockingProgress =
+		private static final MockingProgress mockingProgress = createThreadSafeMockingProgress();
-				createThreadSafeMockingProgress();
 
-		private final Method reportMatcherMethod = ReflectionUtils.findMethod(
+		private final Method reportMatcherMethod = ReflectionUtils
-				ArgumentMatcherStorage.class, "reportMatcher", Matcher.class);
+				.findMethod(ArgumentMatcherStorage.class, "reportMatcher", Matcher.class);
 
-		private static final Constructor<MockAwareVerificationMode> mockAwareVerificationModeConstructor =
+		private static final Constructor<MockAwareVerificationMode> mockAwareVerificationModeConstructor = getMockAwareVerificationModeConstructor();
-				getMockAwareVerificationModeConstructor();
 
 		private static MockingProgress createThreadSafeMockingProgress() {
 			try {

spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

@@ -643,11 +643,11 @@ public class SpringApplicationTests {
 		}
 		catch (RuntimeException ex) {
 		}
-		ArgumentCaptor<RuntimeException> ac = ArgumentCaptor.forClass(
+		ArgumentCaptor<RuntimeException> exceptionCaptor = ArgumentCaptor
-				RuntimeException.class);
+				.forClass(RuntimeException.class);
-		verify(handler).registerLoggedException(ac.capture());
+		verify(handler).registerLoggedException(exceptionCaptor.capture());
-		RuntimeException exception = ac.getValue();
+		assertThat(exceptionCaptor.getValue())
-		assertThat(exception).hasCauseInstanceOf(RefreshFailureException.class);
+				.hasCauseInstanceOf(RefreshFailureException.class);
 		assertThat(this.output.toString()).doesNotContain("NullPointerException");
 	}
 

spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java

@@ -38,8 +38,8 @@ import org.mockito.stubbing.Answer;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 
@@ -132,8 +132,7 @@ public class MockEmbeddedServletContainerFactory
 							@Override
 							public Void answer(InvocationOnMock invocation)
 									throws Throwable {
-								initParameters.put(
+								initParameters.put(invocation.getArgument(0),
-										invocation.getArgument(0),
 										invocation.getArgument(1));
 								return null;
 							}
@@ -146,8 +145,7 @@ public class MockEmbeddedServletContainerFactory
 							@Override
 							public String answer(InvocationOnMock invocation)
 									throws Throwable {
-								return initParameters
+								return initParameters.get(invocation.getArgument(0));
-										.get(invocation.getArgument(0));
 							}
 						});
 				given(this.servletContext.getAttributeNames()).willReturn(

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

@@ -33,8 +33,8 @@ import org.springframework.web.util.UriTemplateHandler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.verify;
 
 /**
@@ -61,8 +61,7 @@ public class RootUriTemplateHandlerTests {
 		this.uri = new URI("http://example.com/hello");
 		this.handler = new RootUriTemplateHandler("http://example.com", this.delegate);
 		given(this.delegate.expand(anyString(), any(Map.class))).willReturn(this.uri);
-		given(this.delegate.expand(anyString(), (Object[]) any()))
+		given(this.delegate.expand(anyString(), (Object[]) any())).willReturn(this.uri);
-				.willReturn(this.uri);
 	}
 
 	@Test