Complete refactor of AOT concepts

Remove the AOT code that now has an alternative API.

Closes gh-28414

Author: philwebb

spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationContributionProvider.java

@@ -43,7 +43,6 @@
 import org.springframework.aot.generate.AccessVisibility;
 import org.springframework.aot.generate.GenerationContext;
 import org.springframework.aot.generate.MethodReference;
-import org.springframework.aot.generator.CodeContribution;
 import org.springframework.aot.hint.ExecutableHint;
 import org.springframework.aot.hint.ExecutableMode;
 import org.springframework.aot.hint.FieldHint;
@@ -59,16 +58,12 @@
 import org.springframework.beans.factory.InjectionPoint;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.UnsatisfiedDependencyException;
-import org.springframework.beans.factory.annotation.InjectionMetadata.InjectedElement;
 import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
 import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
 import org.springframework.beans.factory.aot.BeanRegistrationCode;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
-import org.springframework.beans.factory.generator.AotContributingBeanPostProcessor;
-import org.springframework.beans.factory.generator.BeanInstantiationContribution;
-import org.springframework.beans.factory.generator.InjectionGenerator;
 import org.springframework.beans.factory.support.LookupOverride;
 import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
 import org.springframework.beans.factory.support.RegisteredBean;
@@ -157,8 +152,7 @@
  * @see Value
  */
 public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationAwareBeanPostProcessor,
-		MergedBeanDefinitionPostProcessor, AotContributingBeanPostProcessor, BeanRegistrationAotProcessor,
-		PriorityOrdered, BeanFactoryAware {
+		MergedBeanDefinitionPostProcessor, BeanRegistrationAotProcessor, PriorityOrdered, BeanFactoryAware {
 
 	protected final Log logger = LogFactory.getLog(getClass());
 
@@ -285,15 +279,6 @@ public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, C
 		findInjectionMetadata(beanName, beanType, beanDefinition);
 	}
 
-	@Override
-	public BeanInstantiationContribution contribute(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
-		InjectionMetadata metadata = findInjectionMetadata(beanName, beanType, beanDefinition);
-		Collection<InjectedElement> injectedElements = metadata.getInjectedElements();
-		return (!ObjectUtils.isEmpty(injectedElements)
-				? new AutowiredAnnotationBeanInstantiationContribution(injectedElements)
-				: null);
-	}
-
 	@Override
 	public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
 		Class<?> beanClass = registeredBean.getBeanClass();
@@ -866,52 +851,6 @@ private Object[] resolveMethodArguments(Method method, Object bean, @Nullable St
 		}
 	}
 
-	private static final class AutowiredAnnotationBeanInstantiationContribution implements BeanInstantiationContribution {
-
-		private final Collection<InjectedElement> injectedElements;
-
-		private final InjectionGenerator generator;
-
-		AutowiredAnnotationBeanInstantiationContribution(Collection<InjectedElement> injectedElements) {
-			this.injectedElements = injectedElements;
-			this.generator = new InjectionGenerator();
-		}
-
-		@Override
-		public void applyTo(CodeContribution contribution) {
-			this.injectedElements.forEach(element -> {
-				boolean isRequired = isRequired(element);
-				Member member = element.getMember();
-				analyzeMember(contribution, member);
-				contribution.statements().addStatement(this.generator.generateInjection(member, isRequired));
-			});
-		}
-
-		private boolean isRequired(InjectedElement element) {
-			if (element instanceof AutowiredMethodElement injectedMethod) {
-				return injectedMethod.required;
-			}
-			else if (element instanceof AutowiredFieldElement injectedField) {
-				return injectedField.required;
-			}
-			return true;
-		}
-
-		private void analyzeMember(CodeContribution contribution, Member member) {
-			if (member instanceof Method method) {
-				contribution.runtimeHints().reflection().registerMethod(method,
-						hint -> hint.setModes(ExecutableMode.INTROSPECT));
-				contribution.protectedAccess().analyze(member,
-						this.generator.getProtectedAccessInjectionOptions(member));
-			}
-			else if (member instanceof Field field) {
-				contribution.runtimeHints().reflection().registerField(field);
-				contribution.protectedAccess().analyze(member,
-						this.generator.getProtectedAccessInjectionOptions(member));
-			}
-		}
-
-	}
 
 	/**
 	 * DependencyDescriptor variant with a pre-resolved target bean name.

spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationContributionProviderTests.java

@@ -42,8 +42,6 @@
 import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
 import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
 import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
-import org.springframework.beans.factory.generator.AotContributingBeanPostProcessor;
-import org.springframework.beans.factory.generator.BeanInstantiationContribution;
 import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -87,8 +85,7 @@
  */
 @SuppressWarnings("serial")
 public class InitDestroyAnnotationBeanPostProcessor implements DestructionAwareBeanPostProcessor,
-		MergedBeanDefinitionPostProcessor, AotContributingBeanPostProcessor, BeanRegistrationAotProcessor,
-		PriorityOrdered, Serializable {
+		MergedBeanDefinitionPostProcessor, BeanRegistrationAotProcessor, PriorityOrdered, Serializable {
 
 	private final transient LifecycleMetadata emptyLifecycleMetadata =
 			new LifecycleMetadata(Object.class, Collections.emptyList(), Collections.emptyList()) {
@@ -159,22 +156,6 @@ public void postProcessMergedBeanDefinition(RootBeanDefinition beanDefinition, C
 		findInjectionMetadata(beanDefinition, beanType);
 	}
 
-	@Override
-	public BeanInstantiationContribution contribute(RootBeanDefinition beanDefinition, Class<?> beanType, String beanName) {
-		LifecycleMetadata metadata = findInjectionMetadata(beanDefinition, beanType);
-		if (!CollectionUtils.isEmpty(metadata.initMethods)) {
-			String[] initMethodNames = safeMerge(
-					beanDefinition.getInitMethodNames(), metadata.initMethods);
-			beanDefinition.setInitMethodNames(initMethodNames);
-		}
-		if (!CollectionUtils.isEmpty(metadata.destroyMethods)) {
-			String[] destroyMethodNames = safeMerge(
-					beanDefinition.getDestroyMethodNames(), metadata.destroyMethods);
-			beanDefinition.setDestroyMethodNames(destroyMethodNames);
-		}
-		return null;
-	}
-
 	@Override
 	public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
 		RootBeanDefinition beanDefinition = registeredBean.getMergedBeanDefinition();