diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java index 2d2aabd07f..b95e07fb2c 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java @@ -143,13 +143,12 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx Advice advice = this.advisor.getAdvice(); StringBuilder sb = new StringBuilder(ClassUtils.getShortName(advice.getClass())); boolean appended = false; - if (this.advisor instanceof Ordered) { - sb.append(": order = ").append(((Ordered) this.advisor).getOrder()); + if (this.advisor instanceof Ordered ordered) { + sb.append(": order = ").append(ordered.getOrder()); appended = true; } - if (advice instanceof AbstractAspectJAdvice) { + if (advice instanceof AbstractAspectJAdvice ajAdvice) { sb.append(!appended ? ": " : ", "); - AbstractAspectJAdvice ajAdvice = (AbstractAspectJAdvice) advice; sb.append("aspect name = "); sb.append(ajAdvice.getAspectName()); sb.append(", declaration order = "); diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java index 27dbd3ec18..b8a4712e61 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java @@ -556,7 +556,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport logger.debug("Refreshing target with name '" + this.targetName + "'"); } Object target = this.beanFactory.getBean(this.targetName); - return (target instanceof TargetSource ? (TargetSource) target : new SingletonTargetSource(target)); + return (target instanceof TargetSource targetSource ? targetSource : new SingletonTargetSource(target)); } } diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java index e1899cf8e5..646e41f15f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java @@ -80,8 +80,8 @@ public abstract class ScopedProxyUtils { // Copy autowire settings from original bean definition. proxyDefinition.setAutowireCandidate(targetDefinition.isAutowireCandidate()); proxyDefinition.setPrimary(targetDefinition.isPrimary()); - if (targetDefinition instanceof AbstractBeanDefinition) { - proxyDefinition.copyQualifiersFrom((AbstractBeanDefinition) targetDefinition); + if (targetDefinition instanceof AbstractBeanDefinition abd) { + proxyDefinition.copyQualifiersFrom(abd); } // The target bean should be ignored in favor of the scoped proxy. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java index c032db69e9..360ecc458f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java @@ -52,8 +52,8 @@ public abstract class AbstractPointcutAdvisor implements PointcutAdvisor, Ordere return this.order; } Advice advice = getAdvice(); - if (advice instanceof Ordered) { - return ((Ordered) advice).getOrder(); + if (advice instanceof Ordered ordered) { + return ordered.getOrder(); } return Ordered.LOWEST_PRECEDENCE; } diff --git a/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java index b56ec6b953..bcb00e6925 100644 --- a/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java @@ -841,7 +841,7 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA PropertyTokenHolder tokens = getPropertyNameTokens(nestedProperty); String canonicalName = tokens.canonicalName; Object value = getPropertyValue(tokens); - if (value == null || (value instanceof Optional && !((Optional) value).isPresent())) { + if (value == null || (value instanceof Optional optional && optional.isEmpty()) { if (isAutoGrowNestedPaths()) { value = setDefaultValue(tokens); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java index fbc7cb4751..adf9a4537b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java @@ -162,9 +162,8 @@ public abstract class BeanFactoryUtils { Assert.notNull(lbf, "ListableBeanFactory must not be null"); String[] result = lbf.getBeanNamesForType(type); if (lbf instanceof HierarchicalBeanFactory hbf) { - if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) { - String[] parentResult = beanNamesForTypeIncludingAncestors( - (ListableBeanFactory) hbf.getParentBeanFactory(), type); + if (hbf.getParentBeanFactory() instanceof ListableBeanFactory pbf) { + String[] parentResult = beanNamesForTypeIncludingAncestors(pbf, type); result = mergeNamesWithParent(result, parentResult, hbf); } } @@ -225,9 +224,8 @@ public abstract class BeanFactoryUtils { Assert.notNull(lbf, "ListableBeanFactory must not be null"); String[] result = lbf.getBeanNamesForType(type); if (lbf instanceof HierarchicalBeanFactory hbf) { - if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) { - String[] parentResult = beanNamesForTypeIncludingAncestors( - (ListableBeanFactory) hbf.getParentBeanFactory(), type); + if (hbf.getParentBeanFactory() instanceof ListableBeanFactory pbf) { + String[] parentResult = beanNamesForTypeIncludingAncestors(pbf, type); result = mergeNamesWithParent(result, parentResult, hbf); } } @@ -371,9 +369,8 @@ public abstract class BeanFactoryUtils { Map result = new LinkedHashMap<>(4); result.putAll(lbf.getBeansOfType(type, includeNonSingletons, allowEagerInit)); if (lbf instanceof HierarchicalBeanFactory hbf) { - if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) { - Map parentResult = beansOfTypeIncludingAncestors( - (ListableBeanFactory) hbf.getParentBeanFactory(), type, includeNonSingletons, allowEagerInit); + if (hbf.getParentBeanFactory() instanceof ListableBeanFactory pbf) { + Map parentResult = beansOfTypeIncludingAncestors(pbf, type, includeNonSingletons, allowEagerInit); parentResult.forEach((beanName, beanInstance) -> { if (!result.containsKey(beanName) && !hbf.containsLocalBean(beanName)) { result.put(beanName, beanInstance); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java index 397c469b11..e1efc7aee1 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java @@ -286,9 +286,8 @@ public class HandlerMethod { */ public HandlerMethod createWithResolvedBean() { Object handler = this.bean; - if (this.bean instanceof String) { + if (this.bean instanceof String beanName) { Assert.state(this.beanFactory != null, "Cannot resolve bean name without BeanFactory"); - String beanName = (String) this.bean; handler = this.beanFactory.getBean(beanName); } return new HandlerMethod(this, handler); diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java index 267b608739..6f52b36310 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java @@ -692,7 +692,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return true; } else if (HttpHeaders.CONTENT_LENGTH.equalsIgnoreCase(name)) { - setContentLength(value instanceof Number ? ((Number) value).intValue() : + setContentLength(value instanceof Number number ? number.intValue() : Integer.parseInt(value.toString())); return true; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java index 59b056b473..0aad286c6c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java @@ -549,8 +549,8 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter */ @Override public void setBeanFactory(BeanFactory beanFactory) { - if (beanFactory instanceof ConfigurableBeanFactory) { - this.beanFactory = (ConfigurableBeanFactory) beanFactory; + if (beanFactory instanceof ConfigurableBeanFactory cbf) { + this.beanFactory = cbf; } } @@ -1010,8 +1010,8 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter if (!mavContainer.isViewReference()) { mav.setView((View) mavContainer.getView()); } - if (model instanceof RedirectAttributes) { - Map flashAttributes = ((RedirectAttributes) model).getFlashAttributes(); + if (model instanceof RedirectAttributes redirectAttributes) { + Map flashAttributes = redirectAttributes.getFlashAttributes(); HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class); if (request != null) { RequestContextUtils.getOutputFlashMap(request).putAll(flashAttributes);