Browse Source

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
pull/28488/head
Juergen Hoeller 4 years ago
parent
commit
fc8e6705d6
  1. 3
      spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
  2. 2
      spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredArguments.java
  3. 2
      spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGenerator.java
  4. 2
      spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredElementResolver.java
  5. 2
      spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolver.java
  6. 5
      spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredInstantiationArgumentsResolver.java
  7. 2
      spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolver.java
  8. 2
      spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java
  9. 2
      spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGeneratorTests.java
  10. 2
      spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolverTests.java
  11. 5
      spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredInstantiationArgumentsResolverTests.java
  12. 2
      spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java

3
spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java

@ -58,6 +58,9 @@ import org.springframework.beans.factory.BeanFactoryUtils; @@ -58,6 +58,9 @@ import org.springframework.beans.factory.BeanFactoryUtils;
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;

2
spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredArguments.java → spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredArguments.java

@ -14,7 +14,7 @@ @@ -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;

2
spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredArgumentsCodeGenerator.java → spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGenerator.java

@ -14,7 +14,7 @@ @@ -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;

2
spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredElementResolver.java → spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredElementResolver.java

@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.beans.factory.annotation;
package org.springframework.beans.factory.aot;
import java.util.Set;

2
spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredFieldValueResolver.java → spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolver.java

@ -14,7 +14,7 @@ @@ -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;

5
spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredInstantiationArgumentsResolver.java → spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredInstantiationArgumentsResolver.java

@ -14,7 +14,7 @@ @@ -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 @@ import org.springframework.util.function.ThrowingFunction; @@ -69,8 +69,7 @@ import org.springframework.util.function.ThrowingFunction;
* @since 6.0
* @see AutowiredArguments
*/
public final class AutowiredInstantiationArgumentsResolver
extends AutowiredElementResolver {
public final class AutowiredInstantiationArgumentsResolver extends AutowiredElementResolver {
private final ExecutableLookup lookup;

2
spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredMethodArgumentsResolver.java → spring-beans/src/main/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolver.java

@ -14,7 +14,7 @@ @@ -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;

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

@ -30,8 +30,6 @@ import org.springframework.aot.generate.GenerationContext; @@ -30,8 +30,6 @@ import org.springframework.aot.generate.GenerationContext;
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;

2
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredArgumentsCodeGeneratorTests.java → spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredArgumentsCodeGeneratorTests.java

@ -14,7 +14,7 @@ @@ -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;

2
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredFieldValueResolverTests.java → spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredFieldValueResolverTests.java

@ -14,7 +14,7 @@ @@ -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;

5
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredInstantiationArgumentsResolverTests.java → spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredInstantiationArgumentsResolverTests.java

@ -14,7 +14,7 @@ @@ -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.junit.jupiter.params.support.AnnotationConsumer; @@ -38,7 +38,8 @@ import org.junit.jupiter.params.support.AnnotationConsumer;
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;

2
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredMethodArgumentsResolverTests.java → spring-beans/src/test/java/org/springframework/beans/factory/aot/AutowiredMethodArgumentsResolverTests.java

@ -14,7 +14,7 @@ @@ -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;
Loading…
Cancel
Save