Make sure method injection handles ambiguous signatures

This commit updates InjectionGenerator to request a resolved attribute
with a dedicated type if multiple methods with the same name and the
same number of arguments exist. This was previously done already for
constructors and this commit harmonizes the algorithms to methods as
well

Closes gh-28154

Author: snicoll

spring-beans/src/main/java/org/springframework/beans/factory/generator/InjectionGenerator.java

@@ -199,7 +199,10 @@ private CodeBlock generateMethodInvocation(Method injectionPoint, Consumer<Build
 			code.add(")\n").indent().indent();
 		}
 		attributesResolver.accept(code);
-		List<CodeBlock> parameters = resolveParameters(injectionPoint.getParameters(), false);
+		Parameter[] methodParameters = injectionPoint.getParameters();
+		boolean isAmbiguous = Arrays.stream(injectionPoint.getDeclaringClass().getDeclaredMethods())
+				.filter(method -> method.getName().equals(injectionPoint.getName()) && method.getParameterCount() == methodParameters.length).count() > 1;
+		List<CodeBlock> parameters = resolveParameters(methodParameters, isAmbiguous);
 		code.add(" ");
 		if (instantiation) {
 			if (Modifier.isStatic(injectionPoint.getModifiers())) {

spring-beans/src/test/java/org/springframework/beans/factory/generator/BeanDefinitionsContributionTests.java

@@ -86,7 +86,7 @@ void contributeGeneratesBeanDefinitionsInOrder() {
 		CodeSnippet code = contribute(beanFactory, createGenerationContext());
 		assertThat(code.getSnippet()).isEqualTo("""
 				BeanDefinitionRegistrar.of("counter", Integer.class).withFactoryMethod(Integer.class, "valueOf", int.class)
-						.instanceSupplier((instanceContext) -> instanceContext.create(beanFactory, (attributes) -> Integer.valueOf(attributes.get(0)))).customize((bd) -> bd.getConstructorArgumentValues().addIndexedArgumentValue(0, 42)).register(beanFactory);
+						.instanceSupplier((instanceContext) -> instanceContext.create(beanFactory, (attributes) -> Integer.valueOf(attributes.get(0, int.class)))).customize((bd) -> bd.getConstructorArgumentValues().addIndexedArgumentValue(0, 42)).register(beanFactory);
 				BeanDefinitionRegistrar.of("name", String.class).withConstructor(String.class)
 						.instanceSupplier((instanceContext) -> instanceContext.create(beanFactory, (attributes) -> new String(attributes.get(0, String.class)))).customize((bd) -> bd.getConstructorArgumentValues().addIndexedArgumentValue(0, "Hello")).register(beanFactory);
 				""");

spring-beans/src/test/java/org/springframework/beans/factory/generator/InjectionGeneratorTests.java

@@ -28,6 +28,7 @@
 import org.springframework.aot.generator.ProtectedAccess.Options;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.generator.InjectionGeneratorTests.SimpleConstructorBean.InnerClass;
+import org.springframework.beans.testfixture.beans.factory.generator.factory.SampleFactory;
 import org.springframework.javapoet.support.CodeSnippet;
 import org.springframework.util.ReflectionUtils;
 
@@ -105,8 +106,14 @@ void generateInstantiationForStaticMethodWithNonGenericParameter() {
 
 	@Test
 	void generateInstantiationForMethodWithGenericParameters() {
-		assertThat(generateInstantiation(method(SampleBean.class, "source", ObjectProvider.class)).lines()).containsExactly(
-				"instanceContext.create(beanFactory, (attributes) -> beanFactory.getBean(InjectionGeneratorTests.SampleBean.class).source(attributes.get(0)))");
+		assertThat(generateInstantiation(method(SampleBean.class, "sourceWithProvider", ObjectProvider.class)).lines()).containsExactly(
+				"instanceContext.create(beanFactory, (attributes) -> beanFactory.getBean(InjectionGeneratorTests.SampleBean.class).sourceWithProvider(attributes.get(0)))");
+	}
+
+	@Test
+	void generateInstantiationForAmbiguousMethod() {
+		assertThat(generateInstantiation(method(SampleFactory.class, "create", String.class)).lines()).containsExactly(
+				"instanceContext.create(beanFactory, (attributes) -> SampleFactory.create(attributes.get(0, String.class)))");
 	}
 
 	@Test
@@ -263,7 +270,7 @@ String source(Integer counter) {
 			return "source" + counter;
 		}
 
-		String source(ObjectProvider<Integer> counter) {
+		String sourceWithProvider(ObjectProvider<Integer> counter) {
 			return "source" + counter.getIfAvailable(() -> 0);
 		}