From c36ae847fb611695d87bbfe777ec540be331366e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 25 Aug 2019 03:17:25 +0200 Subject: [PATCH] Harmonize ProjectDescription name --- .../BuildProjectGenerationConfiguration.java | 14 ++--- .../DependencyManagementBuildCustomizer.java | 8 +-- .../spring/build/SimpleBuildCustomizer.java | 14 ++--- .../GradleProjectGenerationConfiguration.java | 19 +++---- .../gradle/OnGradleVersionCondition.java | 4 +- .../SpringBootPluginBuildCustomizer.java | 10 ++-- .../maven/DefaultMavenBuildCustomizer.java | 14 ++--- .../MainSourceCodeProjectContributor.java | 15 ++--- ...rceCodeProjectGenerationConfiguration.java | 10 ++-- .../TestSourceCodeProjectContributor.java | 15 ++--- .../GroovyProjectGenerationConfiguration.java | 10 ++-- ...ationDefaultContributorsConfiguration.java | 4 +- .../JavaProjectGenerationConfiguration.java | 10 ++-- ...ationDefaultContributorsConfiguration.java | 4 +- .../KotlinProjectGenerationConfiguration.java | 14 ++--- ...ationDefaultContributorsConfiguration.java | 16 +++--- ...tedDependenciesHelpDocumentCustomizer.java | 9 ++- ...endencyManagementBuildCustomizerTests.java | 6 +- .../ConditionalOnGradleVersionTests.java | 55 +++++++++---------- .../test/project/ProjectGeneratorTests.java | 12 ++-- .../condition/OnBuildSystemCondition.java | 4 +- .../condition/OnLanguageCondition.java | 6 +- .../condition/OnPackagingCondition.java | 6 +- .../condition/OnPlatformVersionCondition.java | 4 +- .../OnRequestedDependencyCondition.java | 4 +- .../condition/ProjectGenerationCondition.java | 6 +- .../project/DefaultProjectAssetGenerator.java | 6 +- .../ConditionalOnBuildSystemTests.java | 23 ++++---- .../condition/ConditionalOnLanguageTests.java | 27 +++++---- .../ConditionalOnPackagingTests.java | 21 ++++--- .../ConditionalOnPlatformVersionTests.java | 47 ++++++++-------- ...ConditionalOnRequestedDependencyTests.java | 17 +++--- .../web/project/ProjectGenerationInvoker.java | 13 ++--- .../web/project/ProjectGenerationResult.java | 8 +-- 34 files changed, 223 insertions(+), 232 deletions(-) diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java index 363267d2..1f4fec6e 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java @@ -72,9 +72,9 @@ public class BuildProjectGenerationConfiguration { } @Bean - public DefaultMavenBuildCustomizer initializrMetadataMavenBuildCustomizer(ProjectDescription projectDescription, + public DefaultMavenBuildCustomizer initializrMetadataMavenBuildCustomizer(ProjectDescription description, InitializrMetadata metadata) { - return new DefaultMavenBuildCustomizer(projectDescription, metadata); + return new DefaultMavenBuildCustomizer(description, metadata); } @Bean @@ -84,14 +84,14 @@ public class BuildProjectGenerationConfiguration { } @Bean - public DependencyManagementBuildCustomizer dependencyManagementBuildCustomizer( - ProjectDescription projectDescription, InitializrMetadata metadata) { - return new DependencyManagementBuildCustomizer(projectDescription, metadata); + public DependencyManagementBuildCustomizer dependencyManagementBuildCustomizer(ProjectDescription description, + InitializrMetadata metadata) { + return new DependencyManagementBuildCustomizer(description, metadata); } @Bean - public SimpleBuildCustomizer projectDescriptionBuildCustomizer(ProjectDescription projectDescription) { - return new SimpleBuildCustomizer(projectDescription); + public SimpleBuildCustomizer projectDescriptionBuildCustomizer(ProjectDescription description) { + return new SimpleBuildCustomizer(description); } @Bean diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizer.java index 72983d27..97e801f3 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizer.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizer.java @@ -39,12 +39,12 @@ import org.springframework.core.Ordered; */ public class DependencyManagementBuildCustomizer implements BuildCustomizer { - private final ProjectDescription projectDescription; + private final ProjectDescription description; private final InitializrMetadata metadata; - public DependencyManagementBuildCustomizer(ProjectDescription projectDescription, InitializrMetadata metadata) { - this.projectDescription = projectDescription; + public DependencyManagementBuildCustomizer(ProjectDescription description, InitializrMetadata metadata) { + this.description = description; this.metadata = metadata; } @@ -63,7 +63,7 @@ public class DependencyManagementBuildCustomizer implements BuildCustomizer repositories = new LinkedHashMap<>(); mapDependencies(build).forEach((dependency) -> { if (dependency.getBom() != null) { - resolveBom(resolvedBoms, dependency.getBom(), this.projectDescription.getPlatformVersion()); + resolveBom(resolvedBoms, dependency.getBom(), this.description.getPlatformVersion()); } if (dependency.getRepository() != null) { String repositoryId = dependency.getRepository(); diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SimpleBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SimpleBuildCustomizer.java index 2231ea85..9fcebba5 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SimpleBuildCustomizer.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SimpleBuildCustomizer.java @@ -30,18 +30,18 @@ import org.springframework.core.Ordered; */ public class SimpleBuildCustomizer implements BuildCustomizer { - private final ProjectDescription projectDescription; + private final ProjectDescription description; - public SimpleBuildCustomizer(ProjectDescription projectDescription) { - this.projectDescription = projectDescription; + public SimpleBuildCustomizer(ProjectDescription description) { + this.description = description; } @Override public void customize(Build build) { - build.setGroup(this.projectDescription.getGroupId()); - build.setArtifact(this.projectDescription.getArtifactId()); - build.setVersion(this.projectDescription.getVersion()); - this.projectDescription.getRequestedDependencies() + build.setGroup(this.description.getGroupId()); + build.setArtifact(this.description.getArtifactId()); + build.setVersion(this.description.getVersion()); + this.description.getRequestedDependencies() .forEach((id, dependency) -> build.dependencies().add(id, dependency)); } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java index b11f8f00..256a8d6b 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java @@ -78,8 +78,8 @@ public class GradleProjectGenerationConfiguration { } @Bean - public BuildCustomizer defaultGradleBuildCustomizer(ProjectDescription projectDescription) { - return (build) -> build.setSourceCompatibility(projectDescription.getLanguage().jvmVersion()); + public BuildCustomizer defaultGradleBuildCustomizer(ProjectDescription description) { + return (build) -> build.setSourceCompatibility(description.getLanguage().jvmVersion()); } @Bean @@ -101,9 +101,9 @@ public class GradleProjectGenerationConfiguration { @Bean @ConditionalOnPlatformVersion("2.0.0.M1") - BuildCustomizer springBootPluginContributor(ProjectDescription projectDescription, + BuildCustomizer springBootPluginContributor(ProjectDescription description, ObjectProvider versionResolver, InitializrMetadata metadata) { - return new SpringBootPluginBuildCustomizer(projectDescription, versionResolver + return new SpringBootPluginBuildCustomizer(description, versionResolver .getIfAvailable(() -> new InitializrDependencyManagementPluginVersionResolver(metadata))); } @@ -145,11 +145,10 @@ public class GradleProjectGenerationConfiguration { } @Bean - BuildCustomizer springBootPluginContributor(ProjectDescription projectDescription) { + BuildCustomizer springBootPluginContributor(ProjectDescription description) { return (build) -> { - build.buildscript( - (buildscript) -> buildscript.dependency("org.springframework.boot:spring-boot-gradle-plugin:" - + projectDescription.getPlatformVersion())); + build.buildscript((buildscript) -> buildscript.dependency( + "org.springframework.boot:spring-boot-gradle-plugin:" + description.getPlatformVersion())); build.plugins().apply("org.springframework.boot"); }; } @@ -206,9 +205,9 @@ public class GradleProjectGenerationConfiguration { } @Bean - BuildCustomizer springBootPluginContributor(ProjectDescription projectDescription) { + BuildCustomizer springBootPluginContributor(ProjectDescription description) { return (build) -> build.plugins().add("org.springframework.boot", - (plugin) -> plugin.setVersion(projectDescription.getPlatformVersion().toString())); + (plugin) -> plugin.setVersion(description.getPlatformVersion().toString())); } @Bean diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/OnGradleVersionCondition.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/OnGradleVersionCondition.java index b9485471..1b4efe7d 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/OnGradleVersionCondition.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/OnGradleVersionCondition.java @@ -43,9 +43,9 @@ public class OnGradleVersionCondition extends ProjectGenerationCondition { private static final VersionRange GRADLE_5_VERSION_RANGE = VersionParser.DEFAULT.parseRange("2.1.0.M1"); @Override - protected boolean matches(ProjectDescription projectDescription, ConditionContext context, + protected boolean matches(ProjectDescription description, ConditionContext context, AnnotatedTypeMetadata metadata) { - String gradleGeneration = determineGradleGeneration(projectDescription.getPlatformVersion()); + String gradleGeneration = determineGradleGeneration(description.getPlatformVersion()); if (gradleGeneration == null) { return false; } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/SpringBootPluginBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/SpringBootPluginBuildCustomizer.java index 17375f67..5545d3c6 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/SpringBootPluginBuildCustomizer.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/SpringBootPluginBuildCustomizer.java @@ -34,22 +34,22 @@ public final class SpringBootPluginBuildCustomizer implements BuildCustomizer plugin.setVersion(this.projectDescription.getPlatformVersion().toString())); + (plugin) -> plugin.setVersion(this.description.getPlatformVersion().toString())); build.plugins().add("io.spring.dependency-management", (plugin) -> plugin - .setVersion(this.versionResolver.resolveDependencyManagementPluginVersion(this.projectDescription))); + .setVersion(this.versionResolver.resolveDependencyManagementPluginVersion(this.description))); } @Override diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizer.java index 75fe335c..6ebc8299 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizer.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizer.java @@ -32,24 +32,24 @@ import io.spring.initializr.metadata.support.MetadataBuildItemMapper; */ public class DefaultMavenBuildCustomizer implements BuildCustomizer { - private final ProjectDescription projectDescription; + private final ProjectDescription description; private final InitializrMetadata metadata; - public DefaultMavenBuildCustomizer(ProjectDescription projectDescription, InitializrMetadata metadata) { - this.projectDescription = projectDescription; + public DefaultMavenBuildCustomizer(ProjectDescription description, InitializrMetadata metadata) { + this.description = description; this.metadata = metadata; } @Override public void customize(MavenBuild build) { - build.setName(this.projectDescription.getName()); - build.setDescription(this.projectDescription.getDescription()); - build.setProperty("java.version", this.projectDescription.getLanguage().jvmVersion()); + build.setName(this.description.getName()); + build.setDescription(this.description.getDescription()); + build.setProperty("java.version", this.description.getLanguage().jvmVersion()); build.plugins().add("org.springframework.boot", "spring-boot-maven-plugin"); Maven maven = this.metadata.getConfiguration().getEnv().getMaven(); - String springBootVersion = this.projectDescription.getPlatformVersion().toString(); + String springBootVersion = this.description.getPlatformVersion().toString(); ParentPom parentPom = maven.resolveParentPom(springBootVersion); if (parentPom.isIncludeSpringBootBom()) { String versionProperty = "spring-boot.version"; diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/MainSourceCodeProjectContributor.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/MainSourceCodeProjectContributor.java index 3f946693..2d4ffc80 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/MainSourceCodeProjectContributor.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/MainSourceCodeProjectContributor.java @@ -44,7 +44,7 @@ import org.springframework.beans.factory.ObjectProvider; public class MainSourceCodeProjectContributor, S extends SourceCode> implements ProjectContributor { - private final ProjectDescription projectDescription; + private final ProjectDescription description; private final Supplier sourceFactory; @@ -56,11 +56,11 @@ public class MainSourceCodeProjectContributor> mainSourceCodeCustomizers; - public MainSourceCodeProjectContributor(ProjectDescription projectDescription, Supplier sourceFactory, + public MainSourceCodeProjectContributor(ProjectDescription description, Supplier sourceFactory, SourceCodeWriter sourceWriter, ObjectProvider> mainTypeCustomizers, ObjectProvider> mainCompilationUnitCustomizers, ObjectProvider> mainSourceCodeCustomizers) { - this.projectDescription = projectDescription; + this.description = description; this.sourceFactory = sourceFactory; this.sourceWriter = sourceWriter; this.mainTypeCustomizers = mainTypeCustomizers; @@ -71,14 +71,15 @@ public class MainSourceCodeProjectContributor> servletInitializerCustomizers) { - return new ServletInitializerContributor(this.projectDescription.getPackageName(), + return new ServletInitializerContributor(this.description.getPackageName(), "org.springframework.boot.web.support.SpringBootServletInitializer", servletInitializerCustomizers); } @@ -84,7 +84,7 @@ public class SourceCodeProjectGenerationConfiguration { @ConditionalOnPlatformVersion("2.0.0.M1") ServletInitializerContributor boot20ServletInitializerContributor( ObjectProvider> servletInitializerCustomizers) { - return new ServletInitializerContributor(this.projectDescription.getPackageName(), + return new ServletInitializerContributor(this.description.getPackageName(), "org.springframework.boot.web.servlet.support.SpringBootServletInitializer", servletInitializerCustomizers); } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/TestSourceCodeProjectContributor.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/TestSourceCodeProjectContributor.java index fee21a1d..28c0a331 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/TestSourceCodeProjectContributor.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/TestSourceCodeProjectContributor.java @@ -43,7 +43,7 @@ import org.springframework.beans.factory.ObjectProvider; public class TestSourceCodeProjectContributor, S extends SourceCode> implements ProjectContributor { - private final ProjectDescription projectDescription; + private final ProjectDescription description; private final Supplier sourceFactory; @@ -53,11 +53,11 @@ public class TestSourceCodeProjectContributor> testSourceCodeCustomizers; - public TestSourceCodeProjectContributor(ProjectDescription projectDescription, Supplier sourceFactory, + public TestSourceCodeProjectContributor(ProjectDescription description, Supplier sourceFactory, SourceCodeWriter sourceWriter, ObjectProvider> testApplicationTypeCustomizers, ObjectProvider> testSourceCodeCustomizers) { - this.projectDescription = projectDescription; + this.description = description; this.sourceFactory = sourceFactory; this.sourceWriter = sourceWriter; this.testApplicationTypeCustomizers = testApplicationTypeCustomizers; @@ -67,13 +67,14 @@ public class TestSourceCodeProjectContributor> mainApplicationTypeCustomizers, ObjectProvider> mainCompilationUnitCustomizers, ObjectProvider> mainSourceCodeCustomizers) { - return new MainSourceCodeProjectContributor<>(this.projectDescription, GroovySourceCode::new, + return new MainSourceCodeProjectContributor<>(this.description, GroovySourceCode::new, new GroovySourceCodeWriter(this.indentingWriterFactory), mainApplicationTypeCustomizers, mainCompilationUnitCustomizers, mainSourceCodeCustomizers); } @@ -72,7 +72,7 @@ public class GroovyProjectGenerationConfiguration { public TestSourceCodeProjectContributor testGroovySourceCodeProjectContributor( ObjectProvider> testApplicationTypeCustomizers, ObjectProvider> testSourceCodeCustomizers) { - return new TestSourceCodeProjectContributor<>(this.projectDescription, GroovySourceCode::new, + return new TestSourceCodeProjectContributor<>(this.description, GroovySourceCode::new, new GroovySourceCodeWriter(this.indentingWriterFactory), testApplicationTypeCustomizers, testSourceCodeCustomizers); } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java index 3001dbba..3ad945d2 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java @@ -95,7 +95,7 @@ class GroovyProjectGenerationDefaultContributorsConfiguration { @Bean ServletInitializerCustomizer javaServletInitializerCustomizer( - ProjectDescription projectDescription) { + ProjectDescription description) { return (typeDeclaration) -> { GroovyMethodDeclaration configure = GroovyMethodDeclaration.method("configure") .modifiers(Modifier.PROTECTED) @@ -103,7 +103,7 @@ class GroovyProjectGenerationDefaultContributorsConfiguration { .parameters(new Parameter("org.springframework.boot.builder.SpringApplicationBuilder", "application")) .body(new GroovyReturnStatement(new GroovyMethodInvocation("application", "sources", - projectDescription.getApplicationName()))); + description.getApplicationName()))); configure.annotate(Annotation.name("java.lang.Override")); typeDeclaration.addMethodDeclaration(configure); }; diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationConfiguration.java index a9d3cc0f..65e6c973 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationConfiguration.java @@ -48,13 +48,13 @@ import org.springframework.context.annotation.Import; @Import(JavaProjectGenerationDefaultContributorsConfiguration.class) public class JavaProjectGenerationConfiguration { - private final ProjectDescription projectDescription; + private final ProjectDescription description; private final IndentingWriterFactory indentingWriterFactory; - public JavaProjectGenerationConfiguration(ProjectDescription projectDescription, + public JavaProjectGenerationConfiguration(ProjectDescription description, IndentingWriterFactory indentingWriterFactory) { - this.projectDescription = projectDescription; + this.description = description; this.indentingWriterFactory = indentingWriterFactory; } @@ -63,7 +63,7 @@ public class JavaProjectGenerationConfiguration { ObjectProvider> mainApplicationTypeCustomizers, ObjectProvider> mainCompilationUnitCustomizers, ObjectProvider> mainSourceCodeCustomizers) { - return new MainSourceCodeProjectContributor<>(this.projectDescription, JavaSourceCode::new, + return new MainSourceCodeProjectContributor<>(this.description, JavaSourceCode::new, new JavaSourceCodeWriter(this.indentingWriterFactory), mainApplicationTypeCustomizers, mainCompilationUnitCustomizers, mainSourceCodeCustomizers); } @@ -72,7 +72,7 @@ public class JavaProjectGenerationConfiguration { public TestSourceCodeProjectContributor testJavaSourceCodeProjectContributor( ObjectProvider> testApplicationTypeCustomizers, ObjectProvider> testSourceCodeCustomizers) { - return new TestSourceCodeProjectContributor<>(this.projectDescription, JavaSourceCode::new, + return new TestSourceCodeProjectContributor<>(this.description, JavaSourceCode::new, new JavaSourceCodeWriter(this.indentingWriterFactory), testApplicationTypeCustomizers, testSourceCodeCustomizers); } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationDefaultContributorsConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationDefaultContributorsConfiguration.java index 287bc41d..7cb8b144 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationDefaultContributorsConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationDefaultContributorsConfiguration.java @@ -89,7 +89,7 @@ class JavaProjectGenerationDefaultContributorsConfiguration { @Bean ServletInitializerCustomizer javaServletInitializerCustomizer( - ProjectDescription projectDescription) { + ProjectDescription description) { return (typeDeclaration) -> { typeDeclaration.modifiers(Modifier.PUBLIC); JavaMethodDeclaration configure = JavaMethodDeclaration.method("configure") @@ -98,7 +98,7 @@ class JavaProjectGenerationDefaultContributorsConfiguration { .parameters(new Parameter("org.springframework.boot.builder.SpringApplicationBuilder", "application")) .body(new JavaReturnStatement(new JavaMethodInvocation("application", "sources", - projectDescription.getApplicationName() + ".class"))); + description.getApplicationName() + ".class"))); configure.annotate(Annotation.name("java.lang.Override")); typeDeclaration.addMethodDeclaration(configure); }; diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationConfiguration.java index 62f68952..ce476e4a 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationConfiguration.java @@ -50,13 +50,13 @@ import org.springframework.context.annotation.Import; @Import(KotlinProjectGenerationDefaultContributorsConfiguration.class) public class KotlinProjectGenerationConfiguration { - private final ProjectDescription projectDescription; + private final ProjectDescription description; private final IndentingWriterFactory indentingWriterFactory; - public KotlinProjectGenerationConfiguration(ProjectDescription projectDescription, + public KotlinProjectGenerationConfiguration(ProjectDescription description, IndentingWriterFactory indentingWriterFactory) { - this.projectDescription = projectDescription; + this.description = description; this.indentingWriterFactory = indentingWriterFactory; } @@ -65,7 +65,7 @@ public class KotlinProjectGenerationConfiguration { ObjectProvider> mainApplicationTypeCustomizers, ObjectProvider> mainCompilationUnitCustomizers, ObjectProvider> mainSourceCodeCustomizers) { - return new MainSourceCodeProjectContributor<>(this.projectDescription, KotlinSourceCode::new, + return new MainSourceCodeProjectContributor<>(this.description, KotlinSourceCode::new, new KotlinSourceCodeWriter(this.indentingWriterFactory), mainApplicationTypeCustomizers, mainCompilationUnitCustomizers, mainSourceCodeCustomizers); } @@ -74,7 +74,7 @@ public class KotlinProjectGenerationConfiguration { public TestSourceCodeProjectContributor testKotlinSourceCodeProjectContributor( ObjectProvider> testApplicationTypeCustomizers, ObjectProvider> testSourceCodeCustomizers) { - return new TestSourceCodeProjectContributor<>(this.projectDescription, KotlinSourceCode::new, + return new TestSourceCodeProjectContributor<>(this.description, KotlinSourceCode::new, new KotlinSourceCodeWriter(this.indentingWriterFactory), testApplicationTypeCustomizers, testSourceCodeCustomizers); } @@ -84,13 +84,13 @@ public class KotlinProjectGenerationConfiguration { InitializrMetadata metadata) { String kotlinVersion = kotlinVersionResolver .getIfAvailable(() -> new InitializrMetadataKotlinVersionResolver(metadata)) - .resolveKotlinVersion(this.projectDescription); + .resolveKotlinVersion(this.description); return new SimpleKotlinProjectSettings(kotlinVersion); } @Bean public KotlinJacksonBuildCustomizer kotlinJacksonBuildCustomizer(InitializrMetadata metadata) { - return new KotlinJacksonBuildCustomizer(metadata, this.projectDescription); + return new KotlinJacksonBuildCustomizer(metadata, this.description); } } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java index e7fbd519..151d557d 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java @@ -74,8 +74,8 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { } @Bean - BuildCustomizer kotlinDependenciesConfigurer(ProjectDescription projectDescription) { - return new KotlinDependenciesConfigurer(projectDescription.getPlatformVersion()); + BuildCustomizer kotlinDependenciesConfigurer(ProjectDescription description) { + return new KotlinDependenciesConfigurer(description.getPlatformVersion()); } @Bean @@ -106,12 +106,12 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { @Bean MainCompilationUnitCustomizer boot15MainFunctionContributor( - ProjectDescription projectDescription) { + ProjectDescription description) { return (compilationUnit) -> compilationUnit.addTopLevelFunction( KotlinFunctionDeclaration.function("main").parameters(new Parameter("Array", "args")) .body(new KotlinExpressionStatement( new KotlinFunctionInvocation("org.springframework.boot.SpringApplication", "run", - projectDescription.getApplicationName() + "::class.java", "*args")))); + description.getApplicationName() + "::class.java", "*args")))); } } @@ -131,12 +131,12 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { @Bean MainCompilationUnitCustomizer mainFunctionContributor( - ProjectDescription projectDescription) { + ProjectDescription description) { return (compilationUnit) -> compilationUnit.addTopLevelFunction( KotlinFunctionDeclaration.function("main").parameters(new Parameter("Array", "args")) .body(new KotlinExpressionStatement( new KotlinReifiedFunctionInvocation("org.springframework.boot.runApplication", - projectDescription.getApplicationName(), "*args")))); + description.getApplicationName(), "*args")))); } } @@ -150,7 +150,7 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { @Bean ServletInitializerCustomizer javaServletInitializerCustomizer( - ProjectDescription projectDescription) { + ProjectDescription description) { return (typeDeclaration) -> { KotlinFunctionDeclaration configure = KotlinFunctionDeclaration.function("configure") .modifiers(KotlinModifier.OVERRIDE) @@ -158,7 +158,7 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { .parameters(new Parameter("org.springframework.boot.builder.SpringApplicationBuilder", "application")) .body(new KotlinReturnStatement(new KotlinFunctionInvocation("application", "sources", - projectDescription.getApplicationName() + "::class.java"))); + description.getApplicationName() + "::class.java"))); typeDeclaration.addFunctionDeclaration(configure); }; } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/documentation/RequestedDependenciesHelpDocumentCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/documentation/RequestedDependenciesHelpDocumentCustomizer.java index 396a774d..2904ca46 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/documentation/RequestedDependenciesHelpDocumentCustomizer.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/documentation/RequestedDependenciesHelpDocumentCustomizer.java @@ -38,19 +38,18 @@ import org.springframework.util.ObjectUtils; */ public class RequestedDependenciesHelpDocumentCustomizer implements HelpDocumentCustomizer { - private final ProjectDescription projectDescription; + private final ProjectDescription description; private final InitializrMetadata metadata; - public RequestedDependenciesHelpDocumentCustomizer(ProjectDescription projectDescription, - InitializrMetadata metadata) { - this.projectDescription = projectDescription; + public RequestedDependenciesHelpDocumentCustomizer(ProjectDescription description, InitializrMetadata metadata) { + this.description = description; this.metadata = metadata; } @Override public void customize(HelpDocument document) { - this.projectDescription.getRequestedDependencies().forEach((id, dependency) -> { + this.description.getRequestedDependencies().forEach((id, dependency) -> { Dependency dependencyMetadata = this.metadata.getDependencies().get(id); if (dependencyMetadata != null) { handleDependency(document, dependencyMetadata); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java index e0ca862f..c2a79dbf 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java @@ -74,9 +74,9 @@ class DependencyManagementBuildCustomizerTests { } private void customizeBuild(Build build, InitializrMetadata metadata) { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("2.0.0.RELEASE")); - new DependencyManagementBuildCustomizer(projectDescription, metadata).customize(build); + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("2.0.0.RELEASE")); + new DependencyManagementBuildCustomizer(description, metadata).customize(build); } } diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/ConditionalOnGradleVersionTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/ConditionalOnGradleVersionTests.java index 12122500..51a6ef1d 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/ConditionalOnGradleVersionTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/ConditionalOnGradleVersionTests.java @@ -40,33 +40,33 @@ public class ConditionalOnGradleVersionTests { @Test void outcomeWithSpringBoot15() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("1.5.18.RELEASE")); - String bean = outcomeFor(projectDescription); + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("1.5.18.RELEASE")); + String bean = outcomeFor(description); assertThat(bean).isEqualTo("testGradle3"); } @Test void outcomeWithSpringBoot20() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("2.0.9.RELEASE")); - String bean = outcomeFor(projectDescription); + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("2.0.9.RELEASE")); + String bean = outcomeFor(description); assertThat(bean).isEqualTo("testGradle4"); } @Test void outcomeWithSpringBoot21() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("2.1.3.RELEASE")); - String bean = outcomeFor(projectDescription); + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("2.1.3.RELEASE")); + String bean = outcomeFor(description); assertThat(bean).isEqualTo("testGradle5"); } @Test void outcomeWithNoMatch() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("1.0.0.RELEASE")); - this.projectTester.generate(projectDescription, (projectGenerationContext) -> { + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("1.0.0.RELEASE")); + this.projectTester.generate(description, (projectGenerationContext) -> { assertThat(projectGenerationContext.getBeansOfType(String.class)).isEmpty(); return null; }); @@ -74,8 +74,8 @@ public class ConditionalOnGradleVersionTests { @Test void outcomeWithNoAvailableSpringBootVersion() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - this.projectTester.generate(projectDescription, (projectGenerationContext) -> { + MutableProjectDescription description = new MutableProjectDescription(); + this.projectTester.generate(description, (projectGenerationContext) -> { assertThat(projectGenerationContext.getBeansOfType(String.class)).isEmpty(); return null; }); @@ -83,38 +83,37 @@ public class ConditionalOnGradleVersionTests { @Test void outcomeWithSpringBoot15AndMultipleGenerations() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("1.5.18.RELEASE")); - Map candidates = candidatesFor(projectDescription, Gradle3Or4TestConfiguration.class); + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("1.5.18.RELEASE")); + Map candidates = candidatesFor(description, Gradle3Or4TestConfiguration.class); assertThat(candidates).containsOnlyKeys("gradle3", "gradle3AndLater"); } @Test void outcomeWithSpringBoot20AndMultipleGenerations() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("2.0.9.RELEASE")); - Map candidates = candidatesFor(projectDescription, Gradle3Or4TestConfiguration.class); + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("2.0.9.RELEASE")); + Map candidates = candidatesFor(description, Gradle3Or4TestConfiguration.class); assertThat(candidates).containsOnlyKeys("gradle4", "gradle3AndLater"); } @Test void outcomeWithSpringBoot21AndMultipleNonMatchingGenerations() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("2.1.3.RELEASE")); - Map candidates = candidatesFor(projectDescription, Gradle3Or4TestConfiguration.class); + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("2.1.3.RELEASE")); + Map candidates = candidatesFor(description, Gradle3Or4TestConfiguration.class); assertThat(candidates).containsOnlyKeys("gradle5"); } - private String outcomeFor(MutableProjectDescription projectDescription) { - return this.projectTester.generate(projectDescription, (projectGenerationContext) -> { + private String outcomeFor(MutableProjectDescription description) { + return this.projectTester.generate(description, (projectGenerationContext) -> { assertThat(projectGenerationContext.getBeansOfType(String.class)).hasSize(1); return projectGenerationContext.getBean(String.class); }); } - private Map candidatesFor(MutableProjectDescription projectDescription, - Class... extraConfigurations) { - return this.projectTester.withConfiguration(extraConfigurations).generate(projectDescription, + private Map candidatesFor(MutableProjectDescription description, Class... extraConfigurations) { + return this.projectTester.withConfiguration(extraConfigurations).generate(description, (context) -> context.getBeansOfType(String.class)); } diff --git a/initializr-generator-test/src/test/java/io/spring/initializr/generator/test/project/ProjectGeneratorTests.java b/initializr-generator-test/src/test/java/io/spring/initializr/generator/test/project/ProjectGeneratorTests.java index 1fac6855..7fabb415 100644 --- a/initializr-generator-test/src/test/java/io/spring/initializr/generator/test/project/ProjectGeneratorTests.java +++ b/initializr-generator-test/src/test/java/io/spring/initializr/generator/test/project/ProjectGeneratorTests.java @@ -52,10 +52,10 @@ class ProjectGeneratorTests { description.setBuildSystem(new MavenBuildSystem()); Version platformVersion = Version.parse("2.1.0.RELEASE"); description.setPackageName("com.example.test"); - ProjectDescription ProjectDescription = this.projectTester.generate(description, + ProjectDescription customizedDescription = this.projectTester.generate(description, (projectGenerationContext) -> projectGenerationContext.getBean(ProjectDescription.class)); - assertThat(ProjectDescription.getPlatformVersion()).isEqualTo(platformVersion); - assertThat(ProjectDescription.getPackageName()).isEqualTo("com.example.test"); + assertThat(customizedDescription.getPlatformVersion()).isEqualTo(platformVersion); + assertThat(customizedDescription.getPackageName()).isEqualTo("com.example.test"); } @Test @@ -73,10 +73,10 @@ class ProjectGeneratorTests { description.setGroupId("com.example.demo"); description.setName("Original"); - ProjectDescription ProjectDescription = tester.generate(description, + ProjectDescription customizedDescription = tester.generate(description, (projectGenerationContext) -> projectGenerationContext.getBean(ProjectDescription.class)); - assertThat(ProjectDescription.getGroupId()).isEqualTo("com.acme"); - assertThat(ProjectDescription.getName()).isEqualTo("Test"); + assertThat(customizedDescription.getGroupId()).isEqualTo("com.acme"); + assertThat(customizedDescription.getName()).isEqualTo("Test"); } @Test diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnBuildSystemCondition.java b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnBuildSystemCondition.java index d7c9671e..9f2c21fd 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnBuildSystemCondition.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnBuildSystemCondition.java @@ -33,13 +33,13 @@ import org.springframework.util.StringUtils; class OnBuildSystemCondition extends ProjectGenerationCondition { @Override - protected boolean matches(ProjectDescription projectDescription, ConditionContext context, + protected boolean matches(ProjectDescription description, ConditionContext context, AnnotatedTypeMetadata metadata) { MultiValueMap attributes = metadata .getAllAnnotationAttributes(ConditionalOnBuildSystem.class.getName()); String buildSystemId = (String) attributes.getFirst("value"); String dialect = (String) attributes.getFirst("dialect"); - BuildSystem buildSystem = projectDescription.getBuildSystem(); + BuildSystem buildSystem = description.getBuildSystem(); if (buildSystem.id().equals(buildSystemId)) { if (StringUtils.hasText(dialect)) { return dialect.equals(buildSystem.dialect()); diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnLanguageCondition.java b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnLanguageCondition.java index fde39c41..6afae4aa 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnLanguageCondition.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnLanguageCondition.java @@ -31,15 +31,15 @@ import org.springframework.core.type.AnnotatedTypeMetadata; class OnLanguageCondition extends ProjectGenerationCondition { @Override - protected boolean matches(ProjectDescription projectDescription, ConditionContext context, + protected boolean matches(ProjectDescription description, ConditionContext context, AnnotatedTypeMetadata metadata) { - if (projectDescription.getLanguage() == null) { + if (description.getLanguage() == null) { return false; } String languageId = (String) metadata.getAllAnnotationAttributes(ConditionalOnLanguage.class.getName()) .getFirst("value"); Language language = Language.forId(languageId, null); - return projectDescription.getLanguage().id().equals(language.id()); + return description.getLanguage().id().equals(language.id()); } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnPackagingCondition.java b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnPackagingCondition.java index 3fe375f8..529f5284 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnPackagingCondition.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnPackagingCondition.java @@ -31,15 +31,15 @@ import org.springframework.core.type.AnnotatedTypeMetadata; class OnPackagingCondition extends ProjectGenerationCondition { @Override - protected boolean matches(ProjectDescription projectDescription, ConditionContext context, + protected boolean matches(ProjectDescription description, ConditionContext context, AnnotatedTypeMetadata metadata) { - if (projectDescription.getPackaging() == null) { + if (description.getPackaging() == null) { return false; } String packagingId = (String) metadata.getAllAnnotationAttributes(ConditionalOnPackaging.class.getName()) .getFirst("value"); Packaging packaging = Packaging.forId(packagingId); - return projectDescription.getPackaging().id().equals(packaging.id()); + return description.getPackaging().id().equals(packaging.id()); } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnPlatformVersionCondition.java b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnPlatformVersionCondition.java index bc098469..84bcc71e 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnPlatformVersionCondition.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnPlatformVersionCondition.java @@ -35,9 +35,9 @@ import org.springframework.core.type.AnnotatedTypeMetadata; class OnPlatformVersionCondition extends ProjectGenerationCondition { @Override - protected boolean matches(ProjectDescription projectDescription, ConditionContext context, + protected boolean matches(ProjectDescription description, ConditionContext context, AnnotatedTypeMetadata metadata) { - Version platformVersion = projectDescription.getPlatformVersion(); + Version platformVersion = description.getPlatformVersion(); if (platformVersion == null) { return false; } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnRequestedDependencyCondition.java b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnRequestedDependencyCondition.java index 12e00be5..9bc3af61 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnRequestedDependencyCondition.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/OnRequestedDependencyCondition.java @@ -30,11 +30,11 @@ import org.springframework.core.type.AnnotatedTypeMetadata; class OnRequestedDependencyCondition extends ProjectGenerationCondition { @Override - protected boolean matches(ProjectDescription projectDescription, ConditionContext context, + protected boolean matches(ProjectDescription description, ConditionContext context, AnnotatedTypeMetadata metadata) { String id = (String) metadata.getAnnotationAttributes(ConditionalOnRequestedDependency.class.getName()) .get("value"); - return projectDescription.getRequestedDependencies().containsKey(id); + return description.getRequestedDependencies().containsKey(id); } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/ProjectGenerationCondition.java b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/ProjectGenerationCondition.java index 1db3897e..55eaf748 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/condition/ProjectGenerationCondition.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/condition/ProjectGenerationCondition.java @@ -31,11 +31,11 @@ public abstract class ProjectGenerationCondition implements Condition { @Override public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { - ProjectDescription projectDescription = context.getBeanFactory().getBean(ProjectDescription.class); - return matches(projectDescription, context, metadata); + ProjectDescription description = context.getBeanFactory().getBean(ProjectDescription.class); + return matches(description, context, metadata); } - protected abstract boolean matches(ProjectDescription projectDescription, ConditionContext context, + protected abstract boolean matches(ProjectDescription description, ConditionContext context, AnnotatedTypeMetadata metadata); } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/project/DefaultProjectAssetGenerator.java b/initializr-generator/src/main/java/io/spring/initializr/generator/project/DefaultProjectAssetGenerator.java index 8cf7c655..9b62d3ce 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/project/DefaultProjectAssetGenerator.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/project/DefaultProjectAssetGenerator.java @@ -54,9 +54,9 @@ public class DefaultProjectAssetGenerator implements ProjectAssetGenerator @Override public Path generate(ProjectGenerationContext context) throws IOException { - ProjectDescription projectDescription = context.getBean(ProjectDescription.class); - Path projectRoot = resolveProjectDirectoryFactory(context).createProjectDirectory(projectDescription); - Path projectDirectory = initializerProjectDirectory(projectRoot, projectDescription); + ProjectDescription description = context.getBean(ProjectDescription.class); + Path projectRoot = resolveProjectDirectoryFactory(context).createProjectDirectory(description); + Path projectDirectory = initializerProjectDirectory(projectRoot, description); List contributors = context.getBeanProvider(ProjectContributor.class).orderedStream() .collect(Collectors.toList()); for (ProjectContributor contributor : contributors) { diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnBuildSystemTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnBuildSystemTests.java index 60b25961..9bc5fb35 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnBuildSystemTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnBuildSystemTests.java @@ -39,30 +39,29 @@ class ConditionalOnBuildSystemTests { @Test void outcomeWithMavenBuildSystem() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setBuildSystem(new MavenBuildSystem()); - assertThat(candidatesFor(projectDescription, BuildSystemTestConfiguration.class)).containsOnlyKeys("maven"); + MutableProjectDescription description = new MutableProjectDescription(); + description.setBuildSystem(new MavenBuildSystem()); + assertThat(candidatesFor(description, BuildSystemTestConfiguration.class)).containsOnlyKeys("maven"); } @Test void outcomeWithGradleBuildSystem() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setBuildSystem(new GradleBuildSystem()); - assertThat(candidatesFor(projectDescription, BuildSystemTestConfiguration.class)).containsOnlyKeys("gradle"); + MutableProjectDescription description = new MutableProjectDescription(); + description.setBuildSystem(new GradleBuildSystem()); + assertThat(candidatesFor(description, BuildSystemTestConfiguration.class)).containsOnlyKeys("gradle"); } @Test void conditionalOnGradleWithKotlinDialectMatchesWhenGradleBuildSystemUsesKotlinDialect() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setBuildSystem(new GradleBuildSystem("kotlin")); - assertThat(candidatesFor(projectDescription, BuildSystemTestConfiguration.class)).containsOnlyKeys("gradle", + MutableProjectDescription description = new MutableProjectDescription(); + description.setBuildSystem(new GradleBuildSystem("kotlin")); + assertThat(candidatesFor(description, BuildSystemTestConfiguration.class)).containsOnlyKeys("gradle", "gradleKotlin"); } - private Map candidatesFor(MutableProjectDescription projectDescription, - Class... extraConfigurations) { + private Map candidatesFor(MutableProjectDescription description, Class... extraConfigurations) { try (ProjectGenerationContext context = new ProjectGenerationContext()) { - context.registerBean(ProjectDescription.class, () -> projectDescription); + context.registerBean(ProjectDescription.class, () -> description); context.register(extraConfigurations); context.refresh(); return context.getBeansOfType(String.class); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnLanguageTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnLanguageTests.java index ef74ff19..46607824 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnLanguageTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnLanguageTests.java @@ -40,9 +40,9 @@ class ConditionalOnLanguageTests { @Test void outcomeWithJavaLanguage() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setLanguage(new JavaLanguage()); - assertCondition(projectDescription, (context) -> { + MutableProjectDescription description = new MutableProjectDescription(); + description.setLanguage(new JavaLanguage()); + assertCondition(description, (context) -> { assertThat(context.getBeansOfType(String.class)).hasSize(1); assertThat(context.getBean(String.class)).isEqualTo("testJava"); }); @@ -50,9 +50,9 @@ class ConditionalOnLanguageTests { @Test void outcomeWithGroovyBuildSystem() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setLanguage(new GroovyLanguage()); - assertCondition(projectDescription, (context) -> { + MutableProjectDescription description = new MutableProjectDescription(); + description.setLanguage(new GroovyLanguage()); + assertCondition(description, (context) -> { assertThat(context.getBeansOfType(String.class)).hasSize(1); assertThat(context.getBean(String.class)).isEqualTo("testGroovy"); }); @@ -60,21 +60,20 @@ class ConditionalOnLanguageTests { @Test void outcomeWithNoMatch() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setLanguage(new KotlinLanguage()); - assertCondition(projectDescription, (context) -> assertThat(context.getBeansOfType(String.class)).isEmpty()); + MutableProjectDescription description = new MutableProjectDescription(); + description.setLanguage(new KotlinLanguage()); + assertCondition(description, (context) -> assertThat(context.getBeansOfType(String.class)).isEmpty()); } @Test void outcomeWithNoAvailableLanguage() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - assertCondition(projectDescription, (context) -> assertThat(context.getBeansOfType(String.class)).isEmpty()); + MutableProjectDescription description = new MutableProjectDescription(); + assertCondition(description, (context) -> assertThat(context.getBeansOfType(String.class)).isEmpty()); } - private void assertCondition(MutableProjectDescription projectDescription, - Consumer context) { + private void assertCondition(MutableProjectDescription description, Consumer context) { try (ProjectGenerationContext projectContext = new ProjectGenerationContext()) { - projectContext.registerBean(ProjectDescription.class, () -> projectDescription); + projectContext.registerBean(ProjectDescription.class, () -> description); projectContext.register(LanguageTestConfiguration.class); projectContext.refresh(); context.accept(projectContext); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPackagingTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPackagingTests.java index c8ed75da..018b632d 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPackagingTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPackagingTests.java @@ -39,9 +39,9 @@ class ConditionalOnPackagingTests { @Test void outcomeWithJarPackaging() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPackaging(new JarPackaging()); - assertCondition(projectDescription, (context) -> { + MutableProjectDescription description = new MutableProjectDescription(); + description.setPackaging(new JarPackaging()); + assertCondition(description, (context) -> { assertThat(context.getBeansOfType(String.class)).hasSize(1); assertThat(context.getBean(String.class)).isEqualTo("testJar"); }); @@ -49,9 +49,9 @@ class ConditionalOnPackagingTests { @Test void outcomeWithWarPackaging() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPackaging(new WarPackaging()); - assertCondition(projectDescription, (context) -> { + MutableProjectDescription description = new MutableProjectDescription(); + description.setPackaging(new WarPackaging()); + assertCondition(description, (context) -> { assertThat(context.getBeansOfType(String.class)).hasSize(1); assertThat(context.getBean(String.class)).isEqualTo("testWar"); }); @@ -59,14 +59,13 @@ class ConditionalOnPackagingTests { @Test void outcomeWithNoAvailablePackaging() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - assertCondition(projectDescription, (context) -> assertThat(context.getBeansOfType(String.class)).isEmpty()); + MutableProjectDescription description = new MutableProjectDescription(); + assertCondition(description, (context) -> assertThat(context.getBeansOfType(String.class)).isEmpty()); } - private void assertCondition(MutableProjectDescription projectDescription, - Consumer context) { + private void assertCondition(MutableProjectDescription description, Consumer context) { try (ProjectGenerationContext projectContext = new ProjectGenerationContext()) { - projectContext.registerBean(ProjectDescription.class, () -> projectDescription); + projectContext.registerBean(ProjectDescription.class, () -> description); projectContext.register(PackagingTestConfiguration.class); projectContext.refresh(); context.accept(projectContext); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPlatformVersionTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPlatformVersionTests.java index afa32295..7a18c358 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPlatformVersionTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPlatformVersionTests.java @@ -38,60 +38,57 @@ class ConditionalOnPlatformVersionTests { @Test void outcomeWithMatchingRange() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("1.2.0.RELEASE")); - assertThat(candidatesFor(projectDescription, PlatformVersionTestConfiguration.class)).containsOnlyKeys("first"); + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("1.2.0.RELEASE")); + assertThat(candidatesFor(description, PlatformVersionTestConfiguration.class)).containsOnlyKeys("first"); } @Test void outcomeWithMatchingOpenRange() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("2.0.1.RELEASE")); - assertThat(candidatesFor(projectDescription, PlatformVersionTestConfiguration.class)) - .containsOnlyKeys("second"); + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("2.0.1.RELEASE")); + assertThat(candidatesFor(description, PlatformVersionTestConfiguration.class)).containsOnlyKeys("second"); } @Test void outcomeWithMatchingStartOfOpenRange() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("2.0.0.M1")); - assertThat(candidatesFor(projectDescription, PlatformVersionTestConfiguration.class)) - .containsOnlyKeys("second"); + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("2.0.0.M1")); + assertThat(candidatesFor(description, PlatformVersionTestConfiguration.class)).containsOnlyKeys("second"); } @Test void outcomeWithNoMatch() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("0.1.0")); - assertThat(candidatesFor(projectDescription, PlatformVersionTestConfiguration.class)).isEmpty(); + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("0.1.0")); + assertThat(candidatesFor(description, PlatformVersionTestConfiguration.class)).isEmpty(); } @Test void outcomeWithNoAvailablePlatformVersion() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - assertThat(candidatesFor(projectDescription, PlatformVersionTestConfiguration.class)).isEmpty(); + MutableProjectDescription description = new MutableProjectDescription(); + assertThat(candidatesFor(description, PlatformVersionTestConfiguration.class)).isEmpty(); } @Test void outcomeWithSeveralRangesAndMatchingVersion() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("2.1.0.RELEASE")); - assertThat(candidatesFor(projectDescription, PlatformVersionTestConfiguration.class, + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("2.1.0.RELEASE")); + assertThat(candidatesFor(description, PlatformVersionTestConfiguration.class, OneOrTwoPlatformVersionTestConfiguration.class)).containsOnlyKeys("second", "firstOrSecond"); } @Test void outcomeWithSeveralRangesAndNonMatchingVersion() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.setPlatformVersion(Version.parse("2.0.0.M2")); - assertThat(candidatesFor(projectDescription, PlatformVersionTestConfiguration.class, + MutableProjectDescription description = new MutableProjectDescription(); + description.setPlatformVersion(Version.parse("2.0.0.M2")); + assertThat(candidatesFor(description, PlatformVersionTestConfiguration.class, OneOrTwoPlatformVersionTestConfiguration.class)).containsOnlyKeys("second"); } - private Map candidatesFor(MutableProjectDescription projectDescription, - Class... extraConfigurations) { + private Map candidatesFor(MutableProjectDescription description, Class... extraConfigurations) { try (ProjectGenerationContext context = new ProjectGenerationContext()) { - context.registerBean(ProjectDescription.class, () -> projectDescription); + context.registerBean(ProjectDescription.class, () -> description); context.register(PlatformVersionTestConfiguration.class); context.register(extraConfigurations); context.refresh(); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnRequestedDependencyTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnRequestedDependencyTests.java index 2021c2c1..ee6b0fc5 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnRequestedDependencyTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnRequestedDependencyTests.java @@ -39,9 +39,9 @@ class ConditionalOnRequestedDependencyTests { @Test void outcomeWithMatchingDependency() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.addDependency("web", mock(Dependency.class)); - assertCondition(projectDescription, (context) -> { + MutableProjectDescription description = new MutableProjectDescription(); + description.addDependency("web", mock(Dependency.class)); + assertCondition(description, (context) -> { assertThat(context.getBeansOfType(String.class)).hasSize(1); assertThat(context.getBean(String.class)).isEqualTo("webDependency"); }); @@ -49,15 +49,14 @@ class ConditionalOnRequestedDependencyTests { @Test void outcomeWithNoMatch() { - MutableProjectDescription projectDescription = new MutableProjectDescription(); - projectDescription.addDependency("another", mock(Dependency.class)); - assertCondition(projectDescription, (context) -> assertThat(context.getBeansOfType(String.class)).isEmpty()); + MutableProjectDescription description = new MutableProjectDescription(); + description.addDependency("another", mock(Dependency.class)); + assertCondition(description, (context) -> assertThat(context.getBeansOfType(String.class)).isEmpty()); } - private void assertCondition(MutableProjectDescription projectDescription, - Consumer context) { + private void assertCondition(MutableProjectDescription description, Consumer context) { try (ProjectGenerationContext projectContext = new ProjectGenerationContext()) { - projectContext.registerBean(ProjectDescription.class, () -> projectDescription); + projectContext.registerBean(ProjectDescription.class, () -> description); projectContext.register(RequestedDependencyTestConfiguration.class); projectContext.refresh(); context.accept(projectContext); diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationInvoker.java b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationInvoker.java index 8ad1e88f..7b142203 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationInvoker.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationInvoker.java @@ -73,10 +73,10 @@ public class ProjectGenerationInvoker { public ProjectGenerationResult invokeProjectStructureGeneration(ProjectRequest request) { InitializrMetadata metadata = this.parentApplicationContext.getBean(InitializrMetadataProvider.class).get(); try { - ProjectDescription projectDescription = this.converter.convert(request, metadata); + ProjectDescription description = this.converter.convert(request, metadata); ProjectGenerator projectGenerator = new ProjectGenerator(( projectGenerationContext) -> customizeProjectGenerationContext(projectGenerationContext, metadata)); - ProjectGenerationResult result = projectGenerator.generate(projectDescription, generateProject(request)); + ProjectGenerationResult result = projectGenerator.generate(description, generateProject(request)); addTempFile(result.getRootDirectory(), result.getRootDirectory()); return result; } @@ -104,10 +104,10 @@ public class ProjectGenerationInvoker { public byte[] invokeBuildGeneration(ProjectRequest request) { InitializrMetadata metadata = this.parentApplicationContext.getBean(InitializrMetadataProvider.class).get(); try { - ProjectDescription projectDescription = this.converter.convert(request, metadata); + ProjectDescription description = this.converter.convert(request, metadata); ProjectGenerator projectGenerator = new ProjectGenerator(( projectGenerationContext) -> customizeProjectGenerationContext(projectGenerationContext, metadata)); - return projectGenerator.generate(projectDescription, generateBuild(request)); + return projectGenerator.generate(description, generateBuild(request)); } catch (ProjectGenerationException ex) { publishProjectFailedEvent(request, metadata, ex); @@ -160,7 +160,7 @@ public class ProjectGenerationInvoker { } private byte[] generateBuild(ProjectGenerationContext context) throws IOException { - ProjectDescription projectDescription = context.getBean(ProjectDescription.class); + ProjectDescription description = context.getBean(ProjectDescription.class); StringWriter out = new StringWriter(); BuildWriter buildWriter = context.getBeanProvider(BuildWriter.class).getIfAvailable(); if (buildWriter != null) { @@ -168,8 +168,7 @@ public class ProjectGenerationInvoker { return out.toString().getBytes(); } else { - throw new IllegalStateException( - "No BuildWriter implementation found for " + projectDescription.getLanguage()); + throw new IllegalStateException("No BuildWriter implementation found for " + description.getLanguage()); } } diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationResult.java b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationResult.java index b0b4c38e..8a7a8deb 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationResult.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationResult.java @@ -27,12 +27,12 @@ import io.spring.initializr.generator.project.ProjectDescription; */ public class ProjectGenerationResult { - private final ProjectDescription projectDescription; + private final ProjectDescription description; private final Path rootDirectory; - ProjectGenerationResult(ProjectDescription projectDescription, Path rootDirectory) { - this.projectDescription = projectDescription; + ProjectGenerationResult(ProjectDescription description, Path rootDirectory) { + this.description = description; this.rootDirectory = rootDirectory; } @@ -41,7 +41,7 @@ public class ProjectGenerationResult { * @return the project description */ public ProjectDescription getProjectDescription() { - return this.projectDescription; + return this.description; } /**