Update code regarding null-safety semantics

sbrannen · sbrannen · commit a6dab1030932 · 2023-03-13T21:19:46.000+01:00
See gh-30083
diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
@@ -58,6 +58,7 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
+	@Nullable
 	private ConfigurableBeanFactory beanFactory;
 
 	/** Internally used DefaultListableBeanFactory instances, keyed by bean name. */
@@ -76,6 +77,7 @@ public final void setBeanFactory(BeanFactory beanFactory) {
 	/**
 	 * Return the BeanFactory that this TargetSourceCreators runs in.
 	 */
+	@Nullable
 	protected final BeanFactory getBeanFactory() {
 		return this.beanFactory;
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java
@@ -24,6 +24,7 @@
 import org.springframework.aop.TargetSource;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -169,7 +170,7 @@ protected void copyFrom(AbstractBeanFactoryBasedTargetSource other) {
 
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java
@@ -131,7 +131,7 @@ private Object readResolve() {
 	}
 
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/HotSwappableTargetSource.java
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 
 import org.springframework.aop.TargetSource;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -100,7 +101,7 @@ public synchronized Object swap(Object newTarget) throws IllegalArgumentExceptio
 	 * objects are equal.
 	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 		return (this == obj || (obj instanceof HotSwappableTargetSource that &&
 				this.target.equals(that.target)));
 	}
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java
@@ -65,7 +65,6 @@ public class LazyInitTargetSource extends AbstractBeanFactoryBasedTargetSource {
 
 
 	@Override
-	@Nullable
 	public synchronized Object getTarget() throws BeansException {
 		if (this.target == null) {
 			this.target = getBeanFactory().getBean(getTargetBeanName());
diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 
 import org.springframework.aop.TargetSource;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -82,7 +83,7 @@ public boolean isStatic() {
 	 * targets or the targets are equal.
 	 */
 	@Override
-	public boolean equals(Object other) {
+	public boolean equals(@Nullable Object other) {
 		if (this == other) {
 			return true;
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java b/spring-beans/src/main/java/org/springframework/beans/PropertyDescriptorUtils.java
@@ -88,17 +88,19 @@ else if (methodName.startsWith("is") && method.getParameterCount() == 0 && metho
 			BasicPropertyDescriptor pd = pdMap.get(propertyName);
 			if (pd != null) {
 				if (setter) {
-					if (pd.getWriteMethod() == null ||
-							pd.getWriteMethod().getParameterTypes()[0].isAssignableFrom(method.getParameterTypes()[0])) {
+					Method writedMethod = pd.getWriteMethod();
+					if (writedMethod == null ||
+							writedMethod.getParameterTypes()[0].isAssignableFrom(method.getParameterTypes()[0])) {
 						pd.setWriteMethod(method);
 					}
 					else {
 						pd.addWriteMethod(method);
 					}
 				}
 				else {
-					if (pd.getReadMethod() == null ||
-							(pd.getReadMethod().getReturnType() == method.getReturnType() && method.getName().startsWith("is"))) {
+					Method readMethod = pd.getReadMethod();
+					if (readMethod == null ||
+							(readMethod.getReturnType() == method.getReturnType() && method.getName().startsWith("is"))) {
 						pd.setReadMethod(method);
 					}
 				}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
@@ -280,6 +280,7 @@ public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, C
 	}
 
 	@Override
+	@Nullable
 	public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
 		Class<?> beanClass = registeredBean.getBeanClass();
 		String beanName = registeredBean.getBeanName();
@@ -323,10 +324,10 @@ public Class<?> determineBeanType(Class<?> beanClass, String beanName) throws Be
 		checkLookupMethods(beanClass, beanName);
 
 		// Pick up subclass with fresh lookup method override from above
-		if (this.beanFactory instanceof AbstractAutowireCapableBeanFactory aacbf) {
+		if (this.beanFactory instanceof AbstractAutowireCapableBeanFactory aacBeanFactory) {
 			RootBeanDefinition mbd = (RootBeanDefinition) this.beanFactory.getMergedBeanDefinition(beanName);
 			if (mbd.getFactoryMethodName() == null && mbd.hasBeanClass()) {
-				return aacbf.getInstantiationStrategy().getActualBeanClass(mbd, beanName, this.beanFactory);
+				return aacBeanFactory.getInstantiationStrategy().getActualBeanClass(mbd, beanName, aacBeanFactory);
 			}
 		}
 		return beanClass;
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
@@ -157,6 +157,7 @@ public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, C
 	}
 
 	@Override
+	@Nullable
 	public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
 		RootBeanDefinition beanDefinition = registeredBean.getMergedBeanDefinition();
 		beanDefinition.resolveDestroyMethodIfNecessary();
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHints.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/JakartaAnnotationsRuntimeHints.java
@@ -20,6 +20,7 @@
 
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -31,7 +32,7 @@
 class JakartaAnnotationsRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
-	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 		if (ClassUtils.isPresent("jakarta.inject.Inject", classLoader)) {
 			Stream.of("jakarta.inject.Inject", "jakarta.inject.Qualifier").forEach(annotationType ->
 					hints.reflection().registerType(ClassUtils.resolveClassName(annotationType, classLoader)));
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/QualifierAnnotationAutowireCandidateResolver.java
@@ -25,6 +25,7 @@
 
 import org.springframework.beans.SimpleTypeConverter;
 import org.springframework.beans.TypeConverter;
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.DependencyDescriptor;
@@ -240,10 +241,11 @@ protected boolean checkQualifier(
 				}
 			}
 			if (targetAnnotation == null) {
+				BeanFactory beanFactory = getBeanFactory();
 				// Look for matching annotation on the target class
-				if (getBeanFactory() != null) {
+				if (beanFactory != null) {
 					try {
-						Class<?> beanType = getBeanFactory().getType(bdHolder.getBeanName());
+						Class<?> beanType = beanFactory.getType(bdHolder.getBeanName());
 						if (beanType != null) {
 							targetAnnotation = AnnotationUtils.getAnnotation(ClassUtils.getUserClass(beanType), type);
 						}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java
@@ -188,7 +188,7 @@ public Map<Integer, ValueHolder> getIndexedArgumentValues() {
 	 * rather than matched multiple times.
 	 * @param value the argument value
 	 */
-	public void addGenericArgumentValue(Object value) {
+	public void addGenericArgumentValue(@Nullable Object value) {
 		this.genericArgumentValues.add(new ValueHolder(value));
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
@@ -53,6 +53,7 @@
 import org.springframework.core.io.DescriptiveResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.EncodedResource;
+import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
@@ -149,8 +150,10 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp
 
 	private MetaClass metaClass = GroovySystem.getMetaClassRegistry().getMetaClass(getClass());
 
+	@Nullable
 	private Binding binding;
 
+	@Nullable
 	private GroovyBeanDefinitionWrapper currentBeanDefinition;
 
 
@@ -203,6 +206,7 @@ public void setBinding(Binding binding) {
 	/**
 	 * Return a specified binding for Groovy variables, if any.
 	 */
+	@Nullable
 	public Binding getBinding() {
 		return this.binding;
 	}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java
@@ -30,6 +30,8 @@
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
 /**
@@ -55,35 +57,41 @@ class GroovyBeanDefinitionWrapper extends GroovyObjectSupport {
 			FACTORY_BEAN, FACTORY_METHOD, INIT_METHOD, DESTROY_METHOD, SINGLETON);
 
 
+	@Nullable
 	private String beanName;
 
-	private Class<?> clazz;
+	@Nullable
+	private final Class<?> clazz;
 
-	private Collection<?> constructorArgs;
+	@Nullable
+	private final Collection<?> constructorArgs;
 
+	@Nullable
 	private AbstractBeanDefinition definition;
 
+	@Nullable
 	private BeanWrapper definitionWrapper;
 
+	@Nullable
 	private String parentName;
 
 
-	public GroovyBeanDefinitionWrapper(String beanName) {
-		this.beanName = beanName;
+	GroovyBeanDefinitionWrapper(String beanName) {
+		this(beanName, null);
 	}
 
-	public GroovyBeanDefinitionWrapper(String beanName, Class<?> clazz) {
-		this.beanName = beanName;
-		this.clazz = clazz;
+	GroovyBeanDefinitionWrapper(@Nullable String beanName, @Nullable Class<?> clazz) {
+		this(beanName, clazz, null);
 	}
 
-	public GroovyBeanDefinitionWrapper(String beanName, Class<?> clazz, Collection<?> constructorArgs) {
+	GroovyBeanDefinitionWrapper(@Nullable String beanName, Class<?> clazz, @Nullable Collection<?> constructorArgs) {
 		this.beanName = beanName;
 		this.clazz = clazz;
 		this.constructorArgs = constructorArgs;
 	}
 
 
+	@Nullable
 	public String getBeanName() {
 		return this.beanName;
 	}
@@ -151,6 +159,7 @@ GroovyBeanDefinitionWrapper addProperty(String propertyName, Object propertyValu
 
 	@Override
 	public Object getProperty(String property) {
+		Assert.state(this.definitionWrapper != null, "BeanDefinition wrapper not initialized");
 		if (this.definitionWrapper.isReadableProperty(property)) {
 			return this.definitionWrapper.getPropertyValue(property);
 		}
@@ -167,6 +176,7 @@ public void setProperty(String property, Object newValue) {
 		}
 		else {
 			AbstractBeanDefinition bd = getBeanDefinition();
+			Assert.state(this.definitionWrapper != null, "BeanDefinition wrapper not initialized");
 			if (AUTOWIRE.equals(property)) {
 				if ("byName".equals(newValue)) {
 					bd.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_NAME);
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java
@@ -31,6 +31,7 @@
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
+import org.springframework.lang.Nullable;
 
 /**
  * Used by GroovyBeanDefinitionReader to read a Spring XML namespace expression
@@ -68,6 +69,7 @@ public GroovyDynamicElementReader(String namespace, Map<String, String> namespac
 
 
 	@Override
+	@Nullable
 	public Object invokeMethod(String name, Object obj) {
 		Object[] args = (Object[]) obj;
 		if (name.equals("doCall")) {
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
@@ -1958,6 +1958,7 @@ public AutowireByTypeDependencyDescriptor(MethodParameter methodParameter, boole
 		}
 
 		@Override
+		@Nullable
 		public String getDependencyName() {
 			return null;
 		}
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java
@@ -879,10 +879,12 @@ public void setPropertyValues(MutablePropertyValues propertyValues) {
 	 */
 	@Override
 	public MutablePropertyValues getPropertyValues() {
-		if (this.propertyValues == null) {
-			this.propertyValues = new MutablePropertyValues();
+		MutablePropertyValues pvs = this.propertyValues;
+		if (pvs == null) {
+			pvs = new MutablePropertyValues();
+			this.propertyValues = pvs;
 		}
-		return this.propertyValues;
+		return pvs;
 	}
 
 	/**
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
@@ -340,7 +340,7 @@ protected boolean isActuallyInCreation(String beanName) {
 	 * (within the entire factory).
 	 * @param beanName the name of the bean
 	 */
-	public boolean isSingletonCurrentlyInCreation(String beanName) {
+	public boolean isSingletonCurrentlyInCreation(@Nullable String beanName) {
 		return this.singletonsCurrentlyInCreation.contains(beanName);
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
@@ -547,7 +547,8 @@ public NamespaceHandlerResolver getNamespaceHandlerResolver() {
 	 * @see DefaultNamespaceHandlerResolver#DefaultNamespaceHandlerResolver(ClassLoader)
 	 */
 	protected NamespaceHandlerResolver createDefaultNamespaceHandlerResolver() {
-		ClassLoader cl = (getResourceLoader() != null ? getResourceLoader().getClassLoader() : getBeanClassLoader());
+		ResourceLoader resourceLoader = getResourceLoader();
+		ClassLoader cl = (resourceLoader != null ? resourceLoader.getClassLoader() : getBeanClassLoader());
 		return new DefaultNamespaceHandlerResolver(cl);
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java b/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java
@@ -111,6 +111,7 @@ public void registerCustomEditor(Class<?> requiredType, PropertyEditor propertyE
 	 * @see #doFindMatchingMethod
 	 */
 	@Override
+	@Nullable
 	protected Method findMatchingMethod() {
 		Method matchingMethod = super.findMatchingMethod();
 		// Second pass: look for method where arguments can be converted to parameter types.
diff --git a/spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java
@@ -23,6 +23,7 @@
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.lang.Nullable;
 
 /**
  * {@link BeanDefinitionParser} responsible for parsing the
@@ -44,6 +45,7 @@ class SpringConfiguredBeanDefinitionParser implements BeanDefinitionParser {
 
 
 	@Override
+	@Nullable
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		if (!parserContext.getRegistry().containsBeanDefinition(BEAN_CONFIGURER_ASPECT_BEAN_NAME)) {
 			RootBeanDefinition def = new RootBeanDefinition();
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/CallableInterceptorChain.java b/spring-web/src/main/java/org/springframework/web/context/request/async/CallableInterceptorChain.java
@@ -23,6 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.lang.Nullable;
 import org.springframework.web.context.request.NativeWebRequest;
 
 /**
@@ -40,6 +41,7 @@ class CallableInterceptorChain {
 
 	private int preProcessIndex = -1;
 
+	@Nullable
 	private volatile Future<?> taskFuture;
 
 
@@ -66,7 +68,7 @@ public void applyPreProcess(NativeWebRequest request, Callable<?> task) throws E
 		}
 	}
 
-	public Object applyPostProcess(NativeWebRequest request, Callable<?> task, Object concurrentResult) {
+	public Object applyPostProcess(NativeWebRequest request, Callable<?> task, @Nullable Object concurrentResult) {
 		Throwable exceptionResult = null;
 		for (int i = this.preProcessIndex; i >= 0; i--) {
 			try {
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptor.java b/spring-web/src/main/java/org/springframework/web/context/request/async/CallableProcessingInterceptor.java
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResult.java
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultInterceptorChain.java
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptor.java b/spring-web/src/main/java/org/springframework/web/context/request/async/DeferredResultProcessingInterceptor.java
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/async/StandardServletAsyncWebRequest.java
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java
diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncTask.java b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncTask.java
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestConditionHolder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestConditionHolder.java

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private Object readResolve() {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`@Override`
`134`		`- public boolean equals(Object other) {`
	`134`	`+ public boolean equals(@Nullable Object other) {`
`135`	`135`	`if (this == other) {`
`136`	`136`	`return true;`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,17 +88,19 @@ else if (methodName.startsWith("is") && method.getParameterCount() == 0 && metho`
`88`	`88`	`BasicPropertyDescriptor pd = pdMap.get(propertyName);`
`89`	`89`	`if (pd != null) {`
`90`	`90`	`if (setter) {`
`91`		`- if (pd.getWriteMethod() == null \|\|`
`92`		`- pd.getWriteMethod().getParameterTypes()[0].isAssignableFrom(method.getParameterTypes()[0])) {`
	`91`	`+ Method writedMethod = pd.getWriteMethod();`
	`92`	`+ if (writedMethod == null \|\|`
	`93`	`+ writedMethod.getParameterTypes()[0].isAssignableFrom(method.getParameterTypes()[0])) {`
`93`	`94`	`pd.setWriteMethod(method);`
`94`	`95`	`}`
`95`	`96`	`else {`
`96`	`97`	`pd.addWriteMethod(method);`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`	`else {`
`100`		`- if (pd.getReadMethod() == null \|\|`
`101`		`- (pd.getReadMethod().getReturnType() == method.getReturnType() && method.getName().startsWith("is"))) {`
	`101`	`+ Method readMethod = pd.getReadMethod();`
	`102`	`+ if (readMethod == null \|\|`
	`103`	`+ (readMethod.getReturnType() == method.getReturnType() && method.getName().startsWith("is"))) {`
`102`	`104`	`pd.setReadMethod(method);`
`103`	`105`	`}`
`104`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -280,6 +280,7 @@ public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, C`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`@Override`
	`283`	`+ @Nullable`
`283`	`284`	`public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {`
`284`	`285`	`Class<?> beanClass = registeredBean.getBeanClass();`
`285`	`286`	`String beanName = registeredBean.getBeanName();`
`@@ -323,10 +324,10 @@ public Class<?> determineBeanType(Class<?> beanClass, String beanName) throws Be`
`323`	`324`	`checkLookupMethods(beanClass, beanName);`
`324`	`325`
`325`	`326`	`// Pick up subclass with fresh lookup method override from above`
`326`		`- if (this.beanFactory instanceof AbstractAutowireCapableBeanFactory aacbf) {`
	`327`	`+ if (this.beanFactory instanceof AbstractAutowireCapableBeanFactory aacBeanFactory) {`
`327`	`328`	`RootBeanDefinition mbd = (RootBeanDefinition) this.beanFactory.getMergedBeanDefinition(beanName);`
`328`	`329`	`if (mbd.getFactoryMethodName() == null && mbd.hasBeanClass()) {`
`329`		`- return aacbf.getInstantiationStrategy().getActualBeanClass(mbd, beanName, this.beanFactory);`
	`330`	`+ return aacBeanFactory.getInstantiationStrategy().getActualBeanClass(mbd, beanName, aacBeanFactory);`
`330`	`331`	`}`
`331`	`332`	`}`
`332`	`333`	`return beanClass;`
Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, C`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`@Override`
	`160`	`+ @Nullable`
`160`	`161`	`public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {`
`161`	`162`	`RootBeanDefinition beanDefinition = registeredBean.getMergedBeanDefinition();`
`162`	`163`	`beanDefinition.resolveDestroyMethodIfNecessary();`