Move TestCompiler and related classes to core.test.tools package

Closes gh-29175
spring-projects · Sep 20, 2022 · 52bffbf · 52bffbf
1 parent c900945
commit 52bffbf
Show file tree

Hide file tree

Showing 54 changed files with 76 additions and 132 deletions.
diff --git a/...test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java b/...test/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationAotProcessorTests.java
@@ -28,8 +28,6 @@
 import org.springframework.aot.generate.MethodReference;
 import org.springframework.aot.generate.MethodReference.ArgumentCodeGenerator;
 import org.springframework.aot.test.generate.TestGenerationContext;
-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;
@@ -43,6 +41,8 @@
 import org.springframework.beans.testfixture.beans.factory.aot.MockBeanFactoryInitializationCode;
 import org.springframework.beans.testfixture.beans.factory.generator.factory.NumberHolder;
 import org.springframework.core.ResolvableType;
+import org.springframework.core.test.tools.Compiled;
+import org.springframework.core.test.tools.TestCompiler;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.MethodSpec;
 import org.springframework.javapoet.ParameterizedTypeName;

diff --git a/...ork/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java b/...ork/beans/factory/annotation/AutowiredAnnotationBeanRegistrationAotContributionTests.java
@@ -27,16 +27,16 @@
 import org.springframework.aot.generate.MethodReference.ArgumentCodeGenerator;
 import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
 import org.springframework.aot.test.generate.TestGenerationContext;
-import org.springframework.aot.test.generate.compile.CompileWithForkedClassLoader;
-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;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.testfixture.beans.factory.aot.MockBeanRegistrationCode;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.StandardEnvironment;
+import org.springframework.core.test.tools.CompileWithForkedClassLoader;
+import org.springframework.core.test.tools.Compiled;
+import org.springframework.core.test.tools.TestCompiler;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.MethodSpec;
 import org.springframework.javapoet.ParameterizedTypeName;

diff --git a/...c/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java b/...c/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java
@@ -32,10 +32,6 @@
 import org.springframework.aot.generate.MethodReference;
 import org.springframework.aot.generate.MethodReference.ArgumentCodeGenerator;
 import org.springframework.aot.test.generate.TestGenerationContext;
-import org.springframework.aot.test.generate.compile.CompileWithForkedClassLoader;
-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;
@@ -49,6 +45,10 @@
 import org.springframework.beans.testfixture.beans.factory.aot.MockBeanRegistrationsCode;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.mock.MockSpringFactoriesLoader;
+import org.springframework.core.test.tools.CompileWithForkedClassLoader;
+import org.springframework.core.test.tools.Compiled;
+import org.springframework.core.test.tools.SourceFile;
+import org.springframework.core.test.tools.TestCompiler;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.MethodSpec;
 import org.springframework.javapoet.ParameterizedTypeName;

diff --git a/...ava/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java b/...ava/org/springframework/beans/factory/aot/BeanDefinitionPropertiesCodeGeneratorTests.java
@@ -30,8 +30,6 @@
 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.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;
@@ -44,6 +42,8 @@
 import org.springframework.beans.factory.support.ManagedSet;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.testfixture.beans.factory.aot.DeferredTypeBuilder;
+import org.springframework.core.test.tools.Compiled;
+import org.springframework.core.test.tools.TestCompiler;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.MethodSpec;
 import org.springframework.javapoet.ParameterizedTypeName;

diff --git a/.../org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGeneratorTests.java b/.../org/springframework/beans/factory/aot/BeanDefinitionPropertyValueCodeGeneratorTests.java
@@ -35,8 +35,6 @@
 
 import org.springframework.aot.generate.GeneratedClass;
 import org.springframework.aot.test.generate.TestGenerationContext;
-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;
@@ -45,6 +43,8 @@
 import org.springframework.beans.factory.support.ManagedSet;
 import org.springframework.beans.testfixture.beans.factory.aot.DeferredTypeBuilder;
 import org.springframework.core.ResolvableType;
+import org.springframework.core.test.tools.Compiled;
+import org.springframework.core.test.tools.TestCompiler;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.MethodSpec;
 import org.springframework.javapoet.ParameterizedTypeName;

diff --git a/...est/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java b/...est/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java
@@ -34,15 +34,15 @@
 import org.springframework.aot.generate.MethodReference.ArgumentCodeGenerator;
 import org.springframework.aot.test.generate.TestGenerationContext;
 import org.springframework.aot.test.generate.TestTarget;
-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;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.beans.testfixture.beans.factory.aot.MockBeanFactoryInitializationCode;
 import org.springframework.core.mock.MockSpringFactoriesLoader;
+import org.springframework.core.test.tools.Compiled;
+import org.springframework.core.test.tools.SourceFile;
+import org.springframework.core.test.tools.TestCompiler;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.MethodSpec;
 import org.springframework.javapoet.ParameterizedTypeName;

diff --git a/...c/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java b/...c/test/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGeneratorTests.java
@@ -31,8 +31,6 @@
 import org.springframework.aot.hint.ReflectionHints;
 import org.springframework.aot.hint.TypeHint;
 import org.springframework.aot.test.generate.TestGenerationContext;
-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;
@@ -51,6 +49,8 @@
 import org.springframework.beans.testfixture.beans.factory.generator.factory.SampleFactory;
 import org.springframework.beans.testfixture.beans.factory.generator.injection.InjectionComponent;
 import org.springframework.core.env.StandardEnvironment;
+import org.springframework.core.test.tools.Compiled;
+import org.springframework.core.test.tools.TestCompiler;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.MethodSpec;
 import org.springframework.javapoet.ParameterizedTypeName;

diff --git a/...ringframework/context/annotation/ConfigurationClassPostProcessorAotContributionTests.java b/...ringframework/context/annotation/ConfigurationClassPostProcessorAotContributionTests.java
@@ -31,8 +31,6 @@
 import org.springframework.aot.generate.MethodReference.ArgumentCodeGenerator;
 import org.springframework.aot.hint.ResourcePatternHint;
 import org.springframework.aot.test.generate.TestGenerationContext;
-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;
@@ -49,6 +47,8 @@
 import org.springframework.core.Ordered;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.test.tools.Compiled;
+import org.springframework.core.test.tools.TestCompiler;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.javapoet.CodeBlock;
 import org.springframework.javapoet.MethodSpec;

diff --git a/...xt/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java b/...xt/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java
@@ -32,8 +32,6 @@
 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.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;
@@ -66,6 +64,8 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.test.tools.Compiled;
+import org.springframework.core.test.tools.TestCompiler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...rg/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java b/...rg/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java
@@ -25,7 +25,6 @@
 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.generate.compile.TestCompiler;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.ApplicationContextInitializer;
@@ -35,6 +34,7 @@
 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-core-test/src/main/java/org/springframework/aot/test/generate/file/package-info.java b/spring-core-test/src/main/java/org/springframework/aot/test/generate/file/package-info.java
diff --git a/...ork/aot/test/generate/file/ClassFile.java → ...gframework/core/test/tools/ClassFile.java b/...ork/aot/test/generate/file/ClassFile.java → ...gframework/core/test/tools/ClassFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.io.IOException;
 

diff --git a/...rk/aot/test/generate/file/ClassFiles.java → ...framework/core/test/tools/ClassFiles.java b/...rk/aot/test/generate/file/ClassFiles.java → ...framework/core/test/tools/ClassFiles.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/...enerate/compile/CompilationException.java → ...core/test/tools/CompilationException.java b/...enerate/compile/CompilationException.java → ...core/test/tools/CompilationException.java
@@ -14,12 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
-
-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;
+package org.springframework.core.test.tools;
 
 /**
  * Exception thrown when code cannot compile.

diff --git a/...compile/CompileWithForkedClassLoader.java → ...t/tools/CompileWithForkedClassLoader.java b/...compile/CompileWithForkedClassLoader.java → ...t/tools/CompileWithForkedClassLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

diff --git a/...pileWithForkedClassLoaderClassLoader.java → ...pileWithForkedClassLoaderClassLoader.java b/...pileWithForkedClassLoaderClassLoader.java → ...pileWithForkedClassLoaderClassLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/...ompileWithForkedClassLoaderExtension.java → ...ompileWithForkedClassLoaderExtension.java b/...ompileWithForkedClassLoaderExtension.java → ...ompileWithForkedClassLoaderExtension.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.lang.reflect.Method;
 

diff --git a/...k/aot/test/generate/compile/Compiled.java → ...ngframework/core/test/tools/Compiled.java b/...k/aot/test/generate/compile/Compiled.java → ...ngframework/core/test/tools/Compiled.java
@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-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/...erate/compile/DynamicClassFileObject.java → ...re/test/tools/DynamicClassFileObject.java b/...erate/compile/DynamicClassFileObject.java → ...re/test/tools/DynamicClassFileObject.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/.../generate/compile/DynamicClassLoader.java → ...k/core/test/tools/DynamicClassLoader.java b/.../generate/compile/DynamicClassLoader.java → ...k/core/test/tools/DynamicClassLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -29,10 +29,6 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import org.springframework.aot.test.generate.file.ClassFile;
-import org.springframework.aot.test.generate.file.ClassFiles;
-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/...k/aot/test/generate/file/DynamicFile.java → ...ramework/core/test/tools/DynamicFile.java b/...k/aot/test/generate/file/DynamicFile.java → ...ramework/core/test/tools/DynamicFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

diff --git a/...test/generate/file/DynamicFileAssert.java → ...rk/core/test/tools/DynamicFileAssert.java b/...test/generate/file/DynamicFileAssert.java → ...rk/core/test/tools/DynamicFileAssert.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import org.assertj.core.api.AbstractAssert;
 

diff --git a/.../aot/test/generate/file/DynamicFiles.java → ...amework/core/test/tools/DynamicFiles.java b/.../aot/test/generate/file/DynamicFiles.java → ...amework/core/test/tools/DynamicFiles.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/...erate/compile/DynamicJavaFileManager.java → ...re/test/tools/DynamicJavaFileManager.java b/...erate/compile/DynamicJavaFileManager.java → ...re/test/tools/DynamicJavaFileManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,10 +30,6 @@
 import javax.tools.JavaFileObject;
 import javax.tools.JavaFileObject.Kind;
 
-import org.springframework.aot.test.generate.file.ClassFile;
-import org.springframework.aot.test.generate.file.ClassFiles;
-import org.springframework.aot.test.generate.file.ResourceFile;
-import org.springframework.aot.test.generate.file.ResourceFiles;
 import org.springframework.util.ClassUtils;
 
 /**

diff --git a/...nerate/compile/DynamicJavaFileObject.java → ...ore/test/tools/DynamicJavaFileObject.java b/...nerate/compile/DynamicJavaFileObject.java → ...ore/test/tools/DynamicJavaFileObject.java
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.net.URI;
 
 import javax.tools.JavaFileObject;
 import javax.tools.SimpleJavaFileObject;
 
-import org.springframework.aot.test.generate.file.SourceFile;
-
 /**
  * Adapts a {@link SourceFile} instance to a {@link JavaFileObject}.
  *

diff --git a/...te/compile/DynamicResourceFileObject.java → ...test/tools/DynamicResourceFileObject.java b/...te/compile/DynamicResourceFileObject.java → ...test/tools/DynamicResourceFileObject.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.compile;
+package org.springframework.core.test.tools;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/.../aot/test/generate/file/ResourceFile.java → ...amework/core/test/tools/ResourceFile.java b/.../aot/test/generate/file/ResourceFile.java → ...amework/core/test/tools/ResourceFile.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;

diff --git a/...est/generate/file/ResourceFileAssert.java → ...k/core/test/tools/ResourceFileAssert.java b/...est/generate/file/ResourceFileAssert.java → ...k/core/test/tools/ResourceFileAssert.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.aot.test.generate.file;
+package org.springframework.core.test.tools;
 
 /**
  * Assertion methods for {@code ResourceFile} instances.