Move TestCompiler from generator to generate

This commit harmonizes the package space by moving the TestCompiler
infrastructure from the now outdated "generator" package to "generate".

Closes gh-29082

Author: snicoll

spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java

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

spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java

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

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java

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

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java

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

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGeneratorTests.java

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

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java

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

spring-beans/src/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java

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

spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorAotContributionTests.java

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

spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java

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

spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java

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

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;
 

spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompilationException.java renamed to 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.

spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccess.java renamed to 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;

spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessClassLoader.java renamed to 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;

spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/CompileWithTargetClassAccessExtension.java renamed to 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;
 

spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/Compiled.java renamed to 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;
 

spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicClassFileObject.java renamed to 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;

spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicClassLoader.java renamed to 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.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;
 

spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicJavaFileManager.java renamed to 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;

spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/DynamicJavaFileObject.java renamed to 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}.

spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/TestCompiler.java renamed to 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 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;
 
 /**

spring-core-test/src/main/java/org/springframework/aot/test/generator/compile/package-info.java renamed to 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;

spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFile.java renamed to 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;

spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFileAssert.java renamed to 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;
 

spring-core-test/src/main/java/org/springframework/aot/test/generator/file/DynamicFiles.java renamed to 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;

spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFile.java renamed to 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;

spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFileAssert.java renamed to 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.

spring-core-test/src/main/java/org/springframework/aot/test/generator/file/ResourceFiles.java renamed to 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;

spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFile.java renamed to 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;

spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFileAssert.java renamed to 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.

spring-core-test/src/main/java/org/springframework/aot/test/generator/file/SourceFiles.java renamed to 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;

spring-core-test/src/main/java/org/springframework/aot/test/generator/file/WritableContent.java renamed to 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;
 

spring-core-test/src/main/java/org/springframework/aot/test/generator/file/package-info.java renamed to 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;

spring-core-test/src/test/java/org/springframework/aot/test/generator/compile/CompilationExceptionTests.java renamed to 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;