From a4ad9fdcdd9b5ac441c16589f640139d3a4e23d2 Mon Sep 17 00:00:00 2001 From: Ruben Dijkstra Date: Mon, 24 Aug 2015 23:17:04 +0200 Subject: [PATCH] Remove String concatenation in the source building API --- .../java/com/mysema/codegen/JavaWriter.java | 42 +++++++++---------- .../java/com/mysema/codegen/ScalaWriter.java | 42 +++++++++---------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/mysema/codegen/JavaWriter.java b/src/main/java/com/mysema/codegen/JavaWriter.java index 19561defc..4beb8d79e 100644 --- a/src/main/java/com/mysema/codegen/JavaWriter.java +++ b/src/main/java/com/mysema/codegen/JavaWriter.java @@ -117,7 +117,7 @@ public final class JavaWriter extends AbstractCodeWriter { } else { append("("); } - append(method.getName() + "="); + append(method.getName()).append("="); annotationConstant(value); } catch (IllegalArgumentException e) { throw new CodegenException(e); @@ -163,11 +163,11 @@ public final class JavaWriter extends AbstractCodeWriter { || packages.contains(enumValue.getClass().getPackage().getName())) { append(enumValue.name()); } else { - append(enumValue.getDeclaringClass().getName() + DOT + enumValue.name()); + append(enumValue.getDeclaringClass().getName()).append(DOT).append(enumValue.name()); } } else if (value instanceof String) { String escaped = StringUtils.escapeJava(value.toString()); - append(QUOTE + escaped.replace("\\/", "/") + QUOTE); + append(QUOTE).append(escaped.replace("\\/", "/")).append(QUOTE); } else { throw new IllegalArgumentException("Unsupported annotation value : " + value); } @@ -190,9 +190,9 @@ public final class JavaWriter extends AbstractCodeWriter { @Override public JavaWriter beginClass(Type type, Type superClass, Type... interfaces) throws IOException { packages.add(type.getPackageName()); - beginLine(PUBLIC_CLASS + type.getGenericName(false, packages, classes)); + beginLine(PUBLIC_CLASS, type.getGenericName(false, packages, classes)); if (superClass != null) { - append(EXTENDS + superClass.getGenericName(false, packages, classes)); + append(EXTENDS).append(superClass.getGenericName(false, packages, classes)); } if (interfaces.length > 0) { append(IMPLEMENTS); @@ -213,7 +213,7 @@ public final class JavaWriter extends AbstractCodeWriter { public JavaWriter beginConstructor(Collection parameters, Function transformer) throws IOException { types.push(types.peek()); - beginLine(PUBLIC + types.peek().getSimpleName()).params(parameters, transformer) + beginLine(PUBLIC, types.peek().getSimpleName()).params(parameters, transformer) .append(" {").nl(); return goIn(); } @@ -221,14 +221,14 @@ public final class JavaWriter extends AbstractCodeWriter { @Override public JavaWriter beginConstructor(Parameter... parameters) throws IOException { types.push(types.peek()); - beginLine(PUBLIC + types.peek().getSimpleName()).params(parameters).append(" {").nl(); + beginLine(PUBLIC, types.peek().getSimpleName()).params(parameters).append(" {").nl(); return goIn(); } @Override public JavaWriter beginInterface(Type type, Type... interfaces) throws IOException { packages.add(type.getPackageName()); - beginLine(PUBLIC_INTERFACE + type.getGenericName(false, packages, classes)); + beginLine(PUBLIC_INTERFACE, type.getGenericName(false, packages, classes)); if (interfaces.length > 0) { append(EXTENDS); for (int i = 0; i < interfaces.length; i++) { @@ -248,7 +248,7 @@ public final class JavaWriter extends AbstractCodeWriter { Parameter... args) throws IOException { types.push(types.peek()); beginLine( - modifiers + returnType.getGenericName(true, packages, classes) + SPACE + methodName) + modifiers, returnType.getGenericName(true, packages, classes), SPACE, methodName) .params(args).append(" {").nl(); return goIn(); } @@ -287,20 +287,20 @@ public final class JavaWriter extends AbstractCodeWriter { @Override public JavaWriter field(Type type, String name) throws IOException { - return line(type.getGenericName(true, packages, classes) + SPACE + name + SEMICOLON).nl(); + return line(type.getGenericName(true, packages, classes), SPACE, name, SEMICOLON).nl(); } private JavaWriter field(String modifier, Type type, String name) throws IOException { return line( - modifier + type.getGenericName(true, packages, classes) + SPACE + name + SEMICOLON) + modifier, type.getGenericName(true, packages, classes), SPACE, name, SEMICOLON) .nl(); } private JavaWriter field(String modifier, Type type, String name, String value) throws IOException { return line( - modifier + type.getGenericName(true, packages, classes) + SPACE + name + ASSIGN - + value + SEMICOLON).nl(); + modifier, type.getGenericName(true, packages, classes), SPACE, name, + ASSIGN , value, SEMICOLON).nl(); } @@ -323,7 +323,7 @@ public final class JavaWriter extends AbstractCodeWriter { public JavaWriter imports(Class... imports) throws IOException { for (Class cl : imports) { classes.add(cl.getName()); - line(IMPORT + cl.getName() + SEMICOLON); + line(IMPORT, cl.getName(), SEMICOLON); } nl(); return this; @@ -333,7 +333,7 @@ public final class JavaWriter extends AbstractCodeWriter { public JavaWriter imports(Package... imports) throws IOException { for (Package p : imports) { packages.add(p.getName()); - line(IMPORT + p.getName() + ".*;"); + line(IMPORT, p.getName(), ".*;"); } nl(); return this; @@ -343,7 +343,7 @@ public final class JavaWriter extends AbstractCodeWriter { public JavaWriter importClasses(String... imports) throws IOException { for (String cl : imports) { classes.add(cl); - line(IMPORT + cl + SEMICOLON); + line(IMPORT, cl, SEMICOLON); } nl(); return this; @@ -353,7 +353,7 @@ public final class JavaWriter extends AbstractCodeWriter { public JavaWriter importPackages(String... imports) throws IOException { for (String p : imports) { packages.add(p); - line(IMPORT + p + ".*;"); + line(IMPORT, p, ".*;"); } nl(); return this; @@ -363,7 +363,7 @@ public final class JavaWriter extends AbstractCodeWriter { public JavaWriter javadoc(String... lines) throws IOException { line("/**"); for (String line : lines) { - line(" * " + line); + line(" * ", line); } return line(" */"); } @@ -371,7 +371,7 @@ public final class JavaWriter extends AbstractCodeWriter { @Override public JavaWriter packageDecl(String packageName) throws IOException { packages.add(packageName); - return line(PACKAGE + packageName + SEMICOLON).nl(); + return line(PACKAGE, packageName, SEMICOLON).nl(); } private JavaWriter params(Collection parameters, Function transformer) @@ -471,14 +471,14 @@ public final class JavaWriter extends AbstractCodeWriter { @Override public JavaWriter staticimports(Class... imports) throws IOException { for (Class cl : imports) { - line(IMPORT_STATIC + cl.getName() + ".*;"); + line(IMPORT_STATIC, cl.getName(), ".*;"); } return this; } @Override public JavaWriter suppressWarnings(String type) throws IOException { - return line("@SuppressWarnings(\"" + type + "\")"); + return line("@SuppressWarnings(\"", type, "\")"); } private Parameter[] transform(Collection parameters, diff --git a/src/main/java/com/mysema/codegen/ScalaWriter.java b/src/main/java/com/mysema/codegen/ScalaWriter.java index fd6c56050..35719bc39 100644 --- a/src/main/java/com/mysema/codegen/ScalaWriter.java +++ b/src/main/java/com/mysema/codegen/ScalaWriter.java @@ -131,7 +131,7 @@ public class ScalaWriter extends AbstractCodeWriter { } else { append("("); } - append(escape(method.getName()) + "="); + append(escape(method.getName())).append("="); annotationConstant(value); } catch (IllegalArgumentException e) { throw new CodegenException(e); @@ -179,10 +179,10 @@ public class ScalaWriter extends AbstractCodeWriter { || packages.contains(enumValue.getClass().getPackage().getName())) { append(enumValue.name()); } else { - append(enumValue.getDeclaringClass().getName() + DOT + enumValue.name()); + append(enumValue.getDeclaringClass().getName()).append(DOT).append(enumValue.name()); } } else if (value instanceof String) { - append(QUOTE + StringUtils.escapeJava(value.toString()) + QUOTE); + append(QUOTE).append(StringUtils.escapeJava(value.toString())).append(QUOTE); } else { throw new IllegalArgumentException("Unsupported annotation value : " + value); } @@ -223,7 +223,7 @@ public class ScalaWriter extends AbstractCodeWriter { packages.add(type.getPackageName()); beginLine(PUBLIC_CLASS, getGenericName(false, type)); if (superClass != null) { - append(EXTENDS + getGenericName(false, superClass)); + append(EXTENDS).append(getGenericName(false, superClass)); } if (interfaces.length > 0) { if (superClass == null) { @@ -255,20 +255,20 @@ public class ScalaWriter extends AbstractCodeWriter { @Override public ScalaWriter beginConstructor(Collection parameters, Function transformer) throws IOException { - beginLine(DEF + THIS).params(parameters, transformer).append(" {").nl(); + beginLine(DEF, THIS).params(parameters, transformer).append(" {").nl(); return goIn(); } @Override public ScalaWriter beginConstructor(Parameter... params) throws IOException { - beginLine(DEF + THIS).params(params).append(" {").nl(); + beginLine(DEF, THIS).params(params).append(" {").nl(); return goIn(); } @Override public ScalaWriter beginInterface(Type type, Type... interfaces) throws IOException { packages.add(type.getPackageName()); - beginLine(TRAIT + getGenericName(false, type)); + beginLine(TRAIT, getGenericName(false, type)); if (interfaces.length > 0) { append(EXTENDS); append(getGenericName(false, interfaces[0])); @@ -292,10 +292,10 @@ public class ScalaWriter extends AbstractCodeWriter { private ScalaWriter beginMethod(String modifiers, Type returnType, String methodName, Parameter... args) throws IOException { if (returnType.equals(Types.VOID)) { - beginLine(modifiers + escape(methodName)).params(args).append(" {").nl(); + beginLine(modifiers, escape(methodName)).params(args).append(" {").nl(); } else { - beginLine(modifiers + escape(methodName)).params(args) - .append(": " + getGenericName(true, returnType)).append(" {").nl(); + beginLine(modifiers, escape(methodName)).params(args) + .append(": ").append(getGenericName(true, returnType)).append(" {").nl(); } return goIn(); @@ -337,18 +337,18 @@ public class ScalaWriter extends AbstractCodeWriter { } public ScalaWriter field(Type type, String name) throws IOException { - line(VAR + escape(name) + ": " + getGenericName(true, type)); + line(VAR, escape(name), ": ", getGenericName(true, type)); return compact ? this : nl(); } private ScalaWriter field(String modifier, Type type, String name) throws IOException { - line(modifier + escape(name) + ": " + getGenericName(true, type)); + line(modifier, escape(name), ": ", getGenericName(true, type)); return compact ? this : nl(); } private ScalaWriter field(String modifier, Type type, String name, String value) throws IOException { - line(modifier + escape(name) + ": " + getGenericName(true, type) + ASSIGN + value); + line(modifier, escape(name), ": ", getGenericName(true, type), ASSIGN, value); return compact ? this : nl(); } @@ -421,7 +421,7 @@ public class ScalaWriter extends AbstractCodeWriter { public ScalaWriter imports(Class... imports) throws IOException { for (Class cl : imports) { classes.add(cl.getName()); - line(IMPORT + cl.getName()); + line(IMPORT, cl.getName()); } nl(); return this; @@ -431,7 +431,7 @@ public class ScalaWriter extends AbstractCodeWriter { public ScalaWriter imports(Package... imports) throws IOException { for (Package p : imports) { packages.add(p.getName()); - line(IMPORT + p.getName() + "._"); + line(IMPORT, p.getName(), "._"); } nl(); return this; @@ -441,7 +441,7 @@ public class ScalaWriter extends AbstractCodeWriter { public ScalaWriter importClasses(String... imports) throws IOException { for (String cl : imports) { classes.add(cl); - line(IMPORT + cl); + line(IMPORT, cl); } nl(); return this; @@ -451,7 +451,7 @@ public class ScalaWriter extends AbstractCodeWriter { public ScalaWriter importPackages(String... imports) throws IOException { for (String p : imports) { packages.add(p); - line(IMPORT + p + "._"); + line(IMPORT, p, "._"); } nl(); return this; @@ -461,7 +461,7 @@ public class ScalaWriter extends AbstractCodeWriter { public ScalaWriter javadoc(String... lines) throws IOException { line("/**"); for (String line : lines) { - line(" * " + line); + line(" * ", line); } return line(" */"); } @@ -469,7 +469,7 @@ public class ScalaWriter extends AbstractCodeWriter { @Override public ScalaWriter packageDecl(String packageName) throws IOException { packages.add(packageName); - return line(PACKAGE + packageName).nl(); + return line(PACKAGE, packageName).nl(); } private ScalaWriter params(Collection parameters, Function transformer) @@ -569,14 +569,14 @@ public class ScalaWriter extends AbstractCodeWriter { @Override public ScalaWriter staticimports(Class... imports) throws IOException { for (Class cl : imports) { - line(IMPORT_STATIC + cl.getName() + "._;"); + line(IMPORT_STATIC, cl.getName(), "._;"); } return this; } @Override public ScalaWriter suppressWarnings(String type) throws IOException { - return line("@SuppressWarnings(\"" + type + "\")"); + return line("@SuppressWarnings(\"", type, "\")"); } private Parameter[] transform(Collection parameters,