diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java index 1a3e7102e9..2ac4b33e4c 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/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) { - MockHttpSession mockSession = ((MockHttpSession) session); + if (session instanceof MockHttpSession mockSession) { mockSession.access(); } } diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java index df02fa4deb..981f3a515a 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java +++ b/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) { - MockCookie mockCookie = (MockCookie) cookie; + if (cookie instanceof MockCookie mockCookie) { if (StringUtils.hasText(mockCookie.getSameSite())) { buf.append("; SameSite=").append(mockCookie.getSameSite()); } diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java index e910c4c9d5..7b2e275c2b 100644 --- a/spring-test/src/main/java/org/springframework/test/context/ContextConfigurationAttributes.java +++ b/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) && diff --git a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java index 133373dc7f..2e5e54eed1 100644 --- a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java +++ b/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) { - SmartContextLoader smartContextLoader = (SmartContextLoader) contextLoader; + if (contextLoader instanceof SmartContextLoader smartContextLoader) { applicationContext = smartContextLoader.loadContext(mergedContextConfiguration); } else { diff --git a/spring-test/src/main/java/org/springframework/test/context/event/DefaultApplicationEvents.java b/spring-test/src/main/java/org/springframework/test/context/event/DefaultApplicationEvents.java index 22d2eff61b..b7638ba2d5 100644 --- a/spring-test/src/main/java/org/springframework/test/context/event/DefaultApplicationEvents.java +++ b/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) ? - ((PayloadApplicationEvent) source).getPayload() : source); + return ((source instanceof PayloadApplicationEvent payloadApplicationEvent) ? + payloadApplicationEvent.getPayload() : source); } } diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java index 17bddaf5b4..be2b3b8d57 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java +++ b/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) { - SmartContextLoader smartContextLoader = (SmartContextLoader) contextLoader; + if (contextLoader instanceof SmartContextLoader smartContextLoader) { smartContextLoader.processContextConfiguration(configAttributes); locations.addAll(0, Arrays.asList(configAttributes.getLocations())); classes.addAll(0, Arrays.asList(configAttributes.getClasses())); diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java b/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java index 0d0d0af7e1..ff318f8c3d 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DefaultTestContext.java +++ b/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) { - @SuppressWarnings("resource") - ConfigurableApplicationContext cac = (ConfigurableApplicationContext) context; + if (context instanceof ConfigurableApplicationContext cac) { Assert.state(cac.isActive(), () -> "The ApplicationContext loaded for [" + this.mergedContextConfiguration + "] is not active. This may be due to one of the following reasons: " + diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java index fc2c8be8e2..8b10ae16a0 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/TestContextTransactionUtils.java +++ b/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) { - ListableBeanFactory lbf = (ListableBeanFactory) bf; - + if (bf instanceof ListableBeanFactory lbf) { // Look up single bean by type Map dataSources = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, DataSource.class); @@ -180,9 +178,7 @@ public abstract class TestContextTransactionUtils { } try { - if (bf instanceof ListableBeanFactory) { - ListableBeanFactory lbf = (ListableBeanFactory) bf; - + if (bf instanceof ListableBeanFactory lbf) { // Look up single TransactionManagementConfigurer Map configurers = BeanFactoryUtils.beansOfTypeIncludingAncestors(lbf, TransactionManagementConfigurer.class); diff --git a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java index 3051524eb8..0badc4476c 100644 --- a/spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java +++ b/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) { - WebApplicationContext wac = (WebApplicationContext) context; + if (context instanceof WebApplicationContext wac) { 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) { - @SuppressWarnings("resource") - ConfigurableApplicationContext configurableApplicationContext = (ConfigurableApplicationContext) wac; + if (wac instanceof ConfigurableApplicationContext configurableApplicationContext) { ConfigurableListableBeanFactory bf = configurableApplicationContext.getBeanFactory(); bf.registerResolvableDependency(MockHttpServletResponse.class, response); bf.registerResolvableDependency(ServletWebRequest.class, servletWebRequest); diff --git a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java b/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java index c746941672..7a4222833b 100644 --- a/spring-test/src/main/java/org/springframework/test/context/web/socket/MockServerContainerContextCustomizer.java +++ b/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) { - WebApplicationContext wac = (WebApplicationContext) context; + if (context instanceof WebApplicationContext wac) { ServletContext sc = wac.getServletContext(); if (sc != null) { sc.setAttribute("jakarta.websocket.server.ServerContainer", new MockServerContainer()); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java index d811cdb12e..252e70a0bf 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockMvcServerSpec.java @@ -45,6 +45,7 @@ abstract class AbstractMockMvcServerSpec T filter(Filter filter, String... urlPatterns) { getMockMvcBuilder().addFilter(filter, urlPatterns); return self(); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java index 16df1e7e48..81bde23065 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java +++ b/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) { - KeyDataPair pair = (KeyDataPair) param; + if (param instanceof KeyDataPair pair) { File file = pair.getFile(); MockPart part; if (file != null) { diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java index e7122070f1..d9d45f34c8 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java +++ b/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; } diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java index e9a8b69449..0ead22c22f 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java +++ b/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) { - MockMultipartHttpServletRequestBuilder parentBuilder = (MockMultipartHttpServletRequestBuilder) parent; + if (parent instanceof MockMultipartHttpServletRequestBuilder parentBuilder) { this.files.addAll(parentBuilder.files); parentBuilder.parts.keySet().forEach(name -> this.parts.putIfAbsent(name, parentBuilder.parts.get(name))); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java index f9539b1a6a..7f1cc67268 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java +++ b/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) { - HandlerMethod handlerMethod = (HandlerMethod) handler; + if (handler instanceof HandlerMethod handlerMethod) { this.printer.printValue("Type", handlerMethod.getBeanType().getName()); this.printer.printValue("Method", handlerMethod); }