Generated code should have only one newline at the end

Fixes gh-828

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationConfigurationTests.java

@@ -16,9 +16,12 @@
 
 package io.spring.initializr.generator.spring.code.groovy;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.nio.file.Files;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.List;
 
 import io.spring.initializr.generator.buildsystem.maven.MavenBuildSystem;
@@ -33,6 +36,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import org.springframework.util.StreamUtils;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -71,15 +76,15 @@ void testClassIsContributed() throws IOException {
 		List<String> relativePaths = projectStructure.getRelativePathsOfProjectFiles();
 		assertThat(relativePaths)
 				.contains("src/test/groovy/com/example/demo/DemoApplicationTests.groovy");
-		List<String> lines = Files.readAllLines(projectStructure
+		List<String> lines = readAllLines(projectStructure
 				.resolve("src/test/groovy/com/example/demo/DemoApplicationTests.groovy"));
 		assertThat(lines).containsExactly("package com.example.demo", "",
 				"import org.junit.Test", "import org.junit.runner.RunWith",
 				"import org.springframework.boot.test.context.SpringBootTest",
 				"import org.springframework.test.context.junit4.SpringRunner", "",
 				"@RunWith(SpringRunner)", "@SpringBootTest",
 				"class DemoApplicationTests {", "", "    @Test",
-				"    void contextLoads() {", "    }", "", "}", "");
+				"    void contextLoads() {", "    }", "", "}");
 	}
 
 	@Test
@@ -92,15 +97,23 @@ void servletInitializerIsContributedWhenGeneratingProjectThatUsesWarPackaging()
 		List<String> relativePaths = projectStructure.getRelativePathsOfProjectFiles();
 		assertThat(relativePaths)
 				.contains("src/main/groovy/com/example/demo/ServletInitializer.groovy");
-		List<String> lines = Files.readAllLines(projectStructure
+		List<String> lines = readAllLines(projectStructure
 				.resolve("src/main/groovy/com/example/demo/ServletInitializer.groovy"));
 		assertThat(lines).containsExactly("package com.example.demo", "",
 				"import org.springframework.boot.builder.SpringApplicationBuilder",
 				"import org.springframework.boot.web.servlet.support.SpringBootServletInitializer",
 				"", "class ServletInitializer extends SpringBootServletInitializer {", "",
 				"    @Override",
 				"    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {",
-				"        application.sources(Demo2Application)", "    }", "", "}", "");
+				"        application.sources(Demo2Application)", "    }", "", "}");
+	}
+
+	private static List<String> readAllLines(Path file) throws IOException {
+		String content = StreamUtils.copyToString(
+				new FileInputStream(new File(file.toString())), StandardCharsets.UTF_8);
+		String[] lines = content.split("\\r?\\n");
+		assertThat(content).endsWith(System.lineSeparator());
+		return Arrays.asList(lines);
 	}
 
 }

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationConfigurationTests.java

@@ -16,9 +16,12 @@
 
 package io.spring.initializr.generator.spring.code.java;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.nio.file.Files;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.List;
 
 import io.spring.initializr.generator.buildsystem.maven.MavenBuildSystem;
@@ -33,6 +36,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import org.springframework.util.StreamUtils;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -72,15 +77,15 @@ void testClassIsContributed() throws IOException {
 		List<String> relativePaths = projectStructure.getRelativePathsOfProjectFiles();
 		assertThat(relativePaths)
 				.contains("src/test/java/com/example/demo/DemoApplicationTests.java");
-		List<String> lines = Files.readAllLines(projectStructure
+		List<String> lines = readAllLines(projectStructure
 				.resolve("src/test/java/com/example/demo/DemoApplicationTests.java"));
 		assertThat(lines).containsExactly("package com.example.demo;", "",
 				"import org.junit.Test;", "import org.junit.runner.RunWith;",
 				"import org.springframework.boot.test.context.SpringBootTest;",
 				"import org.springframework.test.context.junit4.SpringRunner;", "",
 				"@RunWith(SpringRunner.class)", "@SpringBootTest",
 				"public class DemoApplicationTests {", "", "    @Test",
-				"    public void contextLoads() {", "    }", "", "}", "");
+				"    public void contextLoads() {", "    }", "", "}");
 	}
 
 	@Test
@@ -93,7 +98,7 @@ void servletInitializerIsContributedWhenGeneratingProjectThatUsesWarPackaging()
 		List<String> relativePaths = projectStructure.getRelativePathsOfProjectFiles();
 		assertThat(relativePaths)
 				.contains("src/main/java/com/example/demo/ServletInitializer.java");
-		List<String> lines = Files.readAllLines(projectStructure
+		List<String> lines = readAllLines(projectStructure
 				.resolve("src/main/java/com/example/demo/ServletInitializer.java"));
 		assertThat(lines).containsExactly("package com.example.demo;", "",
 				"import org.springframework.boot.builder.SpringApplicationBuilder;",
@@ -103,7 +108,7 @@ void servletInitializerIsContributedWhenGeneratingProjectThatUsesWarPackaging()
 				"", "    @Override",
 				"    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {",
 				"        return application.sources(MyDemoApplication.class);", "    }",
-				"", "}", "");
+				"", "}");
 	}
 
 	@Test
@@ -128,4 +133,12 @@ void customApplicationNameIsUsedWhenGeneratingProject() {
 				"src/test/java/com/example/demo/MyApplicationTests.java");
 	}
 
+	private static List<String> readAllLines(Path file) throws IOException {
+		String content = StreamUtils.copyToString(
+				new FileInputStream(new File(file.toString())), StandardCharsets.UTF_8);
+		String[] lines = content.split("\\r?\\n");
+		assertThat(content).endsWith(System.lineSeparator());
+		return Arrays.asList(lines);
+	}
+
 }

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationConfigurationTests.java

@@ -16,9 +16,12 @@
 
 package io.spring.initializr.generator.spring.code.kotlin;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.nio.file.Files;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.List;
 
 import io.spring.initializr.generator.buildsystem.maven.MavenBuildSystem;
@@ -33,6 +36,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import org.springframework.util.StreamUtils;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -74,15 +79,15 @@ void testClassIsContributed() throws IOException {
 		List<String> relativePaths = projectStructure.getRelativePathsOfProjectFiles();
 		assertThat(relativePaths)
 				.contains("src/test/kotlin/com/example/demo/DemoApplicationTests.kt");
-		List<String> lines = Files.readAllLines(projectStructure
+		List<String> lines = readAllLines(projectStructure
 				.resolve("src/test/kotlin/com/example/demo/DemoApplicationTests.kt"));
 		assertThat(lines).containsExactly("package com.example.demo", "",
 				"import org.junit.Test", "import org.junit.runner.RunWith",
 				"import org.springframework.boot.test.context.SpringBootTest",
 				"import org.springframework.test.context.junit4.SpringRunner", "",
 				"@RunWith(SpringRunner::class)", "@SpringBootTest",
 				"class DemoApplicationTests {", "", "    @Test",
-				"    fun contextLoads() {", "    }", "", "}", "");
+				"    fun contextLoads() {", "    }", "", "}");
 	}
 
 	@Test
@@ -95,15 +100,23 @@ void servletInitializerIsContributedWhenGeneratingProjectThatUsesWarPackaging()
 		List<String> relativePaths = projectStructure.getRelativePathsOfProjectFiles();
 		assertThat(relativePaths)
 				.contains("src/main/kotlin/com/example/demo/ServletInitializer.kt");
-		List<String> lines = Files.readAllLines(projectStructure
+		List<String> lines = readAllLines(projectStructure
 				.resolve("src/main/kotlin/com/example/demo/ServletInitializer.kt"));
 		assertThat(lines).containsExactly("package com.example.demo", "",
 				"import org.springframework.boot.builder.SpringApplicationBuilder",
 				"import org.springframework.boot.web.servlet.support.SpringBootServletInitializer",
 				"", "class ServletInitializer : SpringBootServletInitializer() {", "",
 				"    override fun configure(application: SpringApplicationBuilder): SpringApplicationBuilder {",
 				"        return application.sources(KotlinDemoApplication::class.java)",
-				"    }", "", "}", "");
+				"    }", "", "}");
+	}
+
+	private static List<String> readAllLines(Path file) throws IOException {
+		String content = StreamUtils.copyToString(
+				new FileInputStream(new File(file.toString())), StandardCharsets.UTF_8);
+		String[] lines = content.split("\\r?\\n");
+		assertThat(content).endsWith(System.lineSeparator());
+		return Arrays.asList(lines);
 	}
 
 }

initializr-generator-spring/src/test/resources/project/groovy/previous/DemoApplication.groovy.gen

@@ -11,4 +11,3 @@ class DemoApplication {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/groovy/previous/MyProjectApplication.groovy.gen

@@ -11,4 +11,3 @@ class MyProjectApplication {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/groovy/previous/ServletInitializer.groovy.gen

@@ -11,4 +11,3 @@ class ServletInitializer extends SpringBootServletInitializer {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/groovy/standard/DemoApplication.groovy.gen

@@ -11,4 +11,3 @@ class DemoApplication {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/groovy/standard/DemoApplicationTests.groovy.gen

@@ -14,4 +14,3 @@ class DemoApplicationTests {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/groovy/standard/DemoApplicationTestsWeb.groovy.gen

@@ -14,4 +14,3 @@ class DemoApplicationTests {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/groovy/standard/MyProjectApplication.groovy.gen

@@ -11,4 +11,3 @@ class MyProjectApplication {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/groovy/standard/MyProjectApplicationTests.groovy.gen

@@ -14,4 +14,3 @@ class MyProjectApplicationTests {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/groovy/standard/ServletInitializer.groovy.gen

@@ -11,4 +11,3 @@ class ServletInitializer extends SpringBootServletInitializer {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/java/previous/DemoApplication.java.gen

@@ -11,4 +11,3 @@ public class DemoApplication {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/java/previous/MyProjectApplication.java.gen

@@ -11,4 +11,3 @@ public class MyProjectApplication {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/java/previous/ServletInitializer.java.gen

@@ -11,4 +11,3 @@ public class ServletInitializer extends SpringBootServletInitializer {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/java/standard/DemoApplication.java.gen

@@ -11,4 +11,3 @@ public class DemoApplication {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/java/standard/DemoApplicationTests.java.gen

@@ -14,4 +14,3 @@ public class DemoApplicationTests {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/java/standard/DemoApplicationTestsWeb.java.gen

@@ -14,4 +14,3 @@ public class DemoApplicationTests {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/java/standard/MyProjectApplication.java.gen

@@ -11,4 +11,3 @@ public class MyProjectApplication {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/java/standard/MyProjectApplicationTests.java.gen

@@ -14,4 +14,3 @@ public class MyProjectApplicationTests {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/java/standard/ServletInitializer.java.gen

@@ -11,4 +11,3 @@ public class ServletInitializer extends SpringBootServletInitializer {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/kotlin/previous/DemoApplication.kt.gen

@@ -9,4 +9,3 @@ class DemoApplication
 fun main(args: Array<String>) {
 	SpringApplication.run(DemoApplication::class.java, *args)
 }
-

initializr-generator-spring/src/test/resources/project/kotlin/previous/MyProjectApplication.kt.gen

@@ -9,4 +9,3 @@ class MyProjectApplication
 fun main(args: Array<String>) {
 	SpringApplication.run(MyProjectApplication::class.java, *args)
 }
-

initializr-generator-spring/src/test/resources/project/kotlin/previous/ServletInitializer.kt.gen

@@ -10,4 +10,3 @@ class ServletInitializer : SpringBootServletInitializer() {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/kotlin/standard/DemoApplication.kt.gen

@@ -9,4 +9,3 @@ class DemoApplication
 fun main(args: Array<String>) {
 	runApplication<DemoApplication>(*args)
 }
-

initializr-generator-spring/src/test/resources/project/kotlin/standard/DemoApplicationTests.kt.gen

@@ -14,4 +14,3 @@ class DemoApplicationTests {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/kotlin/standard/DemoApplicationTestsWeb.kt.gen

@@ -14,4 +14,3 @@ class DemoApplicationTests {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/kotlin/standard/MyProjectApplication.kt.gen

@@ -9,4 +9,3 @@ class MyProjectApplication
 fun main(args: Array<String>) {
 	runApplication<MyProjectApplication>(*args)
 }
-

initializr-generator-spring/src/test/resources/project/kotlin/standard/MyProjectApplicationTests.kt.gen

@@ -14,4 +14,3 @@ class MyProjectApplicationTests {
 	}
 
 }
-

initializr-generator-spring/src/test/resources/project/kotlin/standard/ServletInitializer.kt.gen

@@ -10,4 +10,3 @@ class ServletInitializer : SpringBootServletInitializer() {
 	}
 
 }
-

initializr-generator/src/main/java/io/spring/initializr/generator/language/groovy/GroovySourceCodeWriter.java

@@ -113,7 +113,6 @@ private void writeTo(Path directory, GroovyCompilationUnit compilationUnit)
 					});
 				}
 				writer.println("}");
-				writer.println("");
 			}
 		}
 	}

initializr-generator/src/main/java/io/spring/initializr/generator/language/java/JavaSourceCodeWriter.java

@@ -114,7 +114,6 @@ private void writeTo(Path directory, JavaCompilationUnit compilationUnit)
 					});
 				}
 				writer.println("}");
-				writer.println("");
 			}
 		}
 	}

initializr-generator/src/main/java/io/spring/initializr/generator/language/kotlin/KotlinSourceCodeWriter.java

@@ -86,18 +86,17 @@ private void writeTo(Path directory, KotlinCompilationUnit compilationUnit)
 						.getFunctionDeclarations();
 				if (!functionDeclarations.isEmpty()) {
 					writer.println(" {");
-					writer.println();
 					writer.indented(() -> {
 						for (KotlinFunctionDeclaration functionDeclaration : functionDeclarations) {
 							writeFunction(writer, functionDeclaration);
 						}
 					});
+					writer.println();
 					writer.println("}");
 				}
 				else {
 					writer.println("");
 				}
-				writer.println("");
 			}
 			List<KotlinFunctionDeclaration> topLevelFunctions = compilationUnit
 					.getTopLevelFunctions();
@@ -112,6 +111,7 @@ private void writeTo(Path directory, KotlinCompilationUnit compilationUnit)
 
 	private void writeFunction(IndentingWriter writer,
 			KotlinFunctionDeclaration functionDeclaration) {
+		writer.println();
 		writeAnnotations(writer, functionDeclaration);
 		writeMethodModifiers(writer, functionDeclaration);
 		writer.print("fun ");
@@ -144,7 +144,6 @@ else if (statement instanceof KotlinReturnStatement) {
 			}
 		});
 		writer.println("}");
-		writer.println();
 	}
 
 	private void writeAnnotations(IndentingWriter writer, Annotatable annotatable) {