diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java index ed316aa616..bf0f56d78b 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyAutoConfigurationTransformation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.cli.compiler.transformation; +package org.springframework.boot.cli.compiler; import groovy.lang.GroovyClassLoader; @@ -23,9 +23,7 @@ import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.ModuleNode; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.transform.ASTTransformation; -import org.springframework.boot.cli.compiler.ArtifactCoordinatesResolver; -import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; -import org.springframework.boot.cli.compiler.DependencyCustomizer; +import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver; /** * {@link ASTTransformation} to apply diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java index eaef51e44c..c2f4b06e90 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java @@ -23,6 +23,7 @@ import org.codehaus.groovy.ast.AnnotationNode; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.ModuleNode; import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver; /** * Customizer that allows dependencies to be added during compilation. Adding a dependency diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java index 82a0220047..a534244cda 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.cli.compiler.transformation; +package org.springframework.boot.cli.compiler; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java index 368f2fb9c3..1016c62f74 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java @@ -42,12 +42,11 @@ import org.codehaus.groovy.control.customizers.CompilationCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.codehaus.groovy.transform.ASTTransformation; import org.codehaus.groovy.transform.ASTTransformationVisitor; +import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver; +import org.springframework.boot.cli.compiler.dependencies.ManagedDependenciesArtifactCoordinatesResolver; import org.springframework.boot.cli.compiler.grape.AetherGrapeEngine; import org.springframework.boot.cli.compiler.grape.AetherGrapeEngineFactory; import org.springframework.boot.cli.compiler.grape.GrapeEngineInstaller; -import org.springframework.boot.cli.compiler.transformation.DependencyAutoConfigurationTransformation; -import org.springframework.boot.cli.compiler.transformation.GroovyBeansTransformation; -import org.springframework.boot.cli.compiler.transformation.ResolveDependencyCoordinatesTransformation; import org.springframework.boot.cli.util.ResourceUtils; /** diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java index 908a869fc1..7b787009f5 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.cli.compiler.transformation; +package org.springframework.boot.cli.compiler; import groovy.lang.Grab; @@ -35,10 +35,11 @@ import org.codehaus.groovy.ast.expr.ConstantExpression; import org.codehaus.groovy.ast.expr.Expression; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.transform.ASTTransformation; -import org.springframework.boot.cli.compiler.ArtifactCoordinatesResolver; +import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver; /** * {@link ASTTransformation} to resolve {@link Grab} artifact coordinates. + * * @author Andy Wilkinson * @author Phillip Webb */ diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ArtifactCoordinatesResolver.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java similarity index 95% rename from spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ArtifactCoordinatesResolver.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java index cc32a6dfb7..aae720725f 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ArtifactCoordinatesResolver.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ArtifactCoordinatesResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.cli.compiler; +package org.springframework.boot.cli.compiler.dependencies; /** * A resolver for artifacts' Maven coordinates, allowing a group id or version to be diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ManagedDependenciesArtifactCoordinatesResolver.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ManagedDependenciesArtifactCoordinatesResolver.java similarity index 96% rename from spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ManagedDependenciesArtifactCoordinatesResolver.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ManagedDependenciesArtifactCoordinatesResolver.java index b60cce6f4b..5903a4f40f 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ManagedDependenciesArtifactCoordinatesResolver.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/ManagedDependenciesArtifactCoordinatesResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.cli.compiler; +package org.springframework.boot.cli.compiler.dependencies; import org.springframework.boot.dependency.tools.Dependency; import org.springframework.boot.dependency.tools.ManagedDependencies; diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java index 1ecf7575a6..4ed9b2ca7c 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.cli.compiler.transformation; +package org.springframework.boot.cli.compiler; import groovy.lang.Grab; @@ -42,7 +42,8 @@ import org.codehaus.groovy.control.io.ReaderSource; import org.codehaus.groovy.transform.ASTTransformation; import org.junit.Before; import org.junit.Test; -import org.springframework.boot.cli.compiler.ArtifactCoordinatesResolver; +import org.springframework.boot.cli.compiler.ResolveDependencyCoordinatesTransformation; +import org.springframework.boot.cli.compiler.dependencies.ArtifactCoordinatesResolver; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ManagedDependenciesArtifactCoordinatesResolverTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/dependencies/ManagedDependenciesArtifactCoordinatesResolverTests.java similarity index 94% rename from spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ManagedDependenciesArtifactCoordinatesResolverTests.java rename to spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/dependencies/ManagedDependenciesArtifactCoordinatesResolverTests.java index 88b14ecc0b..ed9915af0d 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ManagedDependenciesArtifactCoordinatesResolverTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/dependencies/ManagedDependenciesArtifactCoordinatesResolverTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.cli.compiler; +package org.springframework.boot.cli.compiler.dependencies; import org.junit.Before; import org.junit.Test; +import org.springframework.boot.cli.compiler.dependencies.ManagedDependenciesArtifactCoordinatesResolver; import org.springframework.boot.dependency.tools.Dependency; import org.springframework.boot.dependency.tools.ManagedDependencies;