From 796b8c1278244e86b71308be4d5dca7e8164cade Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 18 Nov 2022 15:14:14 +0100 Subject: [PATCH] Polishing --- .../support/AbstractAutowireCapableBeanFactory.java | 4 ++-- .../factory/support/DefaultListableBeanFactory.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java index a7b0566e99e..e2aa54aa5a5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java @@ -975,8 +975,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac return (FactoryBean) bw.getWrappedInstance(); } Object beanInstance = getSingleton(beanName, false); - if (beanInstance instanceof FactoryBean) { - return (FactoryBean) beanInstance; + if (beanInstance instanceof FactoryBean factoryBean) { + return factoryBean; } if (isSingletonCurrentlyInCreation(beanName) || (mbd.getFactoryBeanName() != null && isSingletonCurrentlyInCreation(mbd.getFactoryBeanName()))) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index bf7a54ae06e..5c8cea79336 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -1342,11 +1342,11 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto Class type = descriptor.getDependencyType(); Object value = getAutowireCandidateResolver().getSuggestedValue(descriptor); if (value != null) { - if (value instanceof String) { - String strVal = resolveEmbeddedValue((String) value); + if (value instanceof String strValue) { + String resolvedValue = resolveEmbeddedValue(strValue); BeanDefinition bd = (beanName != null && containsBean(beanName) ? getMergedBeanDefinition(beanName) : null); - value = evaluateBeanDefinitionString(strVal, bd); + value = evaluateBeanDefinitionString(resolvedValue, bd); } TypeConverter converter = (typeConverter != null ? typeConverter : getTypeConverter()); try { @@ -2125,11 +2125,11 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto return resolveStream(true); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) private Stream resolveStream(boolean ordered) { DependencyDescriptor descriptorToUse = new StreamDependencyDescriptor(this.descriptor, ordered); Object result = doResolveDependency(descriptorToUse, this.beanName, null, null); - return (result instanceof Stream ? (Stream) result : Stream.of(result)); + return (result instanceof Stream stream ? stream : Stream.of(result)); } }