root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Polishing regarding JDK baseline upgrade 

Closes gh-28440
This commit is contained in:
lihan 2022-05-10 21:11:07 +08:00 committed by Sam Brannen
parent 5c5c89e9fe
commit a892ce80c1
9 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java
View File

@ -143,13 +143,12 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx
Advice advice = this.advisor.getAdvice(); Advice advice = this.advisor.getAdvice();
StringBuilder sb = new StringBuilder(ClassUtils.getShortName(advice.getClass())); StringBuilder sb = new StringBuilder(ClassUtils.getShortName(advice.getClass()));
boolean appended = false; boolean appended = false;
if (this.advisor instanceof Ordered) { if (this.advisor instanceof Ordered ordered) {
sb.append(": order = ").append(((Ordered) this.advisor).getOrder()); sb.append(": order = ").append(ordered.getOrder());
appended = true; appended = true;
} }
if (advice instanceof AbstractAspectJAdvice) { if (advice instanceof AbstractAspectJAdvice ajAdvice) {
sb.append(!appended ? ": " : ", "); sb.append(!appended ? ": " : ", ");
AbstractAspectJAdvice ajAdvice = (AbstractAspectJAdvice) advice;
sb.append("aspect name = "); sb.append("aspect name = ");
sb.append(ajAdvice.getAspectName()); sb.append(ajAdvice.getAspectName());
sb.append(", declaration order = "); sb.append(", declaration order = ");

2
spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
View File

@ -556,7 +556,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport
logger.debug("Refreshing target with name '" + this.targetName + "'"); logger.debug("Refreshing target with name '" + this.targetName + "'");
} }
Object target = this.beanFactory.getBean(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));
} }
} }

4
spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java
View File

@ -80,8 +80,8 @@ public abstract class ScopedProxyUtils {
// Copy autowire settings from original bean definition. // Copy autowire settings from original bean definition.
proxyDefinition.setAutowireCandidate(targetDefinition.isAutowireCandidate()); proxyDefinition.setAutowireCandidate(targetDefinition.isAutowireCandidate());
proxyDefinition.setPrimary(targetDefinition.isPrimary()); proxyDefinition.setPrimary(targetDefinition.isPrimary());
if (targetDefinition instanceof AbstractBeanDefinition) { if (targetDefinition instanceof AbstractBeanDefinition abd) {
proxyDefinition.copyQualifiersFrom((AbstractBeanDefinition) targetDefinition); proxyDefinition.copyQualifiersFrom(abd);
} }
// The target bean should be ignored in favor of the scoped proxy. // The target bean should be ignored in favor of the scoped proxy.

4
spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java
View File

@ -52,8 +52,8 @@ public abstract class AbstractPointcutAdvisor implements PointcutAdvisor, Ordere
return this.order; return this.order;
} }
Advice advice = getAdvice(); Advice advice = getAdvice();
if (advice instanceof Ordered) { if (advice instanceof Ordered ordered) {
return ((Ordered) advice).getOrder(); return ordered.getOrder();
} }
return Ordered.LOWEST_PRECEDENCE; return Ordered.LOWEST_PRECEDENCE;
} }

2
spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java
View File

@ -841,7 +841,7 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
PropertyTokenHolder tokens = getPropertyNameTokens(nestedProperty); PropertyTokenHolder tokens = getPropertyNameTokens(nestedProperty);
String canonicalName = tokens.canonicalName; String canonicalName = tokens.canonicalName;
Object value = getPropertyValue(tokens); Object value = getPropertyValue(tokens);
if (value == null || (value instanceof Optional && !((Optional<?>) value).isPresent())) { if (value == null || (value instanceof Optional<?> optional && optional.isEmpty()) {
if (isAutoGrowNestedPaths()) { if (isAutoGrowNestedPaths()) {
value = setDefaultValue(tokens); value = setDefaultValue(tokens);
} }

15
spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
View File

@ -162,9 +162,8 @@ public abstract class BeanFactoryUtils {
Assert.notNull(lbf, "ListableBeanFactory must not be null"); Assert.notNull(lbf, "ListableBeanFactory must not be null");
String[] result = lbf.getBeanNamesForType(type); String[] result = lbf.getBeanNamesForType(type);
if (lbf instanceof HierarchicalBeanFactory hbf) { if (lbf instanceof HierarchicalBeanFactory hbf) {
if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) { if (hbf.getParentBeanFactory() instanceof ListableBeanFactory pbf) {
String[] parentResult = beanNamesForTypeIncludingAncestors( String[] parentResult = beanNamesForTypeIncludingAncestors(pbf, type);
(ListableBeanFactory) hbf.getParentBeanFactory(), type);
result = mergeNamesWithParent(result, parentResult, hbf); result = mergeNamesWithParent(result, parentResult, hbf);
} }
} }
@ -225,9 +224,8 @@ public abstract class BeanFactoryUtils {
Assert.notNull(lbf, "ListableBeanFactory must not be null"); Assert.notNull(lbf, "ListableBeanFactory must not be null");
String[] result = lbf.getBeanNamesForType(type); String[] result = lbf.getBeanNamesForType(type);
if (lbf instanceof HierarchicalBeanFactory hbf) { if (lbf instanceof HierarchicalBeanFactory hbf) {
if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) { if (hbf.getParentBeanFactory() instanceof ListableBeanFactory pbf) {
String[] parentResult = beanNamesForTypeIncludingAncestors( String[] parentResult = beanNamesForTypeIncludingAncestors(pbf, type);
(ListableBeanFactory) hbf.getParentBeanFactory(), type);
result = mergeNamesWithParent(result, parentResult, hbf); result = mergeNamesWithParent(result, parentResult, hbf);
} }
} }
@ -371,9 +369,8 @@ public abstract class BeanFactoryUtils {
Map<String, T> result = new LinkedHashMap<>(4); Map<String, T> result = new LinkedHashMap<>(4);
result.putAll(lbf.getBeansOfType(type, includeNonSingletons, allowEagerInit)); result.putAll(lbf.getBeansOfType(type, includeNonSingletons, allowEagerInit));
if (lbf instanceof HierarchicalBeanFactory hbf) { if (lbf instanceof HierarchicalBeanFactory hbf) {
if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) { if (hbf.getParentBeanFactory() instanceof ListableBeanFactory pbf) {
Map<String, T> parentResult = beansOfTypeIncludingAncestors( Map<String, T> parentResult = beansOfTypeIncludingAncestors(pbf, type, includeNonSingletons, allowEagerInit);
(ListableBeanFactory) hbf.getParentBeanFactory(), type, includeNonSingletons, allowEagerInit);
parentResult.forEach((beanName, beanInstance) -> { parentResult.forEach((beanName, beanInstance) -> {
if (!result.containsKey(beanName) && !hbf.containsLocalBean(beanName)) { if (!result.containsKey(beanName) && !hbf.containsLocalBean(beanName)) {
result.put(beanName, beanInstance); result.put(beanName, beanInstance);

3
spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
View File

@ -286,9 +286,8 @@ public class HandlerMethod {
*/ */
public HandlerMethod createWithResolvedBean() { public HandlerMethod createWithResolvedBean() {
Object handler = this.bean; 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"); Assert.state(this.beanFactory != null, "Cannot resolve bean name without BeanFactory");
String beanName = (String) this.bean;
handler = this.beanFactory.getBean(beanName); handler = this.beanFactory.getBean(beanName);
} }
return new HandlerMethod(this, handler); return new HandlerMethod(this, handler);

2
spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
View File

@ -692,7 +692,7 @@ public class MockHttpServletResponse implements HttpServletResponse {
return true; return true;
} }
else if (HttpHeaders.CONTENT_LENGTH.equalsIgnoreCase(name)) { 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())); Integer.parseInt(value.toString()));
return true; return true;
} }

8
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
View File

@ -549,8 +549,8 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter
*/ */
@Override @Override
public void setBeanFactory(BeanFactory beanFactory) { public void setBeanFactory(BeanFactory beanFactory) {
if (beanFactory instanceof ConfigurableBeanFactory) { if (beanFactory instanceof ConfigurableBeanFactory cbf) {
this.beanFactory = (ConfigurableBeanFactory) beanFactory; this.beanFactory = cbf;
} }
} }
@ -1010,8 +1010,8 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter
if (!mavContainer.isViewReference()) { if (!mavContainer.isViewReference()) {
mav.setView((View) mavContainer.getView()); mav.setView((View) mavContainer.getView());
} }
if (model instanceof RedirectAttributes) { if (model instanceof RedirectAttributes redirectAttributes) {
Map<String, ?> flashAttributes = ((RedirectAttributes) model).getFlashAttributes(); Map<String, ?> flashAttributes = redirectAttributes.getFlashAttributes();
HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class); HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
if (request != null) { if (request != null) {
RequestContextUtils.getOutputFlashMap(request).putAll(flashAttributes); RequestContextUtils.getOutputFlashMap(request).putAll(flashAttributes);