Merge AOT constructor and factory method resolution into ConstructorResolver

This moves related code into the same class, unifies candidate determination for constructors and factory methods, and gets rid of the package cycle around the hard-coded Autowired annotation check (which is implicitly coming from AutowiredAnnotationBeanPostProcessor via the determineCandidateConstructors SPI now). The API entry point for AOT pre-resolution purposes is in RegisteredBean.

Closes gh-27920

Author: jhoeller

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

@@ -76,12 +76,12 @@ class BeanDefinitionMethodGenerator {
 
 		this.methodGeneratorFactory = methodGeneratorFactory;
 		this.registeredBean = registeredBean;
-		this.constructorOrFactoryMethod = ConstructorOrFactoryMethodResolver
-				.resolve(registeredBean);
+		this.constructorOrFactoryMethod = registeredBean.resolveConstructorOrFactoryMethod();
 		this.innerBeanPropertyName = innerBeanPropertyName;
 		this.aotContributions = aotContributions;
 	}
 
+
 	/**
 	 * Generate the method that returns the {@link BeanDefinition} to be
 	 * registered.
@@ -95,22 +95,17 @@ MethodReference generateBeanDefinitionMethod(GenerationContext generationContext
 		registerRuntimeHintsIfNecessary(generationContext.getRuntimeHints());
 		BeanRegistrationCodeFragments codeFragments = getCodeFragments(generationContext,
 				beanRegistrationsCode);
-		ClassName target = codeFragments.getTarget(this.registeredBean,
-				this.constructorOrFactoryMethod);
+		ClassName target = codeFragments.getTarget(this.registeredBean, this.constructorOrFactoryMethod);
 		if (!target.canonicalName().startsWith("java.")) {
 			GeneratedClass generatedClass = lookupGeneratedClass(generationContext, target);
-			GeneratedMethods generatedMethods = generatedClass.getMethods()
-					.withPrefix(getName());
-			GeneratedMethod generatedMethod = generateBeanDefinitionMethod(
-					generationContext, generatedClass.getName(), generatedMethods,
-					codeFragments, Modifier.PUBLIC);
+			GeneratedMethods generatedMethods = generatedClass.getMethods().withPrefix(getName());
+			GeneratedMethod generatedMethod = generateBeanDefinitionMethod(generationContext,
+					generatedClass.getName(), generatedMethods, codeFragments, Modifier.PUBLIC);
 			return generatedMethod.toMethodReference();
 		}
-		GeneratedMethods generatedMethods = beanRegistrationsCode.getMethods()
-				.withPrefix(getName());
+		GeneratedMethods generatedMethods = beanRegistrationsCode.getMethods().withPrefix(getName());
 		GeneratedMethod generatedMethod = generateBeanDefinitionMethod(generationContext,
-				beanRegistrationsCode.getClassName(), generatedMethods, codeFragments,
-				Modifier.PRIVATE);
+				beanRegistrationsCode.getClassName(), generatedMethods, codeFragments, Modifier.PRIVATE);
 		return generatedMethod.toMethodReference();
 	}
 
@@ -219,6 +214,7 @@ else if (this.constructorOrFactoryMethod instanceof Constructor<?> constructor)
 		}
 	}
 
+
 	private static class ProxyRuntimeHintsRegistrar {
 
 		private final AutowireCandidateResolver candidateResolver;
@@ -231,8 +227,7 @@ public void registerRuntimeHints(RuntimeHints runtimeHints, Method method) {
 			Class<?>[] parameterTypes = method.getParameterTypes();
 			for (int i = 0; i < parameterTypes.length; i++) {
 				MethodParameter methodParam = new MethodParameter(method, i);
-				DependencyDescriptor dependencyDescriptor = new DependencyDescriptor(
-						methodParam, true);
+				DependencyDescriptor dependencyDescriptor = new DependencyDescriptor(methodParam, true);
 				registerProxyIfNecessary(runtimeHints, dependencyDescriptor);
 			}
 		}
@@ -248,13 +243,11 @@ public void registerRuntimeHints(RuntimeHints runtimeHints, Constructor<?> const
 		}
 
 		private void registerProxyIfNecessary(RuntimeHints runtimeHints, DependencyDescriptor dependencyDescriptor) {
-			Class<?> proxyType = this.candidateResolver
-					.getLazyResolutionProxyClass(dependencyDescriptor, null);
+			Class<?> proxyType = this.candidateResolver.getLazyResolutionProxyClass(dependencyDescriptor, null);
 			if (proxyType != null && Proxy.isProxyClass(proxyType)) {
 				runtimeHints.proxies().registerJdkProxy(proxyType.getInterfaces());
 			}
 		}
-
 	}
 
 }