diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java index 5db7263f6b..e29a319249 100644 --- a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java @@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test; import org.springframework.aop.framework.AopInfrastructureBean; import org.springframework.aot.generate.MethodReference; import org.springframework.aot.test.generate.TestGenerationContext; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.aot.AotServices; import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java index b7e096108d..2f4fe187b1 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java @@ -26,9 +26,9 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.generate.MethodReference; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.aot.test.generate.TestGenerationContext; -import org.springframework.aot.test.generator.compile.CompileWithTargetClassAccess; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.CompileWithTargetClassAccess; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.beans.factory.aot.BeanRegistrationAotContribution; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RegisteredBean; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java index 3f93fd7aa5..53c182ddc5 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java @@ -31,10 +31,10 @@ import org.springframework.aot.generate.GeneratedMethod; import org.springframework.aot.generate.GenerationContext; import org.springframework.aot.generate.MethodReference; import org.springframework.aot.test.generate.TestGenerationContext; -import org.springframework.aot.test.generator.compile.CompileWithTargetClassAccess; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; -import org.springframework.aot.test.generator.file.SourceFile; +import org.springframework.aot.test.generate.compile.CompileWithTargetClassAccess; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; +import org.springframework.aot.test.generate.file.SourceFile; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java index 0689e4b32b..7e0d4dc6ed 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java @@ -30,8 +30,8 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.generate.GeneratedClass; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.aot.test.generate.TestGenerationContext; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanReference; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGeneratorTests.java index 747a73d766..80351663ad 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGeneratorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGeneratorTests.java @@ -35,8 +35,8 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.generate.GeneratedClass; import org.springframework.aot.test.generate.TestGenerationContext; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.beans.factory.config.BeanReference; import org.springframework.beans.factory.config.RuntimeBeanNameReference; import org.springframework.beans.factory.config.RuntimeBeanReference; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java index 3cfcb9b613..1eee3a8343 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java @@ -33,9 +33,9 @@ import org.springframework.aot.generate.GenerationContext; import org.springframework.aot.generate.MethodReference; import org.springframework.aot.test.generate.TestGenerationContext; import org.springframework.aot.test.generate.TestTarget; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; -import org.springframework.aot.test.generator.file.SourceFile; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; +import org.springframework.aot.test.generate.file.SourceFile; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RegisteredBean; import org.springframework.beans.factory.support.RootBeanDefinition; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java index 313052870c..e6c555020e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java @@ -31,8 +31,8 @@ import org.springframework.aot.hint.ExecutableMode; import org.springframework.aot.hint.ReflectionHints; import org.springframework.aot.hint.TypeHint; import org.springframework.aot.test.generate.TestGenerationContext; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.DefaultListableBeanFactory; 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 9187922512..24bef4dcf1 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 @@ -29,8 +29,8 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.generate.MethodReference; import org.springframework.aot.hint.ResourcePatternHint; import org.springframework.aot.test.generate.TestGenerationContext; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.beans.BeansException; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution; 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 1df024a819..b68a4a2020 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 @@ -32,8 +32,8 @@ import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.TypeReference; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.aot.test.generate.TestGenerationContext; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor; import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution; 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 54149d6bd9..51c837df38 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 @@ -28,7 +28,7 @@ import org.springframework.aot.test.agent.EnabledIfRuntimeHintsAgent; import org.springframework.aot.test.agent.RuntimeHintsInvocations; import org.springframework.aot.test.agent.RuntimeHintsRecorder; import org.springframework.aot.test.generate.TestGenerationContext; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java b/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java index c49f7456a0..8e9b4a2a24 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java +++ b/spring-core-test/src/main/java/org/springframework/aot/agent/InvocationsRecorderClassTransformer.java @@ -37,7 +37,7 @@ class InvocationsRecorderClassTransformer implements ClassFileTransformer { private static final String AGENT_PACKAGE = InvocationsRecorderClassTransformer.class.getPackageName().replace('.', '/'); - private static final String AOT_DYNAMIC_CLASSLOADER = "org/springframework/aot/test/generator/compile/DynamicClassLoader"; + private static final String AOT_DYNAMIC_CLASSLOADER = "org/springframework/aot/test/generate/compile/DynamicClassLoader"; private final String[] instrumentedPackages; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompilationException.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompilationException.java similarity index 84% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompilationException.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompilationException.java index c5166fe06a..5ddf615fad 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompilationException.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompilationException.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; -import org.springframework.aot.test.generator.file.ResourceFile; -import org.springframework.aot.test.generator.file.ResourceFiles; -import org.springframework.aot.test.generator.file.SourceFile; -import org.springframework.aot.test.generator.file.SourceFiles; +import org.springframework.aot.test.generate.file.ResourceFile; +import org.springframework.aot.test.generate.file.ResourceFiles; +import org.springframework.aot.test.generate.file.SourceFile; +import org.springframework.aot.test.generate.file.SourceFiles; /** * Exception thrown when code cannot compile. diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccess.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompileWithTargetClassAccess.java similarity index 96% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccess.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompileWithTargetClassAccess.java index 908298915f..195fc51899 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccess.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompileWithTargetClassAccess.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompileWithTargetClassAccessClassLoader.java similarity index 97% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompileWithTargetClassAccessClassLoader.java index c28e351282..03e3b7cd0e 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompileWithTargetClassAccessClassLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.io.IOException; import java.io.InputStream; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessExtension.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompileWithTargetClassAccessExtension.java similarity index 98% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessExtension.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompileWithTargetClassAccessExtension.java index 31799f02be..b3e72919b3 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessExtension.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/CompileWithTargetClassAccessExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.lang.reflect.Method; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/Compiled.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/Compiled.java similarity index 94% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/Compiled.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/Compiled.java index 307b27d74d..c1b692691f 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/Compiled.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/Compiled.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.aot.test.generator.file.ResourceFile; -import org.springframework.aot.test.generator.file.ResourceFiles; -import org.springframework.aot.test.generator.file.SourceFile; -import org.springframework.aot.test.generator.file.SourceFiles; +import org.springframework.aot.test.generate.file.ResourceFile; +import org.springframework.aot.test.generate.file.ResourceFiles; +import org.springframework.aot.test.generate.file.SourceFile; +import org.springframework.aot.test.generate.file.SourceFiles; import org.springframework.lang.Nullable; import org.springframework.util.Assert; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicClassFileObject.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicClassFileObject.java similarity index 96% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicClassFileObject.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicClassFileObject.java index b7ceb6b41c..35be0ccb97 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicClassFileObject.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicClassFileObject.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.io.ByteArrayOutputStream; import java.io.OutputStream; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicClassLoader.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicClassLoader.java similarity index 96% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicClassLoader.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicClassLoader.java index 6d2301842c..bec88b10d7 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicClassLoader.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicClassLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -28,8 +28,8 @@ import java.nio.charset.StandardCharsets; import java.util.Enumeration; import java.util.Map; -import org.springframework.aot.test.generator.file.ResourceFile; -import org.springframework.aot.test.generator.file.ResourceFiles; +import org.springframework.aot.test.generate.file.ResourceFile; +import org.springframework.aot.test.generate.file.ResourceFiles; import org.springframework.lang.Nullable; import org.springframework.util.ReflectionUtils; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicJavaFileManager.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicJavaFileManager.java similarity index 97% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicJavaFileManager.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicJavaFileManager.java index 66901d08e0..48ba1afcad 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicJavaFileManager.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicJavaFileManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.io.IOException; import java.util.Collections; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicJavaFileObject.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicJavaFileObject.java similarity index 91% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicJavaFileObject.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicJavaFileObject.java index 734d0ed0d7..8bcb0acee3 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicJavaFileObject.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/DynamicJavaFileObject.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.net.URI; import javax.tools.JavaFileObject; import javax.tools.SimpleJavaFileObject; -import org.springframework.aot.test.generator.file.SourceFile; +import org.springframework.aot.test.generate.file.SourceFile; /** * Adapts a {@link SourceFile} instance to a {@link JavaFileObject}. diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/TestCompiler.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/TestCompiler.java similarity index 96% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/TestCompiler.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/TestCompiler.java index 4d26ba20da..8289656076 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/TestCompiler.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/TestCompiler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.io.PrintStream; import java.util.ArrayList; @@ -35,11 +35,11 @@ import javax.tools.ToolProvider; import org.springframework.aot.generate.GeneratedFiles.Kind; import org.springframework.aot.generate.InMemoryGeneratedFiles; -import org.springframework.aot.test.generator.file.ResourceFile; -import org.springframework.aot.test.generator.file.ResourceFiles; -import org.springframework.aot.test.generator.file.SourceFile; -import org.springframework.aot.test.generator.file.SourceFiles; -import org.springframework.aot.test.generator.file.WritableContent; +import org.springframework.aot.test.generate.file.ResourceFile; +import org.springframework.aot.test.generate.file.ResourceFiles; +import org.springframework.aot.test.generate.file.SourceFile; +import org.springframework.aot.test.generate.file.SourceFiles; +import org.springframework.aot.test.generate.file.WritableContent; import org.springframework.lang.Nullable; /** diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/package-info.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/package-info.java similarity index 77% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/package-info.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/package-info.java index 2ca3f06936..08968b64cd 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/package-info.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/compile/package-info.java @@ -3,7 +3,7 @@ */ @NonNullApi @NonNullFields -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import org.springframework.lang.NonNullApi; import org.springframework.lang.NonNullFields; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFile.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/DynamicFile.java similarity index 97% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFile.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/file/DynamicFile.java index 1919884521..232eaf8f68 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFile.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/DynamicFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import java.io.IOException; import java.util.Objects; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFileAssert.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/DynamicFileAssert.java similarity index 96% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFileAssert.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/file/DynamicFileAssert.java index d107ea8528..ecb86800dd 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFileAssert.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/DynamicFileAssert.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import org.assertj.core.api.AbstractAssert; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFiles.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/DynamicFiles.java similarity index 98% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFiles.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/file/DynamicFiles.java index c32ff47ac0..c65ace2543 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFiles.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/DynamicFiles.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import java.util.Arrays; import java.util.Collections; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFile.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ResourceFile.java similarity index 98% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFile.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ResourceFile.java index 7fa59a638f..67092d9dca 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFile.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ResourceFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFileAssert.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ResourceFileAssert.java similarity index 94% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFileAssert.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ResourceFileAssert.java index 60dcff164b..4534f5187a 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFileAssert.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ResourceFileAssert.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; /** * Assertion methods for {@code ResourceFile} instances. diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFiles.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ResourceFiles.java similarity index 98% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFiles.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ResourceFiles.java index 7ce0505b1c..548a29efd9 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFiles.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ResourceFiles.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import java.util.Iterator; import java.util.stream.Stream; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFile.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/SourceFile.java similarity index 99% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFile.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/file/SourceFile.java index d7e69ca4f3..8586c489fe 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFile.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/SourceFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import java.io.IOException; import java.io.InputStreamReader; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFileAssert.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/SourceFileAssert.java similarity index 94% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFileAssert.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/file/SourceFileAssert.java index 38104fa9ad..b991c72a59 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFileAssert.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/SourceFileAssert.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; /** * Assertion methods for {@code SourceFile} instances. diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFiles.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/SourceFiles.java similarity index 98% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFiles.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/file/SourceFiles.java index edf5398818..416c470520 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFiles.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/SourceFiles.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import java.util.Iterator; import java.util.Objects; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/WritableContent.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/WritableContent.java similarity index 95% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/file/WritableContent.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/file/WritableContent.java index f0fb749e12..a2b538815b 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/WritableContent.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/WritableContent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import java.io.IOException; diff --git a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/package-info.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/package-info.java similarity index 80% rename from spring-core-test/src/main/java/org/springframework/aot/test/generator/file/package-info.java rename to spring-core-test/src/main/java/org/springframework/aot/test/generate/file/package-info.java index 7759f684f8..8559fb7d6c 100644 --- a/spring-core-test/src/main/java/org/springframework/aot/test/generator/file/package-info.java +++ b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/package-info.java @@ -5,7 +5,7 @@ */ @NonNullApi @NonNullFields -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import org.springframework.lang.NonNullApi; import org.springframework.lang.NonNullFields; diff --git a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/CompilationExceptionTests.java b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/CompilationExceptionTests.java similarity index 85% rename from spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/CompilationExceptionTests.java rename to spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/CompilationExceptionTests.java index e92ccf62f9..5f27d45f3a 100644 --- a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/CompilationExceptionTests.java +++ b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/CompilationExceptionTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import org.junit.jupiter.api.Test; -import org.springframework.aot.test.generator.file.ResourceFiles; -import org.springframework.aot.test.generator.file.SourceFiles; +import org.springframework.aot.test.generate.file.ResourceFiles; +import org.springframework.aot.test.generate.file.SourceFiles; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/CompiledTests.java b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/CompiledTests.java similarity index 94% rename from spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/CompiledTests.java rename to spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/CompiledTests.java index f1437f7ecd..183f270ae8 100644 --- a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/CompiledTests.java +++ b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/CompiledTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.util.List; import java.util.concurrent.Callable; @@ -22,10 +22,10 @@ import java.util.function.Supplier; import org.junit.jupiter.api.Test; -import org.springframework.aot.test.generator.file.ResourceFile; -import org.springframework.aot.test.generator.file.ResourceFiles; -import org.springframework.aot.test.generator.file.SourceFile; -import org.springframework.aot.test.generator.file.SourceFiles; +import org.springframework.aot.test.generate.file.ResourceFile; +import org.springframework.aot.test.generate.file.ResourceFiles; +import org.springframework.aot.test.generate.file.SourceFile; +import org.springframework.aot.test.generate.file.SourceFiles; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalStateException; diff --git a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/DynamicClassFileObjectTests.java b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/DynamicClassFileObjectTests.java similarity index 96% rename from spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/DynamicClassFileObjectTests.java rename to spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/DynamicClassFileObjectTests.java index 66d95cf849..074a7da8c5 100644 --- a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/DynamicClassFileObjectTests.java +++ b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/DynamicClassFileObjectTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.io.ByteArrayInputStream; import java.io.OutputStream; diff --git a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/DynamicJavaFileManagerTests.java b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/DynamicJavaFileManagerTests.java similarity index 98% rename from spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/DynamicJavaFileManagerTests.java rename to spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/DynamicJavaFileManagerTests.java index 0a42b4fd58..a03e6b778d 100644 --- a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/DynamicJavaFileManagerTests.java +++ b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/DynamicJavaFileManagerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import javax.tools.JavaFileManager; import javax.tools.JavaFileManager.Location; diff --git a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/DynamicJavaFileObjectTests.java b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/DynamicJavaFileObjectTests.java similarity index 91% rename from spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/DynamicJavaFileObjectTests.java rename to spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/DynamicJavaFileObjectTests.java index 6cf19ca3e2..de5f6e2ddb 100644 --- a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/DynamicJavaFileObjectTests.java +++ b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/DynamicJavaFileObjectTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import org.junit.jupiter.api.Test; -import org.springframework.aot.test.generator.file.SourceFile; +import org.springframework.aot.test.generate.file.SourceFile; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/TestCompilerTests.java b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/TestCompilerTests.java similarity index 95% rename from spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/TestCompilerTests.java rename to spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/TestCompilerTests.java index eb47121029..c4217e2700 100644 --- a/spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/TestCompilerTests.java +++ b/spring-core-test/src/test/java/org/springframework/aot/test/generate/compile/TestCompilerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.compile; +package org.springframework.aot.test.generate.compile; import java.util.ArrayList; import java.util.List; @@ -30,11 +30,11 @@ import javax.lang.model.element.TypeElement; import com.example.PublicInterface; import org.junit.jupiter.api.Test; -import org.springframework.aot.test.generator.file.ResourceFile; -import org.springframework.aot.test.generator.file.ResourceFiles; -import org.springframework.aot.test.generator.file.SourceFile; -import org.springframework.aot.test.generator.file.SourceFiles; -import org.springframework.aot.test.generator.file.WritableContent; +import org.springframework.aot.test.generate.file.ResourceFile; +import org.springframework.aot.test.generate.file.ResourceFiles; +import org.springframework.aot.test.generate.file.SourceFile; +import org.springframework.aot.test.generate.file.SourceFiles; +import org.springframework.aot.test.generate.file.WritableContent; import org.springframework.util.ClassUtils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-core-test/src/test/java/org/springframework/aot/test/generator/file/ResourceFileTests.java b/spring-core-test/src/test/java/org/springframework/aot/test/generate/file/ResourceFileTests.java similarity index 96% rename from spring-core-test/src/test/java/org/springframework/aot/test/generator/file/ResourceFileTests.java rename to spring-core-test/src/test/java/org/springframework/aot/test/generate/file/ResourceFileTests.java index e86115a93d..3363246a61 100644 --- a/spring-core-test/src/test/java/org/springframework/aot/test/generator/file/ResourceFileTests.java +++ b/spring-core-test/src/test/java/org/springframework/aot/test/generate/file/ResourceFileTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import org.junit.jupiter.api.Test; diff --git a/spring-core-test/src/test/java/org/springframework/aot/test/generator/file/ResourceFilesTests.java b/spring-core-test/src/test/java/org/springframework/aot/test/generate/file/ResourceFilesTests.java similarity index 98% rename from spring-core-test/src/test/java/org/springframework/aot/test/generator/file/ResourceFilesTests.java rename to spring-core-test/src/test/java/org/springframework/aot/test/generate/file/ResourceFilesTests.java index 901a9824c6..244a6358c9 100644 --- a/spring-core-test/src/test/java/org/springframework/aot/test/generator/file/ResourceFilesTests.java +++ b/spring-core-test/src/test/java/org/springframework/aot/test/generate/file/ResourceFilesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import java.util.Iterator; diff --git a/spring-core-test/src/test/java/org/springframework/aot/test/generator/file/SourceFileAssertTests.java b/spring-core-test/src/test/java/org/springframework/aot/test/generate/file/SourceFileAssertTests.java similarity index 97% rename from spring-core-test/src/test/java/org/springframework/aot/test/generator/file/SourceFileAssertTests.java rename to spring-core-test/src/test/java/org/springframework/aot/test/generate/file/SourceFileAssertTests.java index 12e4834683..1096c83343 100644 --- a/spring-core-test/src/test/java/org/springframework/aot/test/generator/file/SourceFileAssertTests.java +++ b/spring-core-test/src/test/java/org/springframework/aot/test/generate/file/SourceFileAssertTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import org.junit.jupiter.api.Test; diff --git a/spring-core-test/src/test/java/org/springframework/aot/test/generator/file/SourceFileTests.java b/spring-core-test/src/test/java/org/springframework/aot/test/generate/file/SourceFileTests.java similarity index 98% rename from spring-core-test/src/test/java/org/springframework/aot/test/generator/file/SourceFileTests.java rename to spring-core-test/src/test/java/org/springframework/aot/test/generate/file/SourceFileTests.java index 5dc95c8541..6976322ed7 100644 --- a/spring-core-test/src/test/java/org/springframework/aot/test/generator/file/SourceFileTests.java +++ b/spring-core-test/src/test/java/org/springframework/aot/test/generate/file/SourceFileTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import java.io.IOException; diff --git a/spring-core-test/src/test/java/org/springframework/aot/test/generator/file/SourceFilesTests.java b/spring-core-test/src/test/java/org/springframework/aot/test/generate/file/SourceFilesTests.java similarity index 98% rename from spring-core-test/src/test/java/org/springframework/aot/test/generator/file/SourceFilesTests.java rename to spring-core-test/src/test/java/org/springframework/aot/test/generate/file/SourceFilesTests.java index abe69ac2cd..994538a21e 100644 --- a/spring-core-test/src/test/java/org/springframework/aot/test/generator/file/SourceFilesTests.java +++ b/spring-core-test/src/test/java/org/springframework/aot/test/generate/file/SourceFilesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.test.generator.file; +package org.springframework.aot.test.generate.file; import java.util.Iterator; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessorTests.java index 563407995f..ebe40c3668 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessorTests.java @@ -23,8 +23,8 @@ import javax.sql.DataSource; import org.junit.jupiter.api.Test; import org.springframework.aot.test.generate.TestGenerationContext; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/InjectionCodeGeneratorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/InjectionCodeGeneratorTests.java index 499087c9f9..90fe9bdeb3 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/InjectionCodeGeneratorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/InjectionCodeGeneratorTests.java @@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.beans.testfixture.beans.TestBean; import org.springframework.beans.testfixture.beans.TestBeanWithPrivateMethod; import org.springframework.beans.testfixture.beans.TestBeanWithPublicField; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessorAotContributionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessorAotContributionTests.java index 12d180de65..7ce1e532c6 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessorAotContributionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessorAotContributionTests.java @@ -35,9 +35,9 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.hint.FieldMode; import org.springframework.aot.hint.TypeReference; import org.springframework.aot.test.generate.TestGenerationContext; -import org.springframework.aot.test.generator.compile.CompileWithTargetClassAccess; -import org.springframework.aot.test.generator.compile.Compiled; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.CompileWithTargetClassAccess; +import org.springframework.aot.test.generate.compile.Compiled; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.beans.factory.aot.BeanRegistrationAotContribution; import org.springframework.beans.factory.aot.BeanRegistrationCode; import org.springframework.beans.factory.support.DefaultListableBeanFactory; diff --git a/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java index 914350c0c7..5e9361a819 100644 --- a/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java @@ -36,8 +36,8 @@ import org.opentest4j.MultipleFailuresError; import org.springframework.aot.AotDetector; import org.springframework.aot.generate.GeneratedFiles.Kind; import org.springframework.aot.generate.InMemoryGeneratedFiles; -import org.springframework.aot.test.generator.compile.CompileWithTargetClassAccess; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.CompileWithTargetClassAccess; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.test.context.aot.samples.basic.BasicSpringJupiterSharedConfigTests; import org.springframework.test.context.aot.samples.basic.BasicSpringJupiterTests; diff --git a/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorTests.java b/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorTests.java index 8124709a86..07a8dc02ef 100644 --- a/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorTests.java @@ -32,8 +32,8 @@ import org.springframework.aot.generate.InMemoryGeneratedFiles; import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.TypeReference; -import org.springframework.aot.test.generator.compile.CompileWithTargetClassAccess; -import org.springframework.aot.test.generator.compile.TestCompiler; +import org.springframework.aot.test.generate.compile.CompileWithTargetClassAccess; +import org.springframework.aot.test.generate.compile.TestCompiler; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext;