From f1568d475aea315fdd27db71faee80d0b5cc50ba Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 26 Sep 2019 10:42:28 +0200 Subject: [PATCH] [jOOQ/jOOQ#9276] Consistently use same line terminators in generator Also for the import list the Java / Scala generators now use the configured line terminator rather than a hardcoded terminator. --- .../src/main/java/org/jooq/codegen/GeneratorWriter.java | 8 ++++++++ .../src/main/java/org/jooq/codegen/JavaWriter.java | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorWriter.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorWriter.java index 310247642f..c37da23967 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorWriter.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorWriter.java @@ -105,10 +105,18 @@ public abstract class GeneratorWriter> { this.files.mkdirs(file.getParentFile()); } + public String tabString() { + return tabString; + } + public void tabString(String string) { this.tabString = string.replace("\\t", "\t"); } + public String newlineString() { + return newlineString; + } + public void newlineString(String string) { this.newlineString = string.replace("\\n", "\n").replace("\\r", "\r"); } diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaWriter.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaWriter.java index 02b6c8d36a..93650b1de8 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaWriter.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaWriter.java @@ -207,11 +207,11 @@ public class JavaWriter extends GeneratorWriter { String topLevelPackage = imp.split("\\.")[0]; if (!topLevelPackage.equals(previous)) - importString.append("\n"); + importString.append(newlineString()); importString.append("import ") .append(imp) - .append(isScala ? "\n" : ";\n"); + .append(isScala ? "" : ";").append(newlineString()); previous = topLevelPackage; }