diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorAotContributionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorAotContributionTests.java index d644e34bc3..53d200b9f5 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorAotContributionTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorAotContributionTests.java @@ -42,11 +42,11 @@ import org.springframework.beans.testfixture.beans.factory.aot.MockBeanFactoryIn import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.context.testfixture.context.annotation.CglibConfiguration; +import org.springframework.context.testfixture.context.annotation.ImportAwareConfiguration; +import org.springframework.context.testfixture.context.annotation.ImportConfiguration; +import org.springframework.context.testfixture.context.annotation.SimpleConfiguration; import org.springframework.context.testfixture.context.generator.SimpleComponent; -import org.springframework.context.testfixture.context.generator.annotation.CglibConfiguration; -import org.springframework.context.testfixture.context.generator.annotation.ImportAwareConfiguration; -import org.springframework.context.testfixture.context.generator.annotation.ImportConfiguration; -import org.springframework.context.testfixture.context.generator.annotation.SimpleConfiguration; import org.springframework.core.Ordered; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.io.ResourceLoader; @@ -149,8 +149,7 @@ class ConfigurationClassPostProcessorAotContributionTests { .singleElement() .satisfies(resourceHint -> assertThat(resourceHint.getIncludes()) .map(ResourcePatternHint::getPattern) - .containsOnly("org/springframework/context/testfixture/context/generator/annotation/" - + "ImportConfiguration.class")); + .containsOnly("org/springframework/context/testfixture/context/annotation/ImportConfiguration.class")); } @SuppressWarnings("unchecked") diff --git a/spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java b/spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java index cba20baaa7..abf80474db 100644 --- a/spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java +++ b/spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java @@ -52,16 +52,16 @@ import org.springframework.context.annotation.AnnotationConfigUtils; import org.springframework.context.annotation.CommonAnnotationBeanPostProcessor; import org.springframework.context.annotation.ContextAnnotationAutowireCandidateResolver; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.context.testfixture.context.annotation.AutowiredComponent; +import org.springframework.context.testfixture.context.annotation.CglibConfiguration; +import org.springframework.context.testfixture.context.annotation.ConfigurableCglibConfiguration; +import org.springframework.context.testfixture.context.annotation.InitDestroyComponent; +import org.springframework.context.testfixture.context.annotation.LazyAutowiredFieldComponent; +import org.springframework.context.testfixture.context.annotation.LazyAutowiredMethodComponent; +import org.springframework.context.testfixture.context.annotation.LazyConstructorArgumentComponent; +import org.springframework.context.testfixture.context.annotation.LazyFactoryMethodArgumentComponent; +import org.springframework.context.testfixture.context.annotation.PropertySourceConfiguration; import org.springframework.context.testfixture.context.generator.SimpleComponent; -import org.springframework.context.testfixture.context.generator.annotation.AutowiredComponent; -import org.springframework.context.testfixture.context.generator.annotation.CglibConfiguration; -import org.springframework.context.testfixture.context.generator.annotation.ConfigurableCglibConfiguration; -import org.springframework.context.testfixture.context.generator.annotation.InitDestroyComponent; -import org.springframework.context.testfixture.context.generator.annotation.LazyAutowiredFieldComponent; -import org.springframework.context.testfixture.context.generator.annotation.LazyAutowiredMethodComponent; -import org.springframework.context.testfixture.context.generator.annotation.LazyConstructorArgumentComponent; -import org.springframework.context.testfixture.context.generator.annotation.LazyFactoryMethodArgumentComponent; -import org.springframework.context.testfixture.context.generator.annotation.PropertySourceConfiguration; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Environment; import org.springframework.core.env.PropertySource; diff --git a/spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java b/spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java index 687145b2b3..3ec3f55d8e 100644 --- a/spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java +++ b/spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java @@ -32,9 +32,9 @@ import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.aot.ApplicationContextAotGenerator; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.context.testfixture.context.annotation.AutowiredComponent; +import org.springframework.context.testfixture.context.annotation.InitDestroyComponent; import org.springframework.context.testfixture.context.generator.SimpleComponent; -import org.springframework.context.testfixture.context.generator.annotation.AutowiredComponent; -import org.springframework.context.testfixture.context.generator.annotation.InitDestroyComponent; import org.springframework.core.test.tools.TestCompiler; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/AutowiredComponent.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/AutowiredComponent.java similarity index 93% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/AutowiredComponent.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/AutowiredComponent.java index 8bc7dae191..44c3c29929 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/AutowiredComponent.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/AutowiredComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/CglibConfiguration.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/CglibConfiguration.java similarity index 93% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/CglibConfiguration.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/CglibConfiguration.java index 8bd3a22534..e8de21dae9 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/CglibConfiguration.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/CglibConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import java.util.concurrent.atomic.AtomicInteger; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/ConfigurableCglibConfiguration.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ConfigurableCglibConfiguration.java similarity index 93% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/ConfigurableCglibConfiguration.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ConfigurableCglibConfiguration.java index eefe88f9fa..e77d3327db 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/ConfigurableCglibConfiguration.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ConfigurableCglibConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/ImportAwareConfiguration.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ImportAwareConfiguration.java similarity index 94% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/ImportAwareConfiguration.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ImportAwareConfiguration.java index 509f5c4295..34872ca078 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/ImportAwareConfiguration.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ImportAwareConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import org.springframework.context.EnvironmentAware; import org.springframework.context.annotation.Configuration; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/ImportConfiguration.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ImportConfiguration.java similarity index 91% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/ImportConfiguration.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ImportConfiguration.java index d4c98b09fd..e2f417443f 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/ImportConfiguration.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ImportConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/InitDestroyComponent.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/InitDestroyComponent.java similarity index 93% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/InitDestroyComponent.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/InitDestroyComponent.java index ac8e5b159a..d8623ec8ad 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/InitDestroyComponent.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/InitDestroyComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import java.util.ArrayList; import java.util.List; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyAutowiredFieldComponent.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyAutowiredFieldComponent.java similarity index 93% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyAutowiredFieldComponent.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyAutowiredFieldComponent.java index cd65c14b0d..b10ae53e7e 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyAutowiredFieldComponent.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyAutowiredFieldComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyAutowiredMethodComponent.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyAutowiredMethodComponent.java similarity index 94% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyAutowiredMethodComponent.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyAutowiredMethodComponent.java index b10d26a0ab..97cd8f3e42 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyAutowiredMethodComponent.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyAutowiredMethodComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyConstructorArgumentComponent.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyConstructorArgumentComponent.java similarity index 94% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyConstructorArgumentComponent.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyConstructorArgumentComponent.java index 6da3e9cfec..695b0cf399 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyConstructorArgumentComponent.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyConstructorArgumentComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import org.springframework.context.annotation.Lazy; import org.springframework.core.env.Environment; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyFactoryMethodArgumentComponent.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyFactoryMethodArgumentComponent.java similarity index 94% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyFactoryMethodArgumentComponent.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyFactoryMethodArgumentComponent.java index 221ddad9c7..5c3c981417 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/LazyFactoryMethodArgumentComponent.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyFactoryMethodArgumentComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import org.springframework.context.annotation.Lazy; import org.springframework.core.env.Environment; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/PropertySourceConfiguration.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PropertySourceConfiguration.java similarity index 92% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/PropertySourceConfiguration.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PropertySourceConfiguration.java index 87670d4db4..7a4270dbca 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/PropertySourceConfiguration.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PropertySourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/SimpleConfiguration.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/SimpleConfiguration.java similarity index 91% rename from spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/SimpleConfiguration.java rename to spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/SimpleConfiguration.java index 34cd687999..4a0db47d4e 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/generator/annotation/SimpleConfiguration.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/SimpleConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.context.testfixture.context.generator.annotation; +package org.springframework.context.testfixture.context.annotation; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration;