github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#4575] SQL comments with javadoc terminators break generated code

Browse Source
This commit is contained in:
lukaseder 2015-09-27 12:29:19 +02:00
parent ac0e19131c
commit c8dd018f64
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java
View File

@ -58,17 +58,25 @@ public class JavaWriter extends GeneratorWriter<JavaWriter> {
public JavaWriter javadoc(String string, Object... args) {
final int t = tab();
// [#3450] Must not print */ inside Javadoc
String escaped = string.replace("*/", "* /");
// [#3450] [#4575] Must not print */ inside Javadoc
String escaped = escapeJavadoc(string);
Object[] escapedArgs = Arrays.copyOf(args, args.length);
for (int i = 0; i < escapedArgs.length; i++)
if (escapedArgs[i] instanceof String)
escapedArgs[i] = escapeJavadoc((String) escapedArgs[i]);
tab(t).println();
tab(t).println("/**");
tab(t).println(" * " + escaped, args);
tab(t).println(" * " + escaped, escapedArgs);
tab(t).println(" */");
return this;
}
private String escapeJavadoc(String string) {
return string.replace("*/", "* /");
}
public JavaWriter header(String header, Object... args) {
int t = tab();