Add missing AOT support for method overrides (including @lookup)

Closes gh-34642

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGenerator.java

@@ -52,6 +52,9 @@
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.AutowireCandidateQualifier;
 import org.springframework.beans.factory.support.InstanceSupplier;
+import org.springframework.beans.factory.support.LookupOverride;
+import org.springframework.beans.factory.support.MethodOverride;
+import org.springframework.beans.factory.support.ReplaceOverride;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.CodeBlock.Builder;
@@ -145,6 +148,7 @@ CodeBlock generateCode(RootBeanDefinition beanDefinition) {
 		addPropertyValues(code, beanDefinition);
 		addAttributes(code, beanDefinition);
 		addQualifiers(code, beanDefinition);
+		addMethodOverrides(code, beanDefinition);
 		return code.build();
 	}
 
@@ -274,6 +278,36 @@ private void addQualifiers(CodeBlock.Builder code, RootBeanDefinition beanDefini
 		}
 	}
 
+	private void addMethodOverrides(CodeBlock.Builder code, RootBeanDefinition beanDefinition) {
+		if (beanDefinition.hasMethodOverrides()) {
+			for (MethodOverride methodOverride : beanDefinition.getMethodOverrides().getOverrides()) {
+				if (methodOverride instanceof LookupOverride lookupOverride) {
+					Collection<CodeBlock> arguments = new ArrayList<>();
+					arguments.add(CodeBlock.of("$S", lookupOverride.getMethodName()));
+					arguments.add(CodeBlock.of("$S", lookupOverride.getBeanName()));
+					code.addStatement("$L.getMethodOverrides().addOverride(new $T($L))", BEAN_DEFINITION_VARIABLE,
+							LookupOverride.class, CodeBlock.join(arguments, ", "));
+				}
+				else if (methodOverride instanceof ReplaceOverride replaceOverride) {
+					Collection<CodeBlock> arguments = new ArrayList<>();
+					arguments.add(CodeBlock.of("$S", replaceOverride.getMethodName()));
+					arguments.add(CodeBlock.of("$S", replaceOverride.getMethodReplacerBeanName()));
+					List<String> typeIdentifiers = replaceOverride.getTypeIdentifiers();
+					if (!typeIdentifiers.isEmpty()) {
+						arguments.add(CodeBlock.of("java.util.List.of($S)",
+								StringUtils.collectionToDelimitedString(typeIdentifiers, ", ")));
+					}
+					code.addStatement("$L.getMethodOverrides().addOverride(new $T($L))", BEAN_DEFINITION_VARIABLE,
+							ReplaceOverride.class, CodeBlock.join(arguments, ", "));
+				}
+				else {
+					throw new UnsupportedOperationException("Unexpected MethodOverride subclass: " +
+							methodOverride.getClass().getName());
+				}
+			}
+		}
+	}
+
 	private CodeBlock generateValue(@Nullable String name, @Nullable Object value) {
 		PropertyNamesStack.push(name);
 		try {

spring-beans/src/main/java/org/springframework/beans/factory/aot/BeanInstanceSupplier.java

@@ -38,6 +38,7 @@
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionValueResolver;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.InstanceSupplier;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -372,6 +373,11 @@ private Object resolveAutowiredArgument(RegisteredBean registeredBean, Dependenc
 
 	private Object instantiate(RegisteredBean registeredBean, Executable executable, Object[] args) {
 		if (executable instanceof Constructor<?> constructor) {
+			if (registeredBean.getBeanFactory() instanceof DefaultListableBeanFactory dlbf &&
+					registeredBean.getMergedBeanDefinition().hasMethodOverrides()) {
+				return dlbf.getInstantiationStrategy().instantiate(registeredBean.getMergedBeanDefinition(),
+						registeredBean.getBeanName(), registeredBean.getBeanFactory());
+			}
 			return BeanUtils.instantiateClass(constructor, args);
 		}
 		if (executable instanceof Method method) {

spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java

@@ -115,6 +115,7 @@ public InstanceSupplierCodeGenerator(GenerationContext generationContext,
 		this.allowDirectSupplierShortcut = allowDirectSupplierShortcut;
 	}
 
+
 	/**
 	 * Generate the instance supplier code.
 	 * @param registeredBean the bean to handle
@@ -165,7 +166,8 @@ private CodeBlock generateCodeForConstructor(RegisteredBean registeredBean, Cons
 					hints -> hints.registerType(publicType, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS));
 		}
 
-		if (!isVisible(constructor, constructor.getDeclaringClass())) {
+		if (!isVisible(constructor, constructor.getDeclaringClass()) ||
+				registeredBean.getMergedBeanDefinition().hasMethodOverrides()) {
 			return generateCodeForInaccessibleConstructor(descriptor,
 					hints -> hints.registerConstructor(constructor, ExecutableMode.INVOKE));
 		}

spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java

@@ -18,6 +18,7 @@
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -53,6 +54,20 @@ public ReplaceOverride(String methodName, String methodReplacerBeanName) {
 		this.methodReplacerBeanName = methodReplacerBeanName;
 	}
 
+	/**
+	 * Construct a new ReplaceOverride.
+	 * @param methodName the name of the method to override
+	 * @param methodReplacerBeanName the bean name of the {@link MethodReplacer}
+	 * @param typeIdentifiers a list of type identifiers for parameter types
+	 * @since 6.2.9
+	 */
+	public ReplaceOverride(String methodName, String methodReplacerBeanName, List<String> typeIdentifiers) {
+		super(methodName);
+		Assert.notNull(methodReplacerBeanName, "Method replacer bean name must not be null");
+		this.methodReplacerBeanName = methodReplacerBeanName;
+		this.typeIdentifiers.addAll(typeIdentifiers);
+	}
+
 
 	/**
 	 * Return the name of the bean implementing MethodReplacer.
@@ -70,6 +85,15 @@ public void addTypeIdentifier(String identifier) {
 		this.typeIdentifiers.add(identifier);
 	}
 
+	/**
+	 * Return the list of registered type identifiers (fragments of a class string).
+	 * @since 6.2.9
+	 * @see #addTypeIdentifier
+	 */
+	public List<String> getTypeIdentifiers() {
+		return Collections.unmodifiableList(this.typeIdentifiers);
+	}
+
 
 	@Override
 	public boolean matches(Method method) {