Merge branch '6.2.x'

# Conflicts:
#	spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationAotContributions.java
#	spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java
#	spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateQueryException.java

Author: jhoeller

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

@@ -53,6 +53,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

@@ -40,6 +40,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;
@@ -343,6 +344,11 @@ private ValueHolder resolveArgumentValue(BeanDefinitionValueResolver resolver, V
 
 	private Object instantiate(RegisteredBean registeredBean, Executable executable, @Nullable 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/BeanRegistrationAotContribution.java

@@ -41,8 +41,7 @@ public interface BeanRegistrationAotContribution {
 	 * default code generation isn't suitable.
 	 * @param generationContext the generation context
 	 * @param codeFragments the existing code fragments
-	 * @return the code fragments to use, may be the original instance or a
-	 * wrapper
+	 * @return the code fragments to use, may be the original instance or a wrapper
 	 */
 	default BeanRegistrationCodeFragments customizeBeanRegistrationCodeFragments(
 			GenerationContext generationContext, BeanRegistrationCodeFragments codeFragments) {
@@ -78,8 +77,7 @@ public BeanRegistrationCodeFragments customizeBeanRegistrationCodeFragments(
 				return defaultCodeFragments.apply(codeFragments);
 			}
 			@Override
-			public void applyTo(GenerationContext generationContext,
-					BeanRegistrationCode beanRegistrationCode) {
+			public void applyTo(GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode) {
 			}
 		};
 	}

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

@@ -31,14 +31,15 @@
 
 /**
  * Generate the various fragments of code needed to register a bean.
- * <p>
- * A default implementation is provided that suits most needs and custom code
+ *
+ * <p>A default implementation is provided that suits most needs and custom code
  * fragments are only expected to be used by library authors having built custom
  * arrangement on top of the core container.
- * <p>
- * Users are not expected to implement this interface directly, but rather extends
- * from {@link BeanRegistrationCodeFragmentsDecorator} and only override the
- * necessary method(s).
+ *
+ * <p>Users are not expected to implement this interface directly, but rather
+ * extends from {@link BeanRegistrationCodeFragmentsDecorator} and only override
+ * the necessary method(s).
+ *
  * @author Phillip Webb
  * @author Stephane Nicoll
  * @since 6.0
@@ -48,12 +49,12 @@
 public interface BeanRegistrationCodeFragments {
 
 	/**
-	 * The variable name to used when creating the bean definition.
+	 * The variable name used when creating the bean definition.
 	 */
 	String BEAN_DEFINITION_VARIABLE = "beanDefinition";
 
 	/**
-	 * The variable name to used when creating the bean definition.
+	 * The variable name used when creating the bean definition.
 	 */
 	String INSTANCE_SUPPLIER_VARIABLE = "instanceSupplier";
 
@@ -69,8 +70,7 @@ public interface BeanRegistrationCodeFragments {
 
 	/**
 	 * Generate the code that defines the new bean definition instance.
-	 * <p>
-	 * This should declare a variable named {@value BEAN_DEFINITION_VARIABLE}
+	 * <p>This should declare a variable named {@value BEAN_DEFINITION_VARIABLE}
 	 * so that further fragments can refer to the variable to further tune
 	 * the bean definition.
 	 * @param generationContext the generation context
@@ -94,14 +94,13 @@ CodeBlock generateSetBeanDefinitionPropertiesCode(
 
 	/**
 	 * Generate the code that sets the instance supplier on the bean definition.
-	 * <p>
-	 * The {@code postProcessors} represent methods to be exposed once the
+	 * <p>The {@code postProcessors} represent methods to be exposed once the
 	 * instance has been created to further configure it. Each method should
 	 * accept two parameters, the {@link RegisteredBean} and the bean
 	 * instance, and should return the modified bean instance.
 	 * @param generationContext the generation context
 	 * @param beanRegistrationCode the bean registration code
-	 * @param instanceSupplierCode the instance supplier code supplier code
+	 * @param instanceSupplierCode the instance supplier code
 	 * @param postProcessors any instance post processors that should be applied
 	 * @return the generated code
 	 * @see #generateInstanceSupplierCode

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

@@ -58,6 +58,7 @@ class BeanRegistrationCodeGenerator implements BeanRegistrationCode {
 		this.codeFragments = codeFragments;
 	}
 
+
 	@Override
 	public ClassName getClassName() {
 		return this.className;

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

@@ -245,7 +245,7 @@ public CodeBlock generateReturnCode(
 	}
 
 	private boolean hasInstanceSupplier() {
-		return this.registeredBean.getMergedBeanDefinition().getInstanceSupplier() != null;
+		return (this.registeredBean.getMergedBeanDefinition().getInstanceSupplier() != null);
 	}
 
 }

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;
 
@@ -54,6 +55,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.
@@ -71,6 +86,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) {

spring-context/src/main/java/org/springframework/context/aot/BeanFactoryInitializationAotContributions.java

@@ -32,9 +32,8 @@
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 
 /**
- * A collection of {@link BeanFactoryInitializationAotContribution AOT
- * contributions} obtained from {@link BeanFactoryInitializationAotProcessor AOT
- * processors}.
+ * A collection of {@link BeanFactoryInitializationAotContribution AOT contributions}
+ * obtained from {@link BeanFactoryInitializationAotProcessor AOT processors}.
  *
  * @author Phillip Webb
  * @since 6.0
@@ -48,23 +47,21 @@ class BeanFactoryInitializationAotContributions {
 		this(beanFactory, AotServices.factoriesAndBeans(beanFactory));
 	}
 
-	BeanFactoryInitializationAotContributions(DefaultListableBeanFactory beanFactory,
-			AotServices.Loader loader) {
+	BeanFactoryInitializationAotContributions(DefaultListableBeanFactory beanFactory, AotServices.Loader loader) {
 		this.contributions = getContributions(beanFactory, getProcessors(loader));
 	}
 
 
-	private static List<BeanFactoryInitializationAotProcessor> getProcessors(
-			AotServices.Loader loader) {
+	private static List<BeanFactoryInitializationAotProcessor> getProcessors(AotServices.Loader loader) {
 		List<BeanFactoryInitializationAotProcessor> processors = new ArrayList<>(
 				loader.load(BeanFactoryInitializationAotProcessor.class).asList());
 		processors.add(new RuntimeHintsBeanFactoryInitializationAotProcessor());
 		return Collections.unmodifiableList(processors);
 	}
 
 	private List<BeanFactoryInitializationAotContribution> getContributions(
-			DefaultListableBeanFactory beanFactory,
-			List<BeanFactoryInitializationAotProcessor> processors) {
+			DefaultListableBeanFactory beanFactory, List<BeanFactoryInitializationAotProcessor> processors) {
+
 		List<BeanFactoryInitializationAotContribution> contributions = new ArrayList<>();
 		for (BeanFactoryInitializationAotProcessor processor : processors) {
 			BeanFactoryInitializationAotContribution contribution = processAheadOfTime(processor, beanFactory);
@@ -75,8 +72,8 @@ private List<BeanFactoryInitializationAotContribution> getContributions(
 		return Collections.unmodifiableList(contributions);
 	}
 
-	private @Nullable BeanFactoryInitializationAotContribution processAheadOfTime(BeanFactoryInitializationAotProcessor processor,
-			DefaultListableBeanFactory beanFactory) {
+	private @Nullable BeanFactoryInitializationAotContribution processAheadOfTime(
+			BeanFactoryInitializationAotProcessor processor, DefaultListableBeanFactory beanFactory) {
 
 		try {
 			return processor.processAheadOfTime(beanFactory);
@@ -92,6 +89,7 @@ private List<BeanFactoryInitializationAotContribution> getContributions(
 
 	void applyTo(GenerationContext generationContext,
 			BeanFactoryInitializationCode beanFactoryInitializationCode) {
+
 		for (BeanFactoryInitializationAotContribution contribution : this.contributions) {
 			contribution.applyTo(generationContext, beanFactoryInitializationCode);
 		}