Skip to content

Commit 52bffbf

Browse files
committed
Move TestCompiler and related classes to core.test.tools package
Closes gh-29175
1 parent c900945 commit 52bffbf

File tree

54 files changed

+76
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+76
-132
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import org.springframework.aot.generate.MethodReference;
2929
import org.springframework.aot.generate.MethodReference.ArgumentCodeGenerator;
3030
import org.springframework.aot.test.generate.TestGenerationContext;
31-
import org.springframework.aot.test.generate.compile.Compiled;
32-
import org.springframework.aot.test.generate.compile.TestCompiler;
3331
import org.springframework.beans.factory.BeanCreationException;
3432
import org.springframework.beans.factory.aot.AotServices;
3533
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
@@ -43,6 +41,8 @@
4341
import org.springframework.beans.testfixture.beans.factory.aot.MockBeanFactoryInitializationCode;
4442
import org.springframework.beans.testfixture.beans.factory.generator.factory.NumberHolder;
4543
import org.springframework.core.ResolvableType;
44+
import org.springframework.core.test.tools.Compiled;
45+
import org.springframework.core.test.tools.TestCompiler;
4646
import org.springframework.javapoet.CodeBlock;
4747
import org.springframework.javapoet.MethodSpec;
4848
import org.springframework.javapoet.ParameterizedTypeName;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
import org.springframework.aot.generate.MethodReference.ArgumentCodeGenerator;
2828
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
2929
import org.springframework.aot.test.generate.TestGenerationContext;
30-
import org.springframework.aot.test.generate.compile.CompileWithForkedClassLoader;
31-
import org.springframework.aot.test.generate.compile.Compiled;
32-
import org.springframework.aot.test.generate.compile.TestCompiler;
3330
import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
3431
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
3532
import org.springframework.beans.factory.support.RegisteredBean;
3633
import org.springframework.beans.factory.support.RootBeanDefinition;
3734
import org.springframework.beans.testfixture.beans.factory.aot.MockBeanRegistrationCode;
3835
import org.springframework.core.env.Environment;
3936
import org.springframework.core.env.StandardEnvironment;
37+
import org.springframework.core.test.tools.CompileWithForkedClassLoader;
38+
import org.springframework.core.test.tools.Compiled;
39+
import org.springframework.core.test.tools.TestCompiler;
4040
import org.springframework.javapoet.CodeBlock;
4141
import org.springframework.javapoet.MethodSpec;
4242
import org.springframework.javapoet.ParameterizedTypeName;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
import org.springframework.aot.generate.MethodReference;
3333
import org.springframework.aot.generate.MethodReference.ArgumentCodeGenerator;
3434
import org.springframework.aot.test.generate.TestGenerationContext;
35-
import org.springframework.aot.test.generate.compile.CompileWithForkedClassLoader;
36-
import org.springframework.aot.test.generate.compile.Compiled;
37-
import org.springframework.aot.test.generate.compile.TestCompiler;
38-
import org.springframework.aot.test.generate.file.SourceFile;
3935
import org.springframework.beans.factory.config.BeanDefinition;
4036
import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
4137
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -49,6 +45,10 @@
4945
import org.springframework.beans.testfixture.beans.factory.aot.MockBeanRegistrationsCode;
5046
import org.springframework.core.ResolvableType;
5147
import org.springframework.core.mock.MockSpringFactoriesLoader;
48+
import org.springframework.core.test.tools.CompileWithForkedClassLoader;
49+
import org.springframework.core.test.tools.Compiled;
50+
import org.springframework.core.test.tools.SourceFile;
51+
import org.springframework.core.test.tools.TestCompiler;
5252
import org.springframework.javapoet.CodeBlock;
5353
import org.springframework.javapoet.MethodSpec;
5454
import org.springframework.javapoet.ParameterizedTypeName;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
import org.springframework.aot.generate.GeneratedClass;
3131
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
3232
import org.springframework.aot.test.generate.TestGenerationContext;
33-
import org.springframework.aot.test.generate.compile.Compiled;
34-
import org.springframework.aot.test.generate.compile.TestCompiler;
3533
import org.springframework.beans.factory.FactoryBean;
3634
import org.springframework.beans.factory.config.BeanDefinition;
3735
import org.springframework.beans.factory.config.BeanReference;
@@ -44,6 +42,8 @@
4442
import org.springframework.beans.factory.support.ManagedSet;
4543
import org.springframework.beans.factory.support.RootBeanDefinition;
4644
import org.springframework.beans.testfixture.beans.factory.aot.DeferredTypeBuilder;
45+
import org.springframework.core.test.tools.Compiled;
46+
import org.springframework.core.test.tools.TestCompiler;
4747
import org.springframework.javapoet.CodeBlock;
4848
import org.springframework.javapoet.MethodSpec;
4949
import org.springframework.javapoet.ParameterizedTypeName;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535

3636
import org.springframework.aot.generate.GeneratedClass;
3737
import org.springframework.aot.test.generate.TestGenerationContext;
38-
import org.springframework.aot.test.generate.compile.Compiled;
39-
import org.springframework.aot.test.generate.compile.TestCompiler;
4038
import org.springframework.beans.factory.config.BeanReference;
4139
import org.springframework.beans.factory.config.RuntimeBeanNameReference;
4240
import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -45,6 +43,8 @@
4543
import org.springframework.beans.factory.support.ManagedSet;
4644
import org.springframework.beans.testfixture.beans.factory.aot.DeferredTypeBuilder;
4745
import org.springframework.core.ResolvableType;
46+
import org.springframework.core.test.tools.Compiled;
47+
import org.springframework.core.test.tools.TestCompiler;
4848
import org.springframework.javapoet.CodeBlock;
4949
import org.springframework.javapoet.MethodSpec;
5050
import org.springframework.javapoet.ParameterizedTypeName;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
import org.springframework.aot.generate.MethodReference.ArgumentCodeGenerator;
3535
import org.springframework.aot.test.generate.TestGenerationContext;
3636
import org.springframework.aot.test.generate.TestTarget;
37-
import org.springframework.aot.test.generate.compile.Compiled;
38-
import org.springframework.aot.test.generate.compile.TestCompiler;
39-
import org.springframework.aot.test.generate.file.SourceFile;
4037
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
4138
import org.springframework.beans.factory.support.RegisteredBean;
4239
import org.springframework.beans.factory.support.RootBeanDefinition;
4340
import org.springframework.beans.testfixture.beans.TestBean;
4441
import org.springframework.beans.testfixture.beans.factory.aot.MockBeanFactoryInitializationCode;
4542
import org.springframework.core.mock.MockSpringFactoriesLoader;
43+
import org.springframework.core.test.tools.Compiled;
44+
import org.springframework.core.test.tools.SourceFile;
45+
import org.springframework.core.test.tools.TestCompiler;
4646
import org.springframework.javapoet.CodeBlock;
4747
import org.springframework.javapoet.MethodSpec;
4848
import org.springframework.javapoet.ParameterizedTypeName;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
import org.springframework.aot.hint.ReflectionHints;
3232
import org.springframework.aot.hint.TypeHint;
3333
import org.springframework.aot.test.generate.TestGenerationContext;
34-
import org.springframework.aot.test.generate.compile.Compiled;
35-
import org.springframework.aot.test.generate.compile.TestCompiler;
3634
import org.springframework.beans.factory.config.BeanDefinition;
3735
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
3836
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -51,6 +49,8 @@
5149
import org.springframework.beans.testfixture.beans.factory.generator.factory.SampleFactory;
5250
import org.springframework.beans.testfixture.beans.factory.generator.injection.InjectionComponent;
5351
import org.springframework.core.env.StandardEnvironment;
52+
import org.springframework.core.test.tools.Compiled;
53+
import org.springframework.core.test.tools.TestCompiler;
5454
import org.springframework.javapoet.CodeBlock;
5555
import org.springframework.javapoet.MethodSpec;
5656
import org.springframework.javapoet.ParameterizedTypeName;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
import org.springframework.aot.generate.MethodReference.ArgumentCodeGenerator;
3232
import org.springframework.aot.hint.ResourcePatternHint;
3333
import org.springframework.aot.test.generate.TestGenerationContext;
34-
import org.springframework.aot.test.generate.compile.Compiled;
35-
import org.springframework.aot.test.generate.compile.TestCompiler;
3634
import org.springframework.beans.BeansException;
3735
import org.springframework.beans.factory.InitializingBean;
3836
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
@@ -49,6 +47,8 @@
4947
import org.springframework.core.Ordered;
5048
import org.springframework.core.env.ConfigurableEnvironment;
5149
import org.springframework.core.io.ResourceLoader;
50+
import org.springframework.core.test.tools.Compiled;
51+
import org.springframework.core.test.tools.TestCompiler;
5252
import org.springframework.core.type.AnnotationMetadata;
5353
import org.springframework.javapoet.CodeBlock;
5454
import org.springframework.javapoet.MethodSpec;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
import org.springframework.aot.hint.TypeReference;
3333
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
3434
import org.springframework.aot.test.generate.TestGenerationContext;
35-
import org.springframework.aot.test.generate.compile.Compiled;
36-
import org.springframework.aot.test.generate.compile.TestCompiler;
3735
import org.springframework.beans.BeansException;
3836
import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor;
3937
import org.springframework.beans.factory.aot.BeanFactoryInitializationAotContribution;
@@ -66,6 +64,8 @@
6664
import org.springframework.core.env.Environment;
6765
import org.springframework.core.env.PropertySource;
6866
import org.springframework.core.io.ResourceLoader;
67+
import org.springframework.core.test.tools.Compiled;
68+
import org.springframework.core.test.tools.TestCompiler;
6969

7070
import static org.assertj.core.api.Assertions.assertThat;
7171

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.aot.test.agent.RuntimeHintsInvocations;
2626
import org.springframework.aot.test.agent.RuntimeHintsRecorder;
2727
import org.springframework.aot.test.generate.TestGenerationContext;
28-
import org.springframework.aot.test.generate.compile.TestCompiler;
2928
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
3029
import org.springframework.beans.factory.support.RootBeanDefinition;
3130
import org.springframework.context.ApplicationContextInitializer;
@@ -35,6 +34,7 @@
3534
import org.springframework.context.testfixture.context.generator.SimpleComponent;
3635
import org.springframework.context.testfixture.context.generator.annotation.AutowiredComponent;
3736
import org.springframework.context.testfixture.context.generator.annotation.InitDestroyComponent;
37+
import org.springframework.core.test.tools.TestCompiler;
3838

3939
import static org.assertj.core.api.Assertions.assertThat;
4040

spring-core-test/src/main/java/org/springframework/aot/test/generate/file/package-info.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ClassFile.java renamed to spring-core-test/src/main/java/org/springframework/core/test/tools/ClassFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.file;
17+
package org.springframework.core.test.tools;
1818

1919
import java.io.IOException;
2020

spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ClassFiles.java renamed to spring-core-test/src/main/java/org/springframework/core/test/tools/ClassFiles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.file;
17+
package org.springframework.core.test.tools;
1818

1919
import java.util.Arrays;
2020
import java.util.Collections;
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.compile;
18-
19-
import org.springframework.aot.test.generate.file.ResourceFile;
20-
import org.springframework.aot.test.generate.file.ResourceFiles;
21-
import org.springframework.aot.test.generate.file.SourceFile;
22-
import org.springframework.aot.test.generate.file.SourceFiles;
17+
package org.springframework.core.test.tools;
2318

2419
/**
2520
* Exception thrown when code cannot compile.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.compile;
17+
package org.springframework.core.test.tools;
1818

1919
import java.lang.annotation.Documented;
2020
import java.lang.annotation.ElementType;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.compile;
17+
package org.springframework.core.test.tools;
1818

1919
import java.io.IOException;
2020
import java.io.InputStream;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.compile;
17+
package org.springframework.core.test.tools;
1818

1919
import java.lang.reflect.Method;
2020

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.compile;
17+
package org.springframework.core.test.tools;
1818

1919
import java.lang.reflect.Constructor;
2020
import java.util.ArrayList;
2121
import java.util.Collections;
2222
import java.util.List;
2323

24-
import org.springframework.aot.test.generate.file.ResourceFile;
25-
import org.springframework.aot.test.generate.file.ResourceFiles;
26-
import org.springframework.aot.test.generate.file.SourceFile;
27-
import org.springframework.aot.test.generate.file.SourceFiles;
2824
import org.springframework.lang.Nullable;
2925
import org.springframework.util.Assert;
3026

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.compile;
17+
package org.springframework.core.test.tools;
1818

1919
import java.io.ByteArrayInputStream;
2020
import java.io.ByteArrayOutputStream;
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.compile;
17+
package org.springframework.core.test.tools;
1818

1919
import java.io.ByteArrayInputStream;
2020
import java.io.IOException;
@@ -29,10 +29,6 @@
2929
import java.util.function.Function;
3030
import java.util.function.Supplier;
3131

32-
import org.springframework.aot.test.generate.file.ClassFile;
33-
import org.springframework.aot.test.generate.file.ClassFiles;
34-
import org.springframework.aot.test.generate.file.ResourceFile;
35-
import org.springframework.aot.test.generate.file.ResourceFiles;
3632
import org.springframework.lang.Nullable;
3733
import org.springframework.util.ReflectionUtils;
3834

spring-core-test/src/main/java/org/springframework/aot/test/generate/file/DynamicFile.java renamed to spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.file;
17+
package org.springframework.core.test.tools;
1818

1919
import java.io.IOException;
2020
import java.nio.charset.StandardCharsets;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.file;
17+
package org.springframework.core.test.tools;
1818

1919
import org.assertj.core.api.AbstractAssert;
2020

spring-core-test/src/main/java/org/springframework/aot/test/generate/file/DynamicFiles.java renamed to spring-core-test/src/main/java/org/springframework/core/test/tools/DynamicFiles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.file;
17+
package org.springframework.core.test.tools;
1818

1919
import java.util.Arrays;
2020
import java.util.Collections;
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.compile;
17+
package org.springframework.core.test.tools;
1818

1919
import java.io.IOException;
2020
import java.util.ArrayList;
@@ -30,10 +30,6 @@
3030
import javax.tools.JavaFileObject;
3131
import javax.tools.JavaFileObject.Kind;
3232

33-
import org.springframework.aot.test.generate.file.ClassFile;
34-
import org.springframework.aot.test.generate.file.ClassFiles;
35-
import org.springframework.aot.test.generate.file.ResourceFile;
36-
import org.springframework.aot.test.generate.file.ResourceFiles;
3733
import org.springframework.util.ClassUtils;
3834

3935
/**
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.compile;
17+
package org.springframework.core.test.tools;
1818

1919
import java.net.URI;
2020

2121
import javax.tools.JavaFileObject;
2222
import javax.tools.SimpleJavaFileObject;
2323

24-
import org.springframework.aot.test.generate.file.SourceFile;
25-
2624
/**
2725
* Adapts a {@link SourceFile} instance to a {@link JavaFileObject}.
2826
*
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.compile;
17+
package org.springframework.core.test.tools;
1818

1919
import java.io.ByteArrayInputStream;
2020
import java.io.ByteArrayOutputStream;

spring-core-test/src/main/java/org/springframework/aot/test/generate/file/ResourceFile.java renamed to spring-core-test/src/main/java/org/springframework/core/test/tools/ResourceFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.file;
17+
package org.springframework.core.test.tools;
1818

1919
import java.io.InputStreamReader;
2020
import java.nio.charset.StandardCharsets;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.aot.test.generate.file;
17+
package org.springframework.core.test.tools;
1818

1919
/**
2020
* Assertion methods for {@code ResourceFile} instances.

0 commit comments

Comments
 (0)