From 711d2c36da17c24ba350f982182bcdc670ab316e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Jun 2023 11:31:08 +0200 Subject: [PATCH] Polish "Use Java configuration for Gradle build" See gh-1427 --- .../buildsystem/gradle/GradleBuildWriter.java | 1 - .../gradle/GroovyDslGradleBuildWriter.java | 1 + .../gradle/KotlinDslGradleBuildWriter.java | 1 + .../gradle/GradleBuildWriterTests.java | 18 ------------------ .../GroovyDslGradleBuildWriterTests.java | 7 +++++-- .../KotlinDslGradleBuildWriterTests.java | 7 +++++-- 6 files changed, 12 insertions(+), 23 deletions(-) diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java index 38fb371e..e06b4217 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java @@ -67,7 +67,6 @@ public abstract class GradleBuildWriter { writeProperty(writer, "version", settings.getVersion()); writer.println(); writeJavaSourceCompatibility(writer, settings); - writer.println(); writeConfigurations(writer, build.configurations()); writeRepositories(writer, build); writeProperties(writer, build.properties()); diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriter.java index 5442a564..14c8f7a4 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriter.java @@ -92,6 +92,7 @@ public class GroovyDslGradleBuildWriter extends GradleBuildWriter { writer.indented( () -> writer.println(String.format("sourceCompatibility = '%s'", settings.getSourceCompatibility()))); writer.println("}"); + writer.println(""); } @Override diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java index c4a2586a..9bd1d866 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java @@ -86,6 +86,7 @@ public class KotlinDslGradleBuildWriter extends GradleBuildWriter { writer.indented(() -> writer.println( String.format("sourceCompatibility = %s", getJavaVersionConstant(settings.getSourceCompatibility())))); writer.println("}"); + writer.println(); } private String getJavaVersionConstant(String jvmVersion) { diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriterTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriterTests.java index eaac194c..bf8bc74d 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriterTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriterTests.java @@ -16,11 +16,8 @@ package io.spring.initializr.generator.buildsystem.gradle; -import java.io.StringWriter; import java.util.Set; -import io.spring.initializr.generator.io.IndentingWriter; -import io.spring.initializr.generator.io.SimpleIndentStrategy; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -93,19 +90,4 @@ public abstract class GradleBuildWriterTests { protected abstract String write(GradleBuild build); - /** - * A helper method that tests if java configuration is written properly - * @param format in which source compatibility must be written - * @param jvmVersion for the java - * @return the string representation for java configuration - */ - protected String javaConfigurationWriter(String format, String jvmVersion) { - StringWriter stringWriter = new StringWriter(); - IndentingWriter writer = new IndentingWriter(stringWriter, new SimpleIndentStrategy("\t")); - writer.println("java {"); - writer.indented(() -> writer.println(String.format(format, jvmVersion))); - writer.println("}"); - return stringWriter.toString().replace("\r\n", "\n"); - } - } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriterTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriterTests.java index 96470846..2a73a2d5 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriterTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleBuildWriterTests.java @@ -52,8 +52,11 @@ class GroovyDslGradleBuildWriterTests extends GradleBuildWriterTests { void gradleBuildWithSourceCompatibility() { GradleBuild build = new GradleBuild(); build.settings().sourceCompatibility("11"); - String javaConfiguration = javaConfigurationWriter("sourceCompatibility = '%s'", "11"); - assertThat(write(build)).contains(javaConfiguration); + assertThat(write(build)).contains(""" + java { + sourceCompatibility = '11' + } + """); } @Test diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java index d8929dcb..ec7f3a7c 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriterTests.java @@ -60,8 +60,11 @@ class KotlinDslGradleBuildWriterTests extends GradleBuildWriterTests { void gradleBuildWithSourceCompatibility15(String sourceCompatibility, String javaVersionConstant) { GradleBuild build = new GradleBuild(); build.settings().sourceCompatibility(sourceCompatibility); - String javaConfiguration = javaConfigurationWriter("sourceCompatibility = %s", javaVersionConstant); - assertThat(write(build)).contains(javaConfiguration); + assertThat(write(build)).contains(""" + java { + sourceCompatibility = %s + } + """.formatted(javaVersionConstant)); } static Stream sourceCompatibilityParameters() {