Migrate to Mockito.mock(T...) where feasible

spring-web/src/test/java/org/springframework/http/HttpRangeTests.java

@@ -147,7 +147,7 @@ public class HttpRangeTests {
 
 	@Test
 	public void toResourceRegionInputStreamResource() {
-		InputStreamResource resource = mock(InputStreamResource.class);
+		InputStreamResource resource = mock();
 		HttpRange range = HttpRange.createByteRange(0, 9);
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				range.toResourceRegion(resource));
@@ -155,7 +155,7 @@ public class HttpRangeTests {
 
 	@Test
 	public void toResourceRegionIllegalLength() {
-		ByteArrayResource resource = mock(ByteArrayResource.class);
+		ByteArrayResource resource = mock();
 		given(resource.contentLength()).willReturn(-1L);
 		HttpRange range = HttpRange.createByteRange(0, 9);
 		assertThatIllegalArgumentException().isThrownBy(() -> range.toResourceRegion(resource));
@@ -163,7 +163,7 @@ public class HttpRangeTests {
 
 	@Test
 	public void toResourceRegionExceptionLength() throws IOException {
-		InputStreamResource resource = mock(InputStreamResource.class);
+		InputStreamResource resource = mock();
 		given(resource.contentLength()).willThrow(IOException.class);
 		HttpRange range = HttpRange.createByteRange(0, 9);
 		assertThatIllegalArgumentException().isThrownBy(() -> range.toResourceRegion(resource));

spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpRequestFactoryTests.java

@@ -35,7 +35,7 @@ public class SimpleClientHttpRequestFactoryTests {
 
 	@Test // SPR-13225
 	public void headerWithNullValue() {
-		HttpURLConnection urlConnection = mock(HttpURLConnection.class);
+		HttpURLConnection urlConnection = mock();
 		given(urlConnection.getRequestMethod()).willReturn("GET");
 		HttpHeaders headers = new HttpHeaders();
 		headers.set("foo", null);

spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java

@@ -41,7 +41,7 @@ import static org.mockito.Mockito.verify;
  */
 public class SimpleClientHttpResponseTests {
 
-	private final HttpURLConnection connection = mock(HttpURLConnection.class);
+	private final HttpURLConnection connection = mock();
 
 	private final SimpleClientHttpResponse response = new SimpleClientHttpResponse(this.connection);
 
@@ -97,7 +97,7 @@ public class SimpleClientHttpResponseTests {
 
 	@Test  // SPR-16773
 	public void shouldNotDrainWhenErrorStreamClosed() throws Exception {
-		InputStream is = mock(InputStream.class);
+		InputStream is = mock();
 		given(this.connection.getErrorStream()).willReturn(is);
 		willDoNothing().given(is).close();
 		given(is.transferTo(any())).willCallRealMethod();

spring-web/src/test/java/org/springframework/http/client/observation/DefaultClientRequestObservationConventionTests.java

@@ -95,7 +95,7 @@ class DefaultClientRequestObservationConventionTests {
 	@Test
 	void addsKeyValueForNonResolvableStatus() throws Exception {
 		ClientRequestObservationContext context = new ClientRequestObservationContext(this.request);
-		ClientHttpResponse response = mock(ClientHttpResponse.class);
+		ClientHttpResponse response = mock();
 		context.setResponse(response);
 		given(response.getStatusCode()).willThrow(new IOException("test error"));
 		assertThat(this.observationConvention.getLowCardinalityKeyValues(context)).contains(KeyValue.of("status", "IO_ERROR"));

spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java

@@ -38,9 +38,9 @@ public class ReactorResourceFactoryTests {
 
 	private final ReactorResourceFactory resourceFactory = new ReactorResourceFactory();
 
-	private final ConnectionProvider connectionProvider = mock(ConnectionProvider.class);
+	private final ConnectionProvider connectionProvider = mock();
 
-	private final LoopResources loopResources = mock(LoopResources.class);
+	private final LoopResources loopResources = mock();
 
 
 	@Test

spring-web/src/test/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriterTests.java

@@ -103,7 +103,7 @@ public class MultipartHttpMessageWriterTests extends AbstractLeakCheckingTests {
 				this.bufferFactory.wrap("Bb".getBytes(StandardCharsets.UTF_8)),
 				this.bufferFactory.wrap("Cc".getBytes(StandardCharsets.UTF_8))
 		);
-		FilePart mockPart = mock(FilePart.class);
+		FilePart mockPart = mock();
 		HttpHeaders partHeaders = new HttpHeaders();
 		partHeaders.setContentType(MediaType.TEXT_PLAIN);
 		partHeaders.setContentDispositionFormData("foo", "file.txt");

spring-web/src/test/java/org/springframework/http/codec/multipart/PartHttpMessageWriterTests.java

@@ -62,14 +62,14 @@ public class PartHttpMessageWriterTests extends AbstractLeakCheckingTests {
 	void write() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.TEXT_PLAIN);
-		Part textPart = mock(Part.class);
+		Part textPart = mock();
 		given(textPart.name()).willReturn("text part");
 		given(textPart.headers()).willReturn(headers);
 		given(textPart.content()).willReturn(Flux.just(
 				this.bufferFactory.wrap("text1".getBytes(StandardCharsets.UTF_8)),
 				this.bufferFactory.wrap("text2".getBytes(StandardCharsets.UTF_8))));
 
-		FilePart filePart = mock(FilePart.class);
+		FilePart filePart = mock();
 		given(filePart.name()).willReturn("file part");
 		given(filePart.headers()).willReturn(new HttpHeaders());
 		given(filePart.filename()).willReturn("file.txt");

spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java

@@ -141,14 +141,14 @@ class CodecConfigurerTests {
 
 	@Test
 	void defaultAndCustomReaders() {
-		Decoder<?> customDecoder1 = mock(Decoder.class);
-		Decoder<?> customDecoder2 = mock(Decoder.class);
+		Decoder<?> customDecoder1 = mock();
+		Decoder<?> customDecoder2 = mock();
 
 		given(customDecoder1.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(false);
 		given(customDecoder2.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(true);
 
-		HttpMessageReader<?> customReader1 = mock(HttpMessageReader.class);
-		HttpMessageReader<?> customReader2 = mock(HttpMessageReader.class);
+		HttpMessageReader<?> customReader1 = mock();
+		HttpMessageReader<?> customReader2 = mock();
 
 		given(customReader1.canRead(ResolvableType.forClass(Object.class), null)).willReturn(false);
 		given(customReader2.canRead(ResolvableType.forClass(Object.class), null)).willReturn(true);
@@ -189,14 +189,14 @@ class CodecConfigurerTests {
 
 	@Test
 	void defaultAndCustomWriters() {
-		Encoder<?> customEncoder1 = mock(Encoder.class);
-		Encoder<?> customEncoder2 = mock(Encoder.class);
+		Encoder<?> customEncoder1 = mock();
+		Encoder<?> customEncoder2 = mock();
 
 		given(customEncoder1.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(false);
 		given(customEncoder2.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(true);
 
-		HttpMessageWriter<?> customWriter1 = mock(HttpMessageWriter.class);
-		HttpMessageWriter<?> customWriter2 = mock(HttpMessageWriter.class);
+		HttpMessageWriter<?> customWriter1 = mock();
+		HttpMessageWriter<?> customWriter2 = mock();
 
 		given(customWriter1.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(false);
 		given(customWriter2.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(true);
@@ -236,14 +236,14 @@ class CodecConfigurerTests {
 
 	@Test
 	void defaultsOffCustomReaders() {
-		Decoder<?> customDecoder1 = mock(Decoder.class);
-		Decoder<?> customDecoder2 = mock(Decoder.class);
+		Decoder<?> customDecoder1 = mock();
+		Decoder<?> customDecoder2 = mock();
 
 		given(customDecoder1.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(false);
 		given(customDecoder2.canDecode(ResolvableType.forClass(Object.class), null)).willReturn(true);
 
-		HttpMessageReader<?> customReader1 = mock(HttpMessageReader.class);
-		HttpMessageReader<?> customReader2 = mock(HttpMessageReader.class);
+		HttpMessageReader<?> customReader1 = mock();
+		HttpMessageReader<?> customReader2 = mock();
 
 		given(customReader1.canRead(ResolvableType.forClass(Object.class), null)).willReturn(false);
 		given(customReader2.canRead(ResolvableType.forClass(Object.class), null)).willReturn(true);
@@ -267,14 +267,14 @@ class CodecConfigurerTests {
 
 	@Test
 	void defaultsOffWithCustomWriters() {
-		Encoder<?> customEncoder1 = mock(Encoder.class);
-		Encoder<?> customEncoder2 = mock(Encoder.class);
+		Encoder<?> customEncoder1 = mock();
+		Encoder<?> customEncoder2 = mock();
 
 		given(customEncoder1.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(false);
 		given(customEncoder2.canEncode(ResolvableType.forClass(Object.class), null)).willReturn(true);
 
-		HttpMessageWriter<?> customWriter1 = mock(HttpMessageWriter.class);
-		HttpMessageWriter<?> customWriter2 = mock(HttpMessageWriter.class);
+		HttpMessageWriter<?> customWriter1 = mock();
+		HttpMessageWriter<?> customWriter2 = mock();
 
 		given(customWriter1.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(false);
 		given(customWriter2.canWrite(ResolvableType.forClass(Object.class), null)).willReturn(true);

spring-web/src/test/java/org/springframework/http/converter/ResourceHttpMessageConverterTests.java

@@ -125,7 +125,7 @@ public class ResourceHttpMessageConverterTests {
 	@Test  // SPR-12999
 	public void writeContentNotGettingInputStream() throws Exception {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
-		Resource resource = mock(Resource.class);
+		Resource resource = mock();
 		given(resource.getInputStream()).willThrow(FileNotFoundException.class);
 		converter.write(resource, MediaType.APPLICATION_OCTET_STREAM, outputMessage);
 
@@ -135,8 +135,8 @@ public class ResourceHttpMessageConverterTests {
 	@Test  // SPR-12999
 	public void writeContentNotClosingInputStream() throws Exception {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
-		Resource resource = mock(Resource.class);
-		InputStream inputStream = mock(InputStream.class);
+		Resource resource = mock();
+		InputStream inputStream = mock();
 		given(resource.getInputStream()).willReturn(inputStream);
 		given(inputStream.read(any())).willReturn(-1);
 		willThrow(new NullPointerException()).given(inputStream).close();
@@ -148,8 +148,8 @@ public class ResourceHttpMessageConverterTests {
 	@Test  // SPR-13620
 	public void writeContentInputStreamThrowingNullPointerException() throws Exception {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
-		Resource resource = mock(Resource.class);
-		InputStream in = mock(InputStream.class);
+		Resource resource = mock();
+		InputStream in = mock();
 		given(resource.getInputStream()).willReturn(in);
 		given(in.read(any())).willThrow(NullPointerException.class);
 		converter.write(resource, MediaType.APPLICATION_OCTET_STREAM, outputMessage);

spring-web/src/test/java/org/springframework/http/converter/ResourceRegionHttpMessageConverterTests.java

@@ -25,7 +25,6 @@ import java.util.List;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.BDDMockito;
-import org.mockito.Mockito;
 
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.io.ClassPathResource;
@@ -38,6 +37,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.testfixture.http.MockHttpOutputMessage;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 /**
  * Test cases for {@link ResourceRegionHttpMessageConverter} class.
@@ -186,7 +186,7 @@ public class ResourceRegionHttpMessageConverterTests {
 	@Test // SPR-15041
 	public void applicationOctetStreamDefaultContentType() throws Exception {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
-		ClassPathResource body = Mockito.mock(ClassPathResource.class);
+		ClassPathResource body = mock();
 		BDDMockito.given(body.getFilename()).willReturn("spring.dat");
 		BDDMockito.given(body.contentLength()).willReturn(12L);
 		BDDMockito.given(body.getInputStream()).willReturn(new ByteArrayInputStream("Spring Framework".getBytes()));

spring-web/src/test/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverterTests.java

@@ -22,7 +22,6 @@ import java.nio.charset.StandardCharsets;
 import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.Message;
 import com.google.protobuf.util.JsonFormat;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.MediaType;
@@ -35,32 +34,24 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * Test suite for {@link ProtobufHttpMessageConverter}.
+ * Tests for {@link ProtobufHttpMessageConverter}.
  *
  * @author Alex Antonov
  * @author Juergen Hoeller
  * @author Andreas Ahlenstorf
  * @author Sebastien Deleuze
  */
-public class ProtobufHttpMessageConverterTests {
+class ProtobufHttpMessageConverterTests {
 
-	private ProtobufHttpMessageConverter converter;
+	private ProtobufHttpMessageConverter converter = new ProtobufHttpMessageConverter();
 
-	private ExtensionRegistry extensionRegistry;
+	private ExtensionRegistry extensionRegistry = mock();
 
-	private Msg testMsg;
-
-
-	@BeforeEach
-	public void setup() {
-		this.extensionRegistry = mock(ExtensionRegistry.class);
-		this.converter = new ProtobufHttpMessageConverter();
-		this.testMsg = Msg.newBuilder().setFoo("Foo").setBlah(SecondMsg.newBuilder().setBlah(123).build()).build();
-	}
+	private Msg testMsg = Msg.newBuilder().setFoo("Foo").setBlah(SecondMsg.newBuilder().setBlah(123).build()).build();
 
 
 	@Test
-	public void canRead() {
+	void canRead() {
 		assertThat(this.converter.canRead(Msg.class, null)).isTrue();
 		assertThat(this.converter.canRead(Msg.class, ProtobufHttpMessageConverter.PROTOBUF)).isTrue();
 		assertThat(this.converter.canRead(Msg.class, MediaType.APPLICATION_JSON)).isTrue();
@@ -72,7 +63,7 @@ public class ProtobufHttpMessageConverterTests {
 	}
 
 	@Test
-	public void canWrite() {
+	void canWrite() {
 		assertThat(this.converter.canWrite(Msg.class, null)).isTrue();
 		assertThat(this.converter.canWrite(Msg.class, ProtobufHttpMessageConverter.PROTOBUF)).isTrue();
 		assertThat(this.converter.canWrite(Msg.class, MediaType.APPLICATION_JSON)).isTrue();
@@ -82,7 +73,7 @@ public class ProtobufHttpMessageConverterTests {
 	}
 
 	@Test
-	public void read() throws IOException {
+	void read() throws IOException {
 		byte[] body = this.testMsg.toByteArray();
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
 		inputMessage.getHeaders().setContentType(ProtobufHttpMessageConverter.PROTOBUF);
@@ -91,7 +82,7 @@ public class ProtobufHttpMessageConverterTests {
 	}
 
 	@Test
-	public void readNoContentType() throws IOException {
+	void readNoContentType() throws IOException {
 		byte[] body = this.testMsg.toByteArray();
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body);
 		Message result = this.converter.read(Msg.class, inputMessage);
@@ -99,7 +90,7 @@ public class ProtobufHttpMessageConverterTests {
 	}
 
 	@Test
-	public void writeProtobuf() throws IOException {
+	void writeProtobuf() throws IOException {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		MediaType contentType = ProtobufHttpMessageConverter.PROTOBUF;
 		this.converter.write(this.testMsg, contentType, outputMessage);
@@ -117,7 +108,7 @@ public class ProtobufHttpMessageConverterTests {
 	}
 
 	@Test
-	public void writeJsonWithGoogleProtobuf() throws IOException {
+	void writeJsonWithGoogleProtobuf() throws IOException {
 		this.converter = new ProtobufHttpMessageConverter(
 				new ProtobufHttpMessageConverter.ProtobufJavaUtilSupport(null, null),
 				this.extensionRegistry);
@@ -141,7 +132,7 @@ public class ProtobufHttpMessageConverterTests {
 	}
 
 	@Test
-	public void writeJsonWithJavaFormat() throws IOException {
+	void writeJsonWithJavaFormat() throws IOException {
 		this.converter = new ProtobufHttpMessageConverter(
 				new ProtobufHttpMessageConverter.ProtobufJavaFormatSupport(),
 				this.extensionRegistry);
@@ -166,13 +157,13 @@ public class ProtobufHttpMessageConverterTests {
 	}
 
 	@Test
-	public void defaultContentType() throws Exception {
+	void defaultContentType() throws Exception {
 		assertThat(this.converter.getDefaultContentType(this.testMsg))
 				.isEqualTo(ProtobufHttpMessageConverter.PROTOBUF);
 	}
 
 	@Test
-	public void getContentLength() throws IOException {
+	void getContentLength() throws IOException {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		MediaType contentType = ProtobufHttpMessageConverter.PROTOBUF;
 		this.converter.write(this.testMsg, contentType, outputMessage);

spring-web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTests.java

@@ -52,7 +52,7 @@ public class MarshallingHttpMessageConverterTests {
 
 	@Test
 	public void canRead() {
-		Unmarshaller unmarshaller = mock(Unmarshaller.class);
+		Unmarshaller unmarshaller = mock();
 
 		given(unmarshaller.supports(Integer.class)).willReturn(false);
 		given(unmarshaller.supports(String.class)).willReturn(true);
@@ -67,7 +67,7 @@ public class MarshallingHttpMessageConverterTests {
 
 	@Test
 	public void canWrite() {
-		Marshaller marshaller = mock(Marshaller.class);
+		Marshaller marshaller = mock();
 
 		given(marshaller.supports(Integer.class)).willReturn(false);
 		given(marshaller.supports(String.class)).willReturn(true);
@@ -85,7 +85,7 @@ public class MarshallingHttpMessageConverterTests {
 		String body = "<root>Hello World</root>";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
 
-		Unmarshaller unmarshaller = mock(Unmarshaller.class);
+		Unmarshaller unmarshaller = mock();
 		given(unmarshaller.unmarshal(isA(StreamSource.class))).willReturn(body);
 
 		MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter();
@@ -99,8 +99,8 @@ public class MarshallingHttpMessageConverterTests {
 	public void readWithTypeMismatchException() throws Exception {
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(new byte[0]);
 
-		Marshaller marshaller = mock(Marshaller.class);
-		Unmarshaller unmarshaller = mock(Unmarshaller.class);
+		Marshaller marshaller = mock();
+		Unmarshaller unmarshaller = mock();
 		given(unmarshaller.unmarshal(isA(StreamSource.class))).willReturn(3);
 
 		MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(marshaller, unmarshaller);
@@ -114,7 +114,7 @@ public class MarshallingHttpMessageConverterTests {
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(new byte[0]);
 		UnmarshallingFailureException ex = new UnmarshallingFailureException("forced");
 
-		Unmarshaller unmarshaller = mock(Unmarshaller.class);
+		Unmarshaller unmarshaller = mock();
 		given(unmarshaller.unmarshal(isA(StreamSource.class))).willThrow(ex);
 
 		MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter();
@@ -129,7 +129,7 @@ public class MarshallingHttpMessageConverterTests {
 		String body = "<root>Hello World</root>";
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 
-		Marshaller marshaller = mock(Marshaller.class);
+		Marshaller marshaller = mock();
 		willDoNothing().given(marshaller).marshal(eq(body), isA(Result.class));
 
 		MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(marshaller);
@@ -145,7 +145,7 @@ public class MarshallingHttpMessageConverterTests {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 		MarshallingFailureException ex = new MarshallingFailureException("forced");
 
-		Marshaller marshaller = mock(Marshaller.class);
+		Marshaller marshaller = mock();
 		willThrow(ex).given(marshaller).marshal(eq(body), isA(Result.class));
 
 		MarshallingHttpMessageConverter converter = new MarshallingHttpMessageConverter(marshaller);

spring-web/src/test/java/org/springframework/http/server/reactive/ListenerReadPublisherTests.java

@@ -105,7 +105,7 @@ public class ListenerReadPublisherTests {
 		@Override
 		protected DataBuffer read() {
 			this.readCalls++;
-			return mock(DataBuffer.class);
+			return mock();
 		}
 
 		@Override

spring-web/src/test/java/org/springframework/http/server/reactive/ListenerWriteProcessorTests.java

@@ -57,7 +57,7 @@ public class ListenerWriteProcessorTests {
 
 		// Turn off writing so next item will be cached
 		this.processor.setWritePossible(false);
-		DataBuffer buffer = mock(DataBuffer.class);
+		DataBuffer buffer = mock();
 		this.processor.onNext(buffer);
 
 		// Send error while item cached
@@ -76,7 +76,7 @@ public class ListenerWriteProcessorTests {
 		this.processor.setFailOnWrite(true);
 
 		// Write
-		DataBuffer buffer = mock(DataBuffer.class);
+		DataBuffer buffer = mock();
 		this.processor.onNext(buffer);
 
 		assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull();
@@ -89,11 +89,11 @@ public class ListenerWriteProcessorTests {
 
 		// Disable writing: next item will be cached.
 		this.processor.setWritePossible(false);
-		DataBuffer buffer1 = mock(DataBuffer.class);
+		DataBuffer buffer1 = mock();
 		this.processor.onNext(buffer1);
 
 		// Send more data illegally
-		DataBuffer buffer2 = mock(DataBuffer.class);
+		DataBuffer buffer2 = mock();
 		this.processor.onNext(buffer2);
 
 		assertThat(this.resultSubscriber.getError()).as("Error should flow to result publisher").isNotNull();

spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestTests.java

@@ -100,7 +100,7 @@ public class ServerHttpRequestTests {
 
 	@Test
 	public void mutateSslInfo() throws Exception {
-		SslInfo sslInfo = mock(SslInfo.class);
+		SslInfo sslInfo = mock();
 		ServerHttpRequest request = createRequest("/").mutate().sslInfo(sslInfo).build();
 		assertThat(request.getSslInfo()).isSameAs(sslInfo);
 	}

spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerHttpStatusTests.java

@@ -59,7 +59,7 @@ class DefaultResponseErrorHandlerHttpStatusTests {
 
 	private final DefaultResponseErrorHandler handler = new DefaultResponseErrorHandler();
 
-	private final ClientHttpResponse response = mock(ClientHttpResponse.class);
+	private final ClientHttpResponse response = mock();
 
 
 	@ParameterizedTest(name = "[{index}] error: [{0}]")

spring-web/src/test/java/org/springframework/web/client/DefaultResponseErrorHandlerTests.java

@@ -46,7 +46,7 @@ public class DefaultResponseErrorHandlerTests {
 
 	private final DefaultResponseErrorHandler handler = new DefaultResponseErrorHandler();
 
-	private final ClientHttpResponse response = mock(ClientHttpResponse.class);
+	private final ClientHttpResponse response = mock();
 
 
 	@Test

spring-web/src/test/java/org/springframework/web/client/ExtractingResponseErrorHandlerTests.java

@@ -42,7 +42,7 @@ public class ExtractingResponseErrorHandlerTests {
 
 	private ExtractingResponseErrorHandler errorHandler;
 
-	private final ClientHttpResponse response = mock(ClientHttpResponse.class);
+	private final ClientHttpResponse response = mock();
 
 
 	@BeforeEach

spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java

@@ -53,11 +53,11 @@ import static org.mockito.Mockito.mock;
 class HttpMessageConverterExtractorTests {
 
 	@SuppressWarnings("unchecked")
-	private final HttpMessageConverter<String> converter = mock(HttpMessageConverter.class);
+	private final HttpMessageConverter<String> converter = mock();
 	private final HttpMessageConverterExtractor<?> extractor = new HttpMessageConverterExtractor<>(String.class, asList(converter));
 	private final MediaType contentType = MediaType.TEXT_PLAIN;
 	private final HttpHeaders responseHeaders = new HttpHeaders();
-	private final ClientHttpResponse response = mock(ClientHttpResponse.class);
+	private final ClientHttpResponse response = mock();
 
 
 	@Test
@@ -156,7 +156,7 @@ class HttpMessageConverterExtractorTests {
 		ParameterizedTypeReference<List<String>> reference = new ParameterizedTypeReference<>() {};
 		Type type = reference.getType();
 
-		GenericHttpMessageConverter<String> converter = mock(GenericHttpMessageConverter.class);
+		GenericHttpMessageConverter<String> converter = mock();
 		HttpMessageConverterExtractor<?> extractor = new HttpMessageConverterExtractor<List<String>>(type, asList(converter));
 
 		given(response.getStatusCode()).willReturn(HttpStatus.OK);

spring-web/src/test/java/org/springframework/web/client/IntrospectingClientHttpResponseTests.java

@@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock;
  */
 class IntrospectingClientHttpResponseTests {
 
-	private final ClientHttpResponse response = mock(ClientHttpResponse.class);
+	private final ClientHttpResponse response = mock();
 
 	private final IntrospectingClientHttpResponse wrappedResponse = new IntrospectingClientHttpResponse(response);
 

spring-web/src/test/java/org/springframework/web/client/RestTemplateObservationTests.java

@@ -58,16 +58,16 @@ class RestTemplateObservationTests {
 
 	private final TestObservationRegistry observationRegistry = TestObservationRegistry.create();
 
-	private final ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class);
+	private final ClientHttpRequestFactory requestFactory = mock();
 
-	private final ClientHttpRequest request = mock(ClientHttpRequest.class);
+	private final ClientHttpRequest request = mock();
 
-	private final ClientHttpResponse response = mock(ClientHttpResponse.class);
+	private final ClientHttpResponse response = mock();
 
-	private final ResponseErrorHandler errorHandler = mock(ResponseErrorHandler.class);
+	private final ResponseErrorHandler errorHandler = mock();
 
 	@SuppressWarnings("unchecked")
-	private final HttpMessageConverter<String> converter = mock(HttpMessageConverter.class);
+	private final HttpMessageConverter<String> converter = mock();
 
 	private final RestTemplate template = new RestTemplate(List.of(converter));
 

spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java

@@ -83,16 +83,16 @@ import static org.springframework.http.MediaType.parseMediaType;
 @SuppressWarnings("unchecked")
 class RestTemplateTests {
 
-	private final ClientHttpRequestFactory requestFactory = mock(ClientHttpRequestFactory.class);
+	private final ClientHttpRequestFactory requestFactory = mock();
 
-	private final ClientHttpRequest request = mock(ClientHttpRequest.class);
+	private final ClientHttpRequest request = mock();
 
-	private final ClientHttpResponse response = mock(ClientHttpResponse.class);
+	private final ClientHttpResponse response = mock();
 
-	private final ResponseErrorHandler errorHandler = mock(ResponseErrorHandler.class);
+	private final ResponseErrorHandler errorHandler = mock();
 
 	@SuppressWarnings("rawtypes")
-	private final HttpMessageConverter converter = mock(HttpMessageConverter.class);
+	private final HttpMessageConverter converter = mock();
 
 	private final RestTemplate template = new RestTemplate(Collections.singletonList(converter));
 
@@ -241,10 +241,10 @@ class RestTemplateTests {
 
 	@Test
 	void requestAvoidsDuplicateAcceptHeaderValues() throws Exception {
-		HttpMessageConverter<?> firstConverter = mock(HttpMessageConverter.class);
+		HttpMessageConverter<?> firstConverter = mock();
 		given(firstConverter.canRead(any(), any())).willReturn(true);
 		given(firstConverter.getSupportedMediaTypes(any())).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN));
-		HttpMessageConverter<?> secondConverter = mock(HttpMessageConverter.class);
+		HttpMessageConverter<?> secondConverter = mock();
 		given(secondConverter.canRead(any(), any())).willReturn(true);
 		given(secondConverter.getSupportedMediaTypes(any())).willReturn(Collections.singletonList(MediaType.TEXT_PLAIN));
 
@@ -654,7 +654,7 @@ class RestTemplateTests {
 	@Test
 	@SuppressWarnings("rawtypes")
 	void exchangeParameterizedType() throws Exception {
-		GenericHttpMessageConverter converter = mock(GenericHttpMessageConverter.class);
+		GenericHttpMessageConverter converter = mock();
 		template.setMessageConverters(Collections.<HttpMessageConverter<?>>singletonList(converter));
 		ParameterizedTypeReference<List<Integer>> intList = new ParameterizedTypeReference<>() {};
 		given(converter.canRead(intList.getType(), null, null)).willReturn(true);

spring-web/src/test/java/org/springframework/web/context/request/ServletRequestAttributesTests.java

@@ -100,7 +100,7 @@ public class ServletRequestAttributesTests {
 
 	@Test
 	public void getSessionScopedAttributeDoesNotForceCreationOfSession() {
-		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpServletRequest request = mock();
 
 		ServletRequestAttributes attrs = new ServletRequestAttributes(request);
 		Object value = attrs.getAttribute(KEY, RequestAttributes.SCOPE_SESSION);
@@ -122,7 +122,7 @@ public class ServletRequestAttributesTests {
 
 	@Test
 	public void removeSessionScopedAttributeDoesNotForceCreationOfSession() {
-		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpServletRequest request = mock();
 
 		ServletRequestAttributes attrs = new ServletRequestAttributes(request);
 		attrs.removeAttribute(KEY, RequestAttributes.SCOPE_SESSION);
@@ -131,8 +131,8 @@ public class ServletRequestAttributesTests {
 
 	@Test
 	public void updateAccessedAttributes() {
-		HttpServletRequest request = mock(HttpServletRequest.class);
-		HttpSession session = mock(HttpSession.class);
+		HttpServletRequest request = mock();
+		HttpSession session = mock();
 		given(request.getSession(anyBoolean())).willReturn(session);
 		given(session.getAttribute(KEY)).willReturn(VALUE);
 
@@ -176,8 +176,8 @@ public class ServletRequestAttributesTests {
 	}
 
 	private void doSkipImmutableValue(Object immutableValue) {
-		HttpServletRequest request = mock(HttpServletRequest.class);
-		HttpSession session = mock(HttpSession.class);
+		HttpServletRequest request = mock();
+		HttpSession session = mock();
 		given(request.getSession(anyBoolean())).willReturn(session);
 		given(session.getAttribute(KEY)).willReturn(immutableValue);
 

spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java

@@ -33,7 +33,7 @@ public class DeferredResultTests {
 
 	@Test
 	public void setResult() {
-		DeferredResultHandler handler = mock(DeferredResultHandler.class);
+		DeferredResultHandler handler = mock();
 
 		DeferredResult<String> result = new DeferredResult<>();
 		result.setResultHandler(handler);
@@ -44,7 +44,7 @@ public class DeferredResultTests {
 
 	@Test
 	public void setResultTwice() {
-		DeferredResultHandler handler = mock(DeferredResultHandler.class);
+		DeferredResultHandler handler = mock();
 
 		DeferredResult<String> result = new DeferredResult<>();
 		result.setResultHandler(handler);
@@ -57,7 +57,7 @@ public class DeferredResultTests {
 
 	@Test
 	public void isSetOrExpired() {
-		DeferredResultHandler handler = mock(DeferredResultHandler.class);
+		DeferredResultHandler handler = mock();
 
 		DeferredResult<String> result = new DeferredResult<>();
 		result.setResultHandler(handler);
@@ -73,7 +73,7 @@ public class DeferredResultTests {
 
 	@Test
 	public void hasResult() {
-		DeferredResultHandler handler = mock(DeferredResultHandler.class);
+		DeferredResultHandler handler = mock();
 
 		DeferredResult<String> result = new DeferredResult<>();
 		result.setResultHandler(handler);
@@ -103,7 +103,7 @@ public class DeferredResultTests {
 	public void onTimeout() throws Exception {
 		final StringBuilder sb = new StringBuilder();
 
-		DeferredResultHandler handler = mock(DeferredResultHandler.class);
+		DeferredResultHandler handler = mock();
 
 		DeferredResult<String> result = new DeferredResult<>(null, "timeout result");
 		result.setResultHandler(handler);
@@ -120,7 +120,7 @@ public class DeferredResultTests {
 	public void onError() throws Exception {
 		final StringBuilder sb = new StringBuilder();
 
-		DeferredResultHandler handler = mock(DeferredResultHandler.class);
+		DeferredResultHandler handler = mock();
 
 		DeferredResult<String> result = new DeferredResult<>(null, "error result");
 		result.setResultHandler(handler);

spring-web/src/test/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequestTests.java

@@ -108,7 +108,7 @@ public class StandardServletAsyncWebRequestTests {
 
 	@Test
 	public void onTimeoutHandler() throws Exception {
-		Runnable timeoutHandler = mock(Runnable.class);
+		Runnable timeoutHandler = mock();
 		this.asyncRequest.addTimeoutHandler(timeoutHandler);
 		this.asyncRequest.onTimeout(new AsyncEvent(new MockAsyncContext(this.request, this.response)));
 		verify(timeoutHandler).run();
@@ -117,7 +117,7 @@ public class StandardServletAsyncWebRequestTests {
 	@SuppressWarnings("unchecked")
 	@Test
 	public void onErrorHandler() throws Exception {
-		Consumer<Throwable> errorHandler = mock(Consumer.class);
+		Consumer<Throwable> errorHandler = mock();
 		this.asyncRequest.addErrorHandler(errorHandler);
 		Exception e = new Exception();
 		this.asyncRequest.onError(new AsyncEvent(new MockAsyncContext(this.request, this.response), e));
@@ -133,7 +133,7 @@ public class StandardServletAsyncWebRequestTests {
 
 	@Test
 	public void onCompletionHandler() throws Exception {
-		Runnable handler = mock(Runnable.class);
+		Runnable handler = mock();
 		this.asyncRequest.addCompletionHandler(handler);
 
 		this.asyncRequest.startAsync();
@@ -148,7 +148,7 @@ public class StandardServletAsyncWebRequestTests {
 	@SuppressWarnings("unchecked")
 	@Test
 	public void onErrorHandlerAfterOnErrorEvent() throws Exception {
-		Consumer<Throwable> handler = mock(Consumer.class);
+		Consumer<Throwable> handler = mock();
 		this.asyncRequest.addErrorHandler(handler);
 
 		this.asyncRequest.startAsync();
@@ -160,7 +160,7 @@ public class StandardServletAsyncWebRequestTests {
 
 	@Test
 	public void onCompletionHandlerAfterOnCompleteEvent() throws Exception {
-		Runnable handler = mock(Runnable.class);
+		Runnable handler = mock();
 		this.asyncRequest.addCompletionHandler(handler);
 
 		this.asyncRequest.startAsync();

spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerErrorTests.java

@@ -59,7 +59,7 @@ public class WebAsyncManagerErrorTests {
 		this.servletResponse = new MockHttpServletResponse();
 		this.asyncWebRequest = new StandardServletAsyncWebRequest(servletRequest, servletResponse);
 
-		AsyncTaskExecutor executor = mock(AsyncTaskExecutor.class);
+		AsyncTaskExecutor executor = mock();
 
 		this.asyncManager = WebAsyncUtils.getAsyncManager(servletRequest);
 		this.asyncManager.setTaskExecutor(executor);
@@ -71,7 +71,7 @@ public class WebAsyncManagerErrorTests {
 	public void startCallableProcessingErrorAndComplete() throws Exception {
 		StubCallable callable = new StubCallable();
 
-		CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor = mock();
 		Exception e = new Exception();
 		given(interceptor.handleError(this.asyncWebRequest, callable, e)).willReturn(RESULT_NONE);
 
@@ -112,7 +112,7 @@ public class WebAsyncManagerErrorTests {
 
 		StubCallable callable = new StubCallable();
 
-		CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor = mock();
 		Exception e = new Exception();
 		given(interceptor.handleError(this.asyncWebRequest, callable, e)).willReturn(22);
 
@@ -135,7 +135,7 @@ public class WebAsyncManagerErrorTests {
 		StubCallable callable = new StubCallable();
 		Exception exception = new Exception();
 
-		CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor = mock();
 		Exception e = new Exception();
 		given(interceptor.handleError(this.asyncWebRequest, callable, e)).willThrow(exception);
 
@@ -157,7 +157,7 @@ public class WebAsyncManagerErrorTests {
 
 		DeferredResult<Integer> deferredResult = new DeferredResult<>();
 
-		DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class);
+		DeferredResultProcessingInterceptor interceptor = mock();
 		Exception e = new Exception();
 		given(interceptor.handleError(this.asyncWebRequest, deferredResult, e)).willReturn(true);
 

spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java

@@ -40,25 +40,22 @@ import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
 
 /**
- * Test fixture with an {@link WebAsyncManager} with a mock AsyncWebRequest.
+ * Tests for {@link WebAsyncManager} with a mock {@link AsyncWebRequest}.
  *
  * @author Rossen Stoyanchev
  */
-public class WebAsyncManagerTests {
+class WebAsyncManagerTests {
 
-	private WebAsyncManager asyncManager;
+	private AsyncWebRequest asyncWebRequest = mock();
 
-	private AsyncWebRequest asyncWebRequest;
+	private MockHttpServletRequest servletRequest = new MockHttpServletRequest();
 
-	private MockHttpServletRequest servletRequest;
+	private WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(servletRequest);
 
 
 	@BeforeEach
-	public void setup() {
-		this.servletRequest = new MockHttpServletRequest();
-		this.asyncManager = WebAsyncUtils.getAsyncManager(servletRequest);
+	void setup() {
 		this.asyncManager.setTaskExecutor(new SyncTaskExecutor());
-		this.asyncWebRequest = mock(AsyncWebRequest.class);
 		this.asyncManager.setAsyncWebRequest(this.asyncWebRequest);
 		verify(this.asyncWebRequest).addCompletionHandler((Runnable) notNull());
 		reset(this.asyncWebRequest);
@@ -66,7 +63,7 @@ public class WebAsyncManagerTests {
 
 
 	@Test
-	public void startAsyncProcessingWithoutAsyncWebRequest() throws Exception {
+	void startAsyncProcessingWithoutAsyncWebRequest() throws Exception {
 		WebAsyncManager manager = WebAsyncUtils.getAsyncManager(new MockHttpServletRequest());
 
 		assertThatIllegalStateException()
@@ -79,7 +76,7 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void isConcurrentHandlingStarted() {
+	void isConcurrentHandlingStarted() {
 		given(this.asyncWebRequest.isAsyncStarted()).willReturn(false);
 
 		assertThat(this.asyncManager.isConcurrentHandlingStarted()).isFalse();
@@ -91,17 +88,17 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void setAsyncWebRequestAfterAsyncStarted() {
+	void setAsyncWebRequestAfterAsyncStarted() {
 		this.asyncWebRequest.startAsync();
 		assertThatIllegalArgumentException().isThrownBy(() -> this.asyncManager.setAsyncWebRequest(null));
 	}
 
 	@Test
-	public void startCallableProcessing() throws Exception {
+	void startCallableProcessing() throws Exception {
 		int concurrentResult = 21;
 		Callable<Object> task = new StubCallable(concurrentResult);
 
-		CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor = mock();
 
 		setupDefaultAsyncScenario();
 
@@ -118,11 +115,11 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void startCallableProcessingCallableException() throws Exception {
+	void startCallableProcessingCallableException() throws Exception {
 		Exception concurrentResult = new Exception();
 		Callable<Object> task = new StubCallable(concurrentResult);
 
-		CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor = mock();
 
 		setupDefaultAsyncScenario();
 
@@ -139,11 +136,11 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void startCallableProcessingBeforeConcurrentHandlingException() throws Exception {
+	void startCallableProcessingBeforeConcurrentHandlingException() throws Exception {
 		Callable<Object> task = new StubCallable(21);
 		Exception exception = new Exception();
 
-		CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor = mock();
 		willThrow(exception).given(interceptor).beforeConcurrentHandling(this.asyncWebRequest, task);
 
 		this.asyncManager.registerCallableInterceptor("interceptor", interceptor);
@@ -160,11 +157,11 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void startCallableProcessingPreProcessException() throws Exception {
+	void startCallableProcessingPreProcessException() throws Exception {
 		Callable<Object> task = new StubCallable(21);
 		Exception exception = new Exception();
 
-		CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor = mock();
 		willThrow(exception).given(interceptor).preProcess(this.asyncWebRequest, task);
 
 		setupDefaultAsyncScenario();
@@ -180,11 +177,11 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void startCallableProcessingPostProcessException() throws Exception {
+	void startCallableProcessingPostProcessException() throws Exception {
 		Callable<Object> task = new StubCallable(21);
 		Exception exception = new Exception();
 
-		CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor = mock();
 		willThrow(exception).given(interceptor).postProcess(this.asyncWebRequest, task, 21);
 
 		setupDefaultAsyncScenario();
@@ -201,12 +198,12 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void startCallableProcessingPostProcessContinueAfterException() throws Exception {
+	void startCallableProcessingPostProcessContinueAfterException() throws Exception {
 		Callable<Object> task = new StubCallable(21);
 		Exception exception = new Exception();
 
-		CallableProcessingInterceptor interceptor1 = mock(CallableProcessingInterceptor.class);
-		CallableProcessingInterceptor interceptor2 = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor1 = mock();
+		CallableProcessingInterceptor interceptor2 = mock();
 		willThrow(exception).given(interceptor2).postProcess(this.asyncWebRequest, task, 21);
 
 		setupDefaultAsyncScenario();
@@ -227,11 +224,11 @@ public class WebAsyncManagerTests {
 
 	@SuppressWarnings("unchecked")
 	@Test
-	public void startCallableProcessingWithAsyncTask() throws Exception {
-		AsyncTaskExecutor executor = mock(AsyncTaskExecutor.class);
+	void startCallableProcessingWithAsyncTask() throws Exception {
+		AsyncTaskExecutor executor = mock();
 		given(this.asyncWebRequest.getNativeRequest(HttpServletRequest.class)).willReturn(this.servletRequest);
 
-		WebAsyncTask<Object> asyncTask = new WebAsyncTask<>(1000L, executor, mock(Callable.class));
+		WebAsyncTask<Object> asyncTask = new WebAsyncTask<>(1000L, executor, mock());
 		this.asyncManager.startCallableProcessing(asyncTask);
 
 		verify(executor).submit((Runnable) notNull());
@@ -243,18 +240,18 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void startCallableProcessingNullInput() throws Exception {
+	void startCallableProcessingNullInput() throws Exception {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> this.asyncManager.startCallableProcessing((Callable<?>) null))
 			.withMessage("Callable must not be null");
 	}
 
 	@Test
-	public void startDeferredResultProcessing() throws Exception {
+	void startDeferredResultProcessing() throws Exception {
 		DeferredResult<String> deferredResult = new DeferredResult<>(1000L);
 		String concurrentResult = "abc";
 
-		DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class);
+		DeferredResultProcessingInterceptor interceptor = mock();
 
 		setupDefaultAsyncScenario();
 
@@ -272,11 +269,11 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void startDeferredResultProcessingBeforeConcurrentHandlingException() throws Exception {
+	void startDeferredResultProcessingBeforeConcurrentHandlingException() throws Exception {
 		DeferredResult<Integer> deferredResult = new DeferredResult<>();
 		Exception exception = new Exception();
 
-		DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class);
+		DeferredResultProcessingInterceptor interceptor = mock();
 		willThrow(exception).given(interceptor).beforeConcurrentHandling(this.asyncWebRequest, deferredResult);
 
 		this.asyncManager.registerDeferredResultInterceptor("interceptor", interceptor);
@@ -293,11 +290,11 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void startDeferredResultProcessingPreProcessException() throws Exception {
+	void startDeferredResultProcessingPreProcessException() throws Exception {
 		DeferredResult<Integer> deferredResult = new DeferredResult<>();
 		Exception exception = new Exception();
 
-		DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class);
+		DeferredResultProcessingInterceptor interceptor = mock();
 		willThrow(exception).given(interceptor).preProcess(this.asyncWebRequest, deferredResult);
 
 		setupDefaultAsyncScenario();
@@ -313,11 +310,11 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void startDeferredResultProcessingPostProcessException() throws Exception {
+	void startDeferredResultProcessingPostProcessException() throws Exception {
 		DeferredResult<Integer> deferredResult = new DeferredResult<>();
 		Exception exception = new Exception();
 
-		DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class);
+		DeferredResultProcessingInterceptor interceptor = mock();
 		willThrow(exception).given(interceptor).postProcess(this.asyncWebRequest, deferredResult, 25);
 
 		setupDefaultAsyncScenario();
@@ -334,7 +331,7 @@ public class WebAsyncManagerTests {
 	}
 
 	@Test
-	public void startDeferredResultProcessingNullInput() throws Exception {
+	void startDeferredResultProcessingNullInput() throws Exception {
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> this.asyncManager.startDeferredResultProcessing(null))
 			.withMessage("DeferredResult must not be null");
@@ -358,7 +355,7 @@ public class WebAsyncManagerTests {
 
 		private Object value;
 
-		public StubCallable(Object value) {
+		StubCallable(Object value) {
 			this.value = value;
 		}
 

spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java

@@ -63,7 +63,7 @@ public class WebAsyncManagerTimeoutTests {
 		this.servletResponse = new MockHttpServletResponse();
 		this.asyncWebRequest = new StandardServletAsyncWebRequest(servletRequest, servletResponse);
 
-		AsyncTaskExecutor executor = mock(AsyncTaskExecutor.class);
+		AsyncTaskExecutor executor = mock();
 
 		this.asyncManager = WebAsyncUtils.getAsyncManager(servletRequest);
 		this.asyncManager.setTaskExecutor(executor);
@@ -75,7 +75,7 @@ public class WebAsyncManagerTimeoutTests {
 	public void startCallableProcessingTimeoutAndComplete() throws Exception {
 		StubCallable callable = new StubCallable();
 
-		CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor = mock();
 		given(interceptor.handleTimeout(this.asyncWebRequest, callable)).willReturn(RESULT_NONE);
 
 		this.asyncManager.registerCallableInterceptor("interceptor", interceptor);
@@ -112,7 +112,7 @@ public class WebAsyncManagerTimeoutTests {
 
 		StubCallable callable = new StubCallable();
 
-		CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor = mock();
 		given(interceptor.handleTimeout(this.asyncWebRequest, callable)).willReturn(22);
 
 		this.asyncManager.registerCallableInterceptor("timeoutInterceptor", interceptor);
@@ -133,7 +133,7 @@ public class WebAsyncManagerTimeoutTests {
 		StubCallable callable = new StubCallable();
 		Exception exception = new Exception();
 
-		CallableProcessingInterceptor interceptor = mock(CallableProcessingInterceptor.class);
+		CallableProcessingInterceptor interceptor = mock();
 		given(interceptor.handleTimeout(this.asyncWebRequest, callable)).willThrow(exception);
 
 		this.asyncManager.registerCallableInterceptor("timeoutInterceptor", interceptor);
@@ -153,9 +153,9 @@ public class WebAsyncManagerTimeoutTests {
 	public void startCallableProcessingTimeoutAndCheckThreadInterrupted() throws Exception {
 
 		StubCallable callable = new StubCallable();
-		Future future = mock(Future.class);
+		Future future = mock();
 
-		AsyncTaskExecutor executor = mock(AsyncTaskExecutor.class);
+		AsyncTaskExecutor executor = mock();
 		given(executor.submit(any(Runnable.class))).willReturn(future);
 
 		this.asyncManager.setTaskExecutor(executor);
@@ -174,7 +174,7 @@ public class WebAsyncManagerTimeoutTests {
 
 		DeferredResult<Integer> deferredResult = new DeferredResult<>();
 
-		DeferredResultProcessingInterceptor interceptor = mock(DeferredResultProcessingInterceptor.class);
+		DeferredResultProcessingInterceptor interceptor = mock();
 		given(interceptor.handleTimeout(this.asyncWebRequest, deferredResult)).willReturn(true);
 
 		this.asyncManager.registerDeferredResultInterceptor("interceptor", interceptor);

spring-web/src/test/java/org/springframework/web/context/support/ServletContextResourceTests.java

@@ -80,7 +80,7 @@ public class ServletContextResourceTests {
 
 	@Test
 	void missingResourceShouldHaveExpectedProperties() {
-		MockServletContext context = mock(MockServletContext.class);
+		MockServletContext context = mock();
 		given(context.getRealPath(eq("/org/springframework/web/context/support/missing.txt")))
 				.willReturn(this.servletContext.getRealPath("org/springframework/web/context/support/") + "missing.txt");
 		Resource missing = new ServletContextResource(context, "org/springframework/web/context/support/missing.txt");

spring-web/src/test/java/org/springframework/web/filter/CharacterEncodingFilterTests.java

@@ -47,14 +47,14 @@ public class CharacterEncodingFilterTests {
 
 	@Test
 	public void forceEncodingAlwaysSetsEncoding() throws Exception {
-		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpServletRequest request = mock();
 		request.setCharacterEncoding(ENCODING);
 		given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null);
 		given(request.getAttribute(filteredName(FILTER_NAME))).willReturn(null);
 		given(request.getDispatcherType()).willReturn(DispatcherType.REQUEST);
 
-		HttpServletResponse response = mock(HttpServletResponse.class);
-		FilterChain filterChain = mock(FilterChain.class);
+		HttpServletResponse response = mock();
+		FilterChain filterChain = mock();
 
 		CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING, true);
 		filter.init(new MockFilterConfig(FILTER_NAME));
@@ -68,7 +68,7 @@ public class CharacterEncodingFilterTests {
 
 	@Test
 	public void encodingIfEmptyAndNotForced() throws Exception {
-		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpServletRequest request = mock();
 		given(request.getCharacterEncoding()).willReturn(null);
 		given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null);
 		given(request.getAttribute(filteredName(FILTER_NAME))).willReturn(null);
@@ -76,7 +76,7 @@ public class CharacterEncodingFilterTests {
 
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
-		FilterChain filterChain = mock(FilterChain.class);
+		FilterChain filterChain = mock();
 
 		CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING);
 		filter.init(new MockFilterConfig(FILTER_NAME));
@@ -90,7 +90,7 @@ public class CharacterEncodingFilterTests {
 
 	@Test
 	public void doesNotIfEncodingIsNotEmptyAndNotForced() throws Exception {
-		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpServletRequest request = mock();
 		given(request.getCharacterEncoding()).willReturn(ENCODING);
 		given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null);
 		given(request.getAttribute(filteredName(FILTER_NAME))).willReturn(null);
@@ -98,7 +98,7 @@ public class CharacterEncodingFilterTests {
 
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
-		FilterChain filterChain = mock(FilterChain.class);
+		FilterChain filterChain = mock();
 
 		CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING);
 		filter.init(new MockFilterConfig(FILTER_NAME));
@@ -111,7 +111,7 @@ public class CharacterEncodingFilterTests {
 
 	@Test
 	public void withBeanInitialization() throws Exception {
-		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpServletRequest request = mock();
 		given(request.getCharacterEncoding()).willReturn(null);
 		given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null);
 		given(request.getAttribute(filteredName(FILTER_NAME))).willReturn(null);
@@ -119,7 +119,7 @@ public class CharacterEncodingFilterTests {
 
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
-		FilterChain filterChain = mock(FilterChain.class);
+		FilterChain filterChain = mock();
 
 		CharacterEncodingFilter filter = new CharacterEncodingFilter();
 		filter.setEncoding(ENCODING);
@@ -135,7 +135,7 @@ public class CharacterEncodingFilterTests {
 
 	@Test
 	public void withIncompleteInitialization() throws Exception {
-		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpServletRequest request = mock();
 		given(request.getCharacterEncoding()).willReturn(null);
 		given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null);
 		given(request.getAttribute(filteredName(CharacterEncodingFilter.class.getName()))).willReturn(null);
@@ -143,7 +143,7 @@ public class CharacterEncodingFilterTests {
 
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
-		FilterChain filterChain = mock(FilterChain.class);
+		FilterChain filterChain = mock();
 
 		CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING);
 		filter.doFilter(request, response, filterChain);
@@ -157,14 +157,14 @@ public class CharacterEncodingFilterTests {
 	// SPR-14240
 	@Test
 	public void setForceEncodingOnRequestOnly() throws Exception {
-		HttpServletRequest request = mock(HttpServletRequest.class);
+		HttpServletRequest request = mock();
 		request.setCharacterEncoding(ENCODING);
 		given(request.getAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE)).willReturn(null);
 		given(request.getAttribute(filteredName(FILTER_NAME))).willReturn(null);
 		given(request.getDispatcherType()).willReturn(DispatcherType.REQUEST);
 
-		HttpServletResponse response = mock(HttpServletResponse.class);
-		FilterChain filterChain = mock(FilterChain.class);
+		HttpServletResponse response = mock();
+		FilterChain filterChain = mock();
 
 		CharacterEncodingFilter filter = new CharacterEncodingFilter(ENCODING, true, false);
 		filter.init(new MockFilterConfig(FILTER_NAME));

spring-web/src/test/java/org/springframework/web/filter/ForwardedHeaderFilterTests.java

@@ -634,7 +634,7 @@ public class ForwardedHeaderFilterTests {
 				}
 			};
 			MockHttpServletResponse response = new MockHttpServletResponse();
-			FilterChain filterChain = new MockFilterChain(mock(HttpServlet.class), filter, redirectFilter);
+			FilterChain filterChain = new MockFilterChain(mock(), filter, redirectFilter);
 			filterChain.doFilter(request, response);
 			return response.getRedirectedUrl();
 		}

spring-web/src/test/java/org/springframework/web/filter/RelativeRedirectFilterTests.java

@@ -30,6 +30,7 @@ import org.springframework.web.testfixture.servlet.MockHttpServletResponse;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.mockito.Mockito.mock;
 
 /**
  * Unit tests for {@link RelativeRedirectFilter}.
@@ -41,7 +42,7 @@ public class RelativeRedirectFilterTests {
 
 	private RelativeRedirectFilter filter = new RelativeRedirectFilter();
 
-	private HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
+	private HttpServletResponse response = mock();
 
 
 	@Test

spring-web/src/test/java/org/springframework/web/method/ControllerAdviceBeanTests.java

@@ -74,7 +74,7 @@ public class ControllerAdviceBeanTests {
 	@Test
 	public void equalsHashCodeAndToStringForBeanName() {
 		String beanName = "myBean";
-		BeanFactory beanFactory = mock(BeanFactory.class);
+		BeanFactory beanFactory = mock();
 		given(beanFactory.containsBean(beanName)).willReturn(true);
 
 		ControllerAdviceBean bean1 = new ControllerAdviceBean(beanName, beanFactory);
@@ -232,7 +232,7 @@ public class ControllerAdviceBeanTests {
 	@SuppressWarnings({"rawtypes", "unchecked"})
 	private void assertOrder(Class beanType, int expectedOrder) {
 		String beanName = "myBean";
-		BeanFactory beanFactory = mock(BeanFactory.class);
+		BeanFactory beanFactory = mock();
 		given(beanFactory.containsBean(beanName)).willReturn(true);
 		given(beanFactory.getType(beanName)).willReturn(beanType);
 		given(beanFactory.getBean(beanName)).willReturn(BeanUtils.instantiateClass(beanType));

spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java

@@ -161,7 +161,7 @@ public class ModelAttributeMethodProcessorTests {
 	@Test
 	public void resolveArgumentViaDefaultConstructor() throws Exception {
 		WebDataBinder dataBinder = new WebRequestDataBinder(null);
-		WebDataBinderFactory factory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory factory = mock();
 		given(factory.createBinder(any(), notNull(), eq("attrName"))).willReturn(dataBinder);
 
 		this.processor.resolveArgument(this.paramNamedValidModelAttr, this.container, this.request, factory);
@@ -175,7 +175,7 @@ public class ModelAttributeMethodProcessorTests {
 		this.container.addAttribute(name, target);
 
 		StubRequestDataBinder dataBinder = new StubRequestDataBinder(target, name);
-		WebDataBinderFactory factory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory factory = mock();
 		given(factory.createBinder(this.request, target, name)).willReturn(dataBinder);
 
 		this.processor.resolveArgument(this.paramNamedValidModelAttr, this.container, this.request, factory);
@@ -194,7 +194,7 @@ public class ModelAttributeMethodProcessorTests {
 		this.container.setBindingDisabled(name);
 
 		StubRequestDataBinder dataBinder = new StubRequestDataBinder(target, name);
-		WebDataBinderFactory factory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory factory = mock();
 		given(factory.createBinder(this.request, target, name)).willReturn(dataBinder);
 
 		this.processor.resolveArgument(this.paramNamedValidModelAttr, this.container, this.request, factory);
@@ -210,7 +210,7 @@ public class ModelAttributeMethodProcessorTests {
 		this.container.addAttribute(name, target);
 
 		StubRequestDataBinder dataBinder = new StubRequestDataBinder(target, name);
-		WebDataBinderFactory factory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory factory = mock();
 		given(factory.createBinder(this.request, target, name)).willReturn(dataBinder);
 
 		this.processor.resolveArgument(this.paramBindingDisabledAttr, this.container, this.request, factory);
@@ -227,7 +227,7 @@ public class ModelAttributeMethodProcessorTests {
 
 		StubRequestDataBinder dataBinder = new StubRequestDataBinder(target, name);
 		dataBinder.getBindingResult().reject("error");
-		WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory binderFactory = mock();
 		given(binderFactory.createBinder(this.request, target, name)).willReturn(dataBinder);
 
 		assertThatExceptionOfType(BindException.class).isThrownBy(() ->
@@ -246,7 +246,7 @@ public class ModelAttributeMethodProcessorTests {
 		this.container.addAttribute("anotherTestBean", anotherTestBean);
 
 		StubRequestDataBinder dataBinder = new StubRequestDataBinder(testBean, name);
-		WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory binderFactory = mock();
 		given(binderFactory.createBinder(this.request, testBean, name)).willReturn(dataBinder);
 
 		this.processor.resolveArgument(this.paramModelAttr, this.container, this.request, binderFactory);
@@ -275,7 +275,7 @@ public class ModelAttributeMethodProcessorTests {
 		mockRequest.addParameter("listOfStrings", "1,2");
 		ServletWebRequest requestWithParam = new ServletWebRequest(mockRequest);
 
-		WebDataBinderFactory factory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory factory = mock();
 		given(factory.createBinder(any(), any(), eq("testBeanWithConstructorArgs")))
 				.willAnswer(invocation -> {
 					WebRequestDataBinder binder = new WebRequestDataBinder(invocation.getArgument(1));
@@ -294,7 +294,7 @@ public class ModelAttributeMethodProcessorTests {
 		this.container.addAttribute(expectedAttrName, target);
 
 		WebDataBinder dataBinder = new WebRequestDataBinder(target);
-		WebDataBinderFactory factory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory factory = mock();
 		given(factory.createBinder(this.request, target, expectedAttrName)).willReturn(dataBinder);
 
 		this.processor.resolveArgument(param, this.container, this.request, factory);

spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java

@@ -168,7 +168,7 @@ public class ModelFactoryTests {
 		container.addAttribute(commandName, command);
 
 		WebDataBinder dataBinder = new WebDataBinder(command, commandName);
-		WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory binderFactory = mock();
 		given(binderFactory.createBinder(this.webRequest, command, commandName)).willReturn(dataBinder);
 
 		ModelFactory modelFactory = new ModelFactory(null, binderFactory, this.attributeHandler);
@@ -188,7 +188,7 @@ public class ModelFactoryTests {
 		container.addAttribute(attributeName, attribute);
 
 		WebDataBinder dataBinder = new WebDataBinder(attribute, attributeName);
-		WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory binderFactory = mock();
 		given(binderFactory.createBinder(this.webRequest, attribute, attributeName)).willReturn(dataBinder);
 
 		ModelFactory modelFactory = new ModelFactory(null, binderFactory, this.attributeHandler);
@@ -208,7 +208,7 @@ public class ModelFactoryTests {
 		this.attributeStore.storeAttribute(this.webRequest, attributeName, attribute);
 
 		WebDataBinder dataBinder = new WebDataBinder(attribute, attributeName);
-		WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory binderFactory = mock();
 		given(binderFactory.createBinder(this.webRequest, attribute, attributeName)).willReturn(dataBinder);
 
 		container.getSessionStatus().setComplete();
@@ -233,7 +233,7 @@ public class ModelFactoryTests {
 		container.setRedirectModelScenario(true);
 
 		WebDataBinder dataBinder = new WebDataBinder(attribute, attributeName);
-		WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory binderFactory = mock();
 		given(binderFactory.createBinder(this.webRequest, attribute, attributeName)).willReturn(dataBinder);
 
 		ModelFactory modelFactory = new ModelFactory(null, binderFactory, this.attributeHandler);

spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java

@@ -437,7 +437,7 @@ public class RequestParamMethodArgumentResolverTests {
 		WebDataBinder binder = new WebRequestDataBinder(null);
 		binder.registerCustomEditor(String.class, new StringTrimmerEditor(true));
 
-		WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory binderFactory = mock();
 		given(binderFactory.createBinder(webRequest, null, "stringNotAnnot")).willReturn(binder);
 
 		request.addParameter("stringNotAnnot", "");
@@ -452,7 +452,7 @@ public class RequestParamMethodArgumentResolverTests {
 		WebDataBinder binder = new WebRequestDataBinder(null);
 		binder.registerCustomEditor(String.class, new StringTrimmerEditor(true));
 
-		WebDataBinderFactory binderFactory = mock(WebDataBinderFactory.class);
+		WebDataBinderFactory binderFactory = mock();
 		given(binderFactory.createBinder(webRequest, null, "name")).willReturn(binder);
 
 		request.addParameter("name", "");

spring-web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java

@@ -40,34 +40,32 @@ import static org.mockito.Mockito.verify;
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
-public class WebArgumentResolverAdapterTests {
+class WebArgumentResolverAdapterTests {
 
-	private TestWebArgumentResolverAdapter adapter;
+	private WebArgumentResolver adaptee = mock();
 
-	private WebArgumentResolver adaptee;
+	private TestWebArgumentResolverAdapter adapter = new TestWebArgumentResolverAdapter(adaptee);
+
+	private NativeWebRequest webRequest = new ServletWebRequest(new MockHttpServletRequest());
 
 	private MethodParameter parameter;
 
-	private NativeWebRequest webRequest;
 
 	@BeforeEach
-	public void setUp() throws Exception {
-		adaptee = mock(WebArgumentResolver.class);
-		adapter = new TestWebArgumentResolverAdapter(adaptee);
+	void setUp() throws Exception {
 		parameter = new MethodParameter(getClass().getMethod("handle", Integer.TYPE), 0);
-		webRequest = new ServletWebRequest(new MockHttpServletRequest());
 
 		// Expose request to the current thread (for SpEL expressions)
 		RequestContextHolder.setRequestAttributes(webRequest);
 	}
 
 	@AfterEach
-	public void resetRequestContextHolder() {
+	void resetRequestContextHolder() {
 		RequestContextHolder.resetRequestAttributes();
 	}
 
 	@Test
-	public void supportsParameter() throws Exception {
+	void supportsParameter() throws Exception {
 		given(adaptee.resolveArgument(parameter, webRequest)).willReturn(42);
 
 		assertThat(adapter.supportsParameter(parameter)).as("Parameter not supported").isTrue();
@@ -76,7 +74,7 @@ public class WebArgumentResolverAdapterTests {
 	}
 
 	@Test
-	public void supportsParameterUnresolved() throws Exception {
+	void supportsParameterUnresolved() throws Exception {
 		given(adaptee.resolveArgument(parameter, webRequest)).willReturn(WebArgumentResolver.UNRESOLVED);
 
 		assertThat(adapter.supportsParameter(parameter)).as("Parameter supported").isFalse();
@@ -85,7 +83,7 @@ public class WebArgumentResolverAdapterTests {
 	}
 
 	@Test
-	public void supportsParameterWrongType() throws Exception {
+	void supportsParameterWrongType() throws Exception {
 		given(adaptee.resolveArgument(parameter, webRequest)).willReturn("Foo");
 
 		assertThat(adapter.supportsParameter(parameter)).as("Parameter supported").isFalse();
@@ -94,7 +92,7 @@ public class WebArgumentResolverAdapterTests {
 	}
 
 	@Test
-	public void supportsParameterThrowsException() throws Exception {
+	void supportsParameterThrowsException() throws Exception {
 		given(adaptee.resolveArgument(parameter, webRequest)).willThrow(new Exception());
 
 		assertThat(adapter.supportsParameter(parameter)).as("Parameter supported").isFalse();
@@ -103,7 +101,7 @@ public class WebArgumentResolverAdapterTests {
 	}
 
 	@Test
-	public void resolveArgument() throws Exception {
+	void resolveArgument() throws Exception {
 		int expected = 42;
 		given(adaptee.resolveArgument(parameter, webRequest)).willReturn(expected);
 
@@ -112,7 +110,7 @@ public class WebArgumentResolverAdapterTests {
 	}
 
 	@Test
-	public void resolveArgumentUnresolved() throws Exception {
+	void resolveArgumentUnresolved() throws Exception {
 		given(adaptee.resolveArgument(parameter, webRequest)).willReturn(WebArgumentResolver.UNRESOLVED);
 
 		assertThatIllegalStateException().isThrownBy(() ->
@@ -120,7 +118,7 @@ public class WebArgumentResolverAdapterTests {
 	}
 
 	@Test
-	public void resolveArgumentWrongType() throws Exception {
+	void resolveArgumentWrongType() throws Exception {
 		given(adaptee.resolveArgument(parameter, webRequest)).willReturn("Foo");
 
 		assertThatIllegalStateException().isThrownBy(() ->
@@ -128,7 +126,7 @@ public class WebArgumentResolverAdapterTests {
 	}
 
 	@Test
-	public void resolveArgumentThrowsException() throws Exception {
+	void resolveArgumentThrowsException() throws Exception {
 		given(adaptee.resolveArgument(parameter, webRequest)).willThrow(new Exception());
 
 		assertThatException().isThrownBy(() -> adapter.resolveArgument(parameter, null, webRequest, null));
@@ -139,7 +137,7 @@ public class WebArgumentResolverAdapterTests {
 
 	private class TestWebArgumentResolverAdapter extends AbstractWebArgumentResolverAdapter {
 
-		public TestWebArgumentResolverAdapter(WebArgumentResolver adaptee) {
+		TestWebArgumentResolverAdapter(WebArgumentResolver adaptee) {
 			super(adaptee);
 		}
 

spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java

@@ -34,13 +34,13 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
  * @author Rossen Stoyanchev
  */
 @SuppressWarnings("unused")
-public class HandlerMethodReturnValueHandlerCompositeTests {
+class HandlerMethodReturnValueHandlerCompositeTests {
 
-	private HandlerMethodReturnValueHandlerComposite handlers;
+	private HandlerMethodReturnValueHandlerComposite handlers = new HandlerMethodReturnValueHandlerComposite();
 
-	private HandlerMethodReturnValueHandler integerHandler;
+	private HandlerMethodReturnValueHandler integerHandler = mock();
 
-	ModelAndViewContainer mavContainer;
+	private ModelAndViewContainer mavContainer = new ModelAndViewContainer();
 
 	private MethodParameter integerType;
 
@@ -48,35 +48,31 @@ public class HandlerMethodReturnValueHandlerCompositeTests {
 
 
 	@BeforeEach
-	public void setup() throws Exception {
+	void setup() throws Exception {
 		this.integerType = new MethodParameter(getClass().getDeclaredMethod("handleInteger"), -1);
 		this.stringType = new MethodParameter(getClass().getDeclaredMethod("handleString"), -1);
 
-		this.integerHandler = mock(HandlerMethodReturnValueHandler.class);
 		given(this.integerHandler.supportsReturnType(this.integerType)).willReturn(true);
 
-		this.handlers = new HandlerMethodReturnValueHandlerComposite();
 		this.handlers.addHandler(this.integerHandler);
-
-		mavContainer = new ModelAndViewContainer();
 	}
 
 
 	@Test
-	public void supportsReturnType() throws Exception {
+	void supportsReturnType() throws Exception {
 		assertThat(this.handlers.supportsReturnType(this.integerType)).isTrue();
 		assertThat(this.handlers.supportsReturnType(this.stringType)).isFalse();
 	}
 
 	@Test
-	public void handleReturnValue() throws Exception {
+	void handleReturnValue() throws Exception {
 		this.handlers.handleReturnValue(55, this.integerType, this.mavContainer, null);
 		verify(this.integerHandler).handleReturnValue(55, this.integerType, this.mavContainer, null);
 	}
 
 	@Test
-	public void handleReturnValueWithMultipleHandlers() throws Exception {
-		HandlerMethodReturnValueHandler anotherIntegerHandler = mock(HandlerMethodReturnValueHandler.class);
+	void handleReturnValueWithMultipleHandlers() throws Exception {
+		HandlerMethodReturnValueHandler anotherIntegerHandler = mock();
 		given(anotherIntegerHandler.supportsReturnType(this.integerType)).willReturn(true);
 
 		this.handlers.handleReturnValue(55, this.integerType, this.mavContainer, null);
@@ -86,15 +82,15 @@ public class HandlerMethodReturnValueHandlerCompositeTests {
 	}
 
 	@Test  // SPR-13083
-	public void handleReturnValueWithAsyncHandler() throws Exception {
+	void handleReturnValueWithAsyncHandler() throws Exception {
 		Promise<Integer> promise = new Promise<>();
 		MethodParameter promiseType = new MethodParameter(getClass().getDeclaredMethod("handlePromise"), -1);
 
-		HandlerMethodReturnValueHandler responseBodyHandler = mock(HandlerMethodReturnValueHandler.class);
+		HandlerMethodReturnValueHandler responseBodyHandler = mock();
 		given(responseBodyHandler.supportsReturnType(promiseType)).willReturn(true);
 		this.handlers.addHandler(responseBodyHandler);
 
-		AsyncHandlerMethodReturnValueHandler promiseHandler = mock(AsyncHandlerMethodReturnValueHandler.class);
+		AsyncHandlerMethodReturnValueHandler promiseHandler = mock();
 		given(promiseHandler.supportsReturnType(promiseType)).willReturn(true);
 		given(promiseHandler.isAsyncReturnValue(promise, promiseType)).willReturn(true);
 		this.handlers.addHandler(promiseHandler);
@@ -109,7 +105,7 @@ public class HandlerMethodReturnValueHandlerCompositeTests {
 	}
 
 	@Test
-	public void noSuitableReturnValueHandler() throws Exception {
+	void noSuitableReturnValueHandler() throws Exception {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				this.handlers.handleReturnValue("value", this.stringType, null, null));
 	}

spring-web/src/test/java/org/springframework/web/multipart/support/ByteArrayMultipartFileEditorTests.java

@@ -72,7 +72,7 @@ public class ByteArrayMultipartFileEditorTests {
 	@Test
 	public void setValueAsMultipartFile() throws Exception {
 		String expectedValue = "That is comforting to know";
-		MultipartFile file = mock(MultipartFile.class);
+		MultipartFile file = mock();
 		given(file.getBytes()).willReturn(expectedValue.getBytes());
 		editor.setValue(file);
 		assertThat(editor.getAsText()).isEqualTo(expectedValue);
@@ -80,7 +80,7 @@ public class ByteArrayMultipartFileEditorTests {
 
 	@Test
 	public void setValueAsMultipartFileWithBadBytes() throws Exception {
-		MultipartFile file = mock(MultipartFile.class);
+		MultipartFile file = mock();
 		given(file.getBytes()).willThrow(new IOException());
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				editor.setValue(file));

spring-web/src/test/java/org/springframework/web/service/annotation/HttpExchangeBeanRegistrationAotProcessorTests.java

@@ -24,7 +24,6 @@ import org.springframework.aot.generate.GenerationContext;
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
 import org.springframework.aot.test.generate.TestGenerationContext;
 import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
-import org.springframework.beans.factory.aot.BeanRegistrationCode;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -61,7 +60,7 @@ class HttpExchangeBeanRegistrationAotProcessorTests {
 	private void process(Class<?> beanClass) {
 		BeanRegistrationAotContribution contribution = createContribution(beanClass);
 		if (contribution != null) {
-			contribution.applyTo(this.generationContext, mock(BeanRegistrationCode.class));
+			contribution.applyTo(this.generationContext, mock());
 		}
 	}