Move AutowiredArguments support classes to beans.factory.aot

This reduces the package cycle between aot and annotation to an Autowired annotation reference in ConstructorOrFactoryMethodResolver, to be resolved along with gh-27920. See gh-28414
spring-projects · May 12, 2022 · fc8e670 · fc8e670
1 parent f0e23b6
commit fc8e670
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 15 deletions.
diff --git a/...va/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/...va/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/...actory/annotation/AutowiredArguments.java → ...beans/factory/aot/AutowiredArguments.java b/...actory/annotation/AutowiredArguments.java → ...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/...tion/AutowiredArgumentsCodeGenerator.java → .../aot/AutowiredArgumentsCodeGenerator.java b/...tion/AutowiredArgumentsCodeGenerator.java → .../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/.../annotation/AutowiredElementResolver.java → ...factory/aot/AutowiredElementResolver.java b/.../annotation/AutowiredElementResolver.java → ...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/...notation/AutowiredFieldValueResolver.java → ...tory/aot/AutowiredFieldValueResolver.java b/...notation/AutowiredFieldValueResolver.java → ...tory/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/...owiredInstantiationArgumentsResolver.java → ...owiredInstantiationArgumentsResolver.java b/...owiredInstantiationArgumentsResolver.java → ...owiredInstantiationArgumentsResolver.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/...ion/AutowiredMethodArgumentsResolver.java → ...aot/AutowiredMethodArgumentsResolver.java b/...ion/AutowiredMethodArgumentsResolver.java → ...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/...ns/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java b/...ns/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/...AutowiredArgumentsCodeGeneratorTests.java → ...AutowiredArgumentsCodeGeneratorTests.java b/...AutowiredArgumentsCodeGeneratorTests.java → ...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/...ion/AutowiredFieldValueResolverTests.java → ...aot/AutowiredFieldValueResolverTests.java b/...ion/AutowiredFieldValueResolverTests.java → ...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/...dInstantiationArgumentsResolverTests.java → ...dInstantiationArgumentsResolverTests.java b/...dInstantiationArgumentsResolverTests.java → ...dInstantiationArgumentsResolverTests.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/...utowiredMethodArgumentsResolverTests.java → ...utowiredMethodArgumentsResolverTests.java b/...utowiredMethodArgumentsResolverTests.java → ...utowiredMethodArgumentsResolverTests.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;