diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java index 1a179045c222..959c80a34eee 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java @@ -58,6 +58,9 @@ import org.springframework.beans.factory.InjectionPoint; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.UnsatisfiedDependencyException; +import org.springframework.beans.factory.aot.AutowiredArgumentsCodeGenerator; +import org.springframework.beans.factory.aot.AutowiredFieldValueResolver; +import org.springframework.beans.factory.aot.AutowiredMethodArgumentsResolver; import org.springframework.beans.factory.aot.BeanRegistrationAotContribution; import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor; import org.springframework.beans.factory.aot.BeanRegistrationCode; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredArguments.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredArguments.java similarity index 97% rename from spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredArguments.java rename to spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredArguments.java index c7dfc573f75f..0ad070dc06b1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredArguments.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredArguments.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans.factory.annotation; +package org.springframework.beans.factory.aot; import org.springframework.lang.Nullable; import org.springframework.util.Assert; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredArgumentsCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGenerator.java similarity index 98% rename from spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredArgumentsCodeGenerator.java rename to spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGenerator.java index db68b7cba806..49a8c86c13cc 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredArgumentsCodeGenerator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans.factory.annotation; +package org.springframework.beans.factory.aot; import java.lang.reflect.Constructor; import java.lang.reflect.Executable; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredElementResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredElementResolver.java similarity index 97% rename from spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredElementResolver.java rename to spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredElementResolver.java index c6d3990c16d5..1cd165908374 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredElementResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredElementResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans.factory.annotation; +package org.springframework.beans.factory.aot; import java.util.Set; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredFieldValueResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolver.java similarity index 99% rename from spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredFieldValueResolver.java rename to spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolver.java index d269202e8698..ed10d48d559c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredFieldValueResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans.factory.annotation; +package org.springframework.beans.factory.aot; import java.lang.reflect.Field; import java.util.LinkedHashSet; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredInstantiationArgumentsResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredInstantiationArgumentsResolver.java similarity index 99% rename from spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredInstantiationArgumentsResolver.java rename to spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredInstantiationArgumentsResolver.java index 8abf15730784..b67b2376a934 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredInstantiationArgumentsResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredInstantiationArgumentsResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans.factory.annotation; +package org.springframework.beans.factory.aot; import java.lang.reflect.Array; import java.lang.reflect.Constructor; @@ -69,8 +69,7 @@ * @since 6.0 * @see AutowiredArguments */ -public final class AutowiredInstantiationArgumentsResolver - extends AutowiredElementResolver { +public final class AutowiredInstantiationArgumentsResolver extends AutowiredElementResolver { private final ExecutableLookup lookup; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredMethodArgumentsResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolver.java similarity index 99% rename from spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredMethodArgumentsResolver.java rename to spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolver.java index 1170c0f133e8..9fce1f6fc0e3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredMethodArgumentsResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans.factory.annotation; +package org.springframework.beans.factory.aot; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java index 6beb406a0e66..a0703f566833 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java @@ -30,8 +30,6 @@ import org.springframework.aot.generate.MethodGenerator; import org.springframework.aot.hint.ExecutableHint; import org.springframework.aot.hint.ExecutableMode; -import org.springframework.beans.factory.annotation.AutowiredArgumentsCodeGenerator; -import org.springframework.beans.factory.annotation.AutowiredInstantiationArgumentsResolver; import org.springframework.beans.factory.support.InstanceSupplier; import org.springframework.beans.factory.support.RegisteredBean; import org.springframework.core.ResolvableType; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredArgumentsCodeGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGeneratorTests.java similarity index 99% rename from spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredArgumentsCodeGeneratorTests.java rename to spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGeneratorTests.java index 3027873f77b9..67a3c5eb6320 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredArgumentsCodeGeneratorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGeneratorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans.factory.annotation; +package org.springframework.beans.factory.aot; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredFieldValueResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolverTests.java similarity index 99% rename from spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredFieldValueResolverTests.java rename to spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolverTests.java index 0e8f60d8e640..eb233d38c116 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredFieldValueResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans.factory.annotation; +package org.springframework.beans.factory.aot; import java.util.ArrayList; import java.util.List; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredInstantiationArgumentsResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredInstantiationArgumentsResolverTests.java similarity index 99% rename from spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredInstantiationArgumentsResolverTests.java rename to spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredInstantiationArgumentsResolverTests.java index 255309676e2b..f606d50304ab 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredInstantiationArgumentsResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredInstantiationArgumentsResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans.factory.annotation; +package org.springframework.beans.factory.aot; import java.io.InputStream; import java.lang.annotation.Retention; @@ -38,7 +38,8 @@ import org.springframework.beans.factory.BeanCurrentlyInCreationException; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.UnsatisfiedDependencyException; -import org.springframework.beans.factory.annotation.AutowiredInstantiationArgumentsResolverTests.Enclosing.InnerSingleArgConstructor; +import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor; +import org.springframework.beans.factory.aot.AutowiredInstantiationArgumentsResolverTests.Enclosing.InnerSingleArgConstructor; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder; import org.springframework.beans.factory.config.DependencyDescriptor; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredMethodArgumentsResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java similarity index 99% rename from spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredMethodArgumentsResolverTests.java rename to spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java index 5168e8263cdf..4ed2bfa26a84 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredMethodArgumentsResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans.factory.annotation; +package org.springframework.beans.factory.aot; import java.io.InputStream; import java.util.ArrayList;