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

[#5649] Trailing comma from ScalaGenerator when using schemaVersionProvider

Browse Source
This commit is contained in:
lukaseder 2016-11-07 13:28:18 +01:00
parent 9727b93595
commit cdb0423942
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
View File

@ -4750,18 +4750,27 @@ public class JavaGenerator extends AbstractGenerator {
out.println("@%s(", out.ref("javax.annotation.Generated"));
if (useSchemaVersionProvider() || useCatalogVersionProvider()) {
boolean hasCatalogVersion = !StringUtils.isBlank(catalogVersions.get(catalog));
boolean hasSchemaVersion = !StringUtils.isBlank(schemaVersions.get(schema));
if (scala)
out.tab(1).println("value = %s(", out.ref("scala.Array"));
else
out.tab(1).println("value = {");
out.tab(2).println("\"http://www.jooq.org\",");
out.tab(2).println("\"jOOQ version:%s\",", Constants.VERSION);
if (!StringUtils.isBlank(catalogVersions.get(catalog)))
out.tab(2).println("\"catalog version:%s\",", catalogVersions.get(catalog).replace("\"", "\\\""));
if (!StringUtils.isBlank(schemaVersions.get(schema)))
out.tab(2).println("\"schema version:%s\",", schemaVersions.get(schema).replace("\"", "\\\""));
if (hasCatalogVersion || hasSchemaVersion) {
out.tab(2).println("\"jOOQ version:%s\",", Constants.VERSION);
if (hasCatalogVersion)
out.tab(2).println("\"catalog version:%s\"", catalogVersions.get(catalog).replace("\"", "\\\""));
if (hasSchemaVersion)
out.tab(2).println("\"schema version:%s\"", schemaVersions.get(schema).replace("\"", "\\\""));
}
else {
out.tab(2).println("\"jOOQ version:%s\"", Constants.VERSION);
}
if (scala)
out.tab(1).println("),");