Apply "instanceof pattern matching" Eclipse clean-up in spring-test

This has only been applied to `src/main/java`.

spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java

@@ -1279,8 +1279,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
 
 	public void setSession(HttpSession session) {
 		this.session = session;
-		if (session instanceof MockHttpSession) {
+		if (session instanceof MockHttpSession mockSession) {
-			MockHttpSession mockSession = ((MockHttpSession) session);
 			mockSession.access();
 		}
 	}

spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java

@@ -444,8 +444,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
 		if (cookie.isHttpOnly()) {
 			buf.append("; HttpOnly");
 		}
-		if (cookie instanceof MockCookie) {
+		if (cookie instanceof MockCookie mockCookie) {
-			MockCookie mockCookie = (MockCookie) cookie;
 			if (StringUtils.hasText(mockCookie.getSameSite())) {
 				buf.append("; SameSite=").append(mockCookie.getSameSite());
 			}

spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java

@@ -335,10 +335,9 @@ public class ContextConfigurationAttributes {
 		if (this == other) {
 			return true;
 		}
-		if (!(other instanceof ContextConfigurationAttributes)) {
+		if (!(other instanceof ContextConfigurationAttributes otherAttr)) {
 			return false;
 		}
-		ContextConfigurationAttributes otherAttr = (ContextConfigurationAttributes) other;
 		return (ObjectUtils.nullSafeEquals(this.declaringClass, otherAttr.declaringClass) &&
 				Arrays.equals(this.classes, otherAttr.classes)) &&
 				Arrays.equals(this.locations, otherAttr.locations) &&

spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java

@@ -94,8 +94,7 @@ public class DefaultCacheAwareContextLoaderDelegate implements CacheAwareContext
 
 		ApplicationContext applicationContext;
 
-		if (contextLoader instanceof SmartContextLoader) {
+		if (contextLoader instanceof SmartContextLoader smartContextLoader) {
-			SmartContextLoader smartContextLoader = (SmartContextLoader) contextLoader;
 			applicationContext = smartContextLoader.loadContext(mergedContextConfiguration);
 		}
 		else {

spring-test/src/main/java/org/springframework/test/context/event/DefaultApplicationEvents.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,8 +58,8 @@ class DefaultApplicationEvents implements ApplicationEvents {
 	}
 
 	private Object unwrapPayloadEvent(Object source) {
-		return (PayloadApplicationEvent.class.isInstance(source) ?
+		return ((source instanceof PayloadApplicationEvent<?> payloadApplicationEvent) ?
-				((PayloadApplicationEvent<?>) source).getPayload() : source);
+				payloadApplicationEvent.getPayload() : source);
 	}
 
 }

spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java

@@ -352,8 +352,7 @@ public abstract class AbstractTestContextBootstrapper implements TestContextBoot
 				logger.trace(String.format("Processing locations and classes for context configuration attributes %s",
 						configAttributes));
 			}
-			if (contextLoader instanceof SmartContextLoader) {
+			if (contextLoader instanceof SmartContextLoader smartContextLoader) {
-				SmartContextLoader smartContextLoader = (SmartContextLoader) contextLoader;
 				smartContextLoader.processContextConfiguration(configAttributes);
 				locations.addAll(0, Arrays.asList(configAttributes.getLocations()));
 				classes.addAll(0, Arrays.asList(configAttributes.getClasses()));

spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java

@@ -122,9 +122,7 @@ public class DefaultTestContext implements TestContext {
 	@Override
 	public ApplicationContext getApplicationContext() {
 		ApplicationContext context = this.cacheAwareContextLoaderDelegate.loadContext(this.mergedContextConfiguration);
-		if (context instanceof ConfigurableApplicationContext) {
+		if (context instanceof ConfigurableApplicationContext cac) {
-			@SuppressWarnings("resource")
-			ConfigurableApplicationContext cac = (ConfigurableApplicationContext) context;
 			Assert.state(cac.isActive(), () ->
 					"The ApplicationContext loaded for [" + this.mergedContextConfiguration +
 					"] is not active. This may be due to one of the following reasons: " +

spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java

@@ -106,9 +106,7 @@ public abstract class TestContextTransactionUtils {
 		}
 
 		try {
-			if (bf instanceof ListableBeanFactory) {
+			if (bf instanceof ListableBeanFactory lbf) {
-				ListableBeanFactory lbf = (ListableBeanFactory) bf;
-
 				// Look up single bean by type
 				Map<String, DataSource> dataSources =
 						BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, DataSource.class);
@@ -180,9 +178,7 @@ public abstract class TestContextTransactionUtils {
 		}
 
 		try {
-			if (bf instanceof ListableBeanFactory) {
+			if (bf instanceof ListableBeanFactory lbf) {
-				ListableBeanFactory lbf = (ListableBeanFactory) bf;
-
 				// Look up single TransactionManagementConfigurer
 				Map<String, TransactionManagementConfigurer> configurers =
 						BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, TransactionManagementConfigurer.class);

spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java

@@ -188,8 +188,7 @@ public class ServletTestExecutionListener extends AbstractTestExecutionListener
 
 		ApplicationContext context = testContext.getApplicationContext();
 
-		if (context instanceof WebApplicationContext) {
+		if (context instanceof WebApplicationContext wac) {
-			WebApplicationContext wac = (WebApplicationContext) context;
 			ServletContext servletContext = wac.getServletContext();
 			Assert.state(servletContext instanceof MockServletContext, () -> String.format(
 						"The WebApplicationContext for test context %s must be configured with a MockServletContext.",
@@ -211,9 +210,7 @@ public class ServletTestExecutionListener extends AbstractTestExecutionListener
 			testContext.setAttribute(POPULATED_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
 			testContext.setAttribute(RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE, Boolean.TRUE);
 
-			if (wac instanceof ConfigurableApplicationContext) {
+			if (wac instanceof ConfigurableApplicationContext configurableApplicationContext) {
-				@SuppressWarnings("resource")
-				ConfigurableApplicationContext configurableApplicationContext = (ConfigurableApplicationContext) wac;
 				ConfigurableListableBeanFactory bf = configurableApplicationContext.getBeanFactory();
 				bf.registerResolvableDependency(MockHttpServletResponse.class, response);
 				bf.registerResolvableDependency(ServletWebRequest.class, servletWebRequest);

spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java

@@ -36,8 +36,7 @@ class MockServerContainerContextCustomizer implements ContextCustomizer {
 
 	@Override
 	public void customizeContext(ConfigurableApplicationContext context, MergedContextConfiguration mergedConfig) {
-		if (context instanceof WebApplicationContext) {
+		if (context instanceof WebApplicationContext wac) {
-			WebApplicationContext wac = (WebApplicationContext) context;
 			ServletContext sc = wac.getServletContext();
 			if (sc != null) {
 				sc.setAttribute("jakarta.websocket.server.ServerContainer", new MockServerContainer());

spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java

@@ -45,6 +45,7 @@ abstract class AbstractMockMvcServerSpec<B extends MockMvcWebTestClient.MockMvcS
 		return self();
 	}
 
+	@Override
 	public final <T extends B> T filter(Filter filter, String... urlPatterns) {
 		getMockMvcBuilder().addFilter(filter, urlPatterns);
 		return self();

spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java

@@ -370,8 +370,7 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
 			});
 		});
 		for (NameValuePair param : this.webRequest.getRequestParameters()) {
-			if (param instanceof KeyDataPair) {
+			if (param instanceof KeyDataPair pair) {
-				KeyDataPair pair = (KeyDataPair) param;
 				File file = pair.getFile();
 				MockPart part;
 				if (file != null) {

spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java

@@ -561,11 +561,9 @@ public class MockHttpServletRequestBuilder
 		if (parent == null) {
 			return this;
 		}
-		if (!(parent instanceof MockHttpServletRequestBuilder)) {
+		if (!(parent instanceof MockHttpServletRequestBuilder parentBuilder)) {
 			throw new IllegalArgumentException("Cannot merge with [" + parent.getClass().getName() + "]");
 		}
-		MockHttpServletRequestBuilder parentBuilder = (MockHttpServletRequestBuilder) parent;
-
 		if (!StringUtils.hasText(this.contextPath)) {
 			this.contextPath = parentBuilder.contextPath;
 		}

spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java

@@ -122,8 +122,7 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque
 		}
 		if (parent instanceof MockHttpServletRequestBuilder) {
 			super.merge(parent);
-			if (parent instanceof MockMultipartHttpServletRequestBuilder) {
+			if (parent instanceof MockMultipartHttpServletRequestBuilder parentBuilder) {
-				MockMultipartHttpServletRequestBuilder parentBuilder = (MockMultipartHttpServletRequestBuilder) parent;
 				this.files.addAll(parentBuilder.files);
 				parentBuilder.parts.keySet().forEach(name ->
 						this.parts.putIfAbsent(name, parentBuilder.parts.get(name)));

spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java

@@ -179,8 +179,7 @@ public class PrintingResultHandler implements ResultHandler {
 			this.printer.printValue("Type", null);
 		}
 		else {
-			if (handler instanceof HandlerMethod) {
+			if (handler instanceof HandlerMethod handlerMethod) {
-				HandlerMethod handlerMethod = (HandlerMethod) handler;
 				this.printer.printValue("Type", handlerMethod.getBeanType().getName());
 				this.printer.printValue("Method", handlerMethod);
 			}