[#3599] Implement nicer formatting of @Generated annotation

This commit is contained in:
Lukas Eder 2014-08-27 10:58:52 +02:00
parent a8e2b1ef79
commit b00ffa16ec
16 changed files with 134 additions and 52 deletions

View File

@ -2919,15 +2919,26 @@ public class JavaGenerator extends AbstractGenerator {
protected void printClassAnnotations(JavaWriter out, SchemaDefinition schema) {
if (generateGeneratedAnnotation()) {
out.println("@javax.annotation.Generated(");
if (useSchemaVersionProvider()) {
out.println("@javax.annotation.Generated(value = { \"http://www.jooq.org\", \"jOOQ version:%s\", \"schema version:%s\" },", Constants.VERSION, schemaVersions.get(schema).replace("\"", "\\\""));
out.println(" date = \"" + isoDate + "\",");
out.println(" comments = \"This class is generated by jOOQ\")");
out.tab(1).println("value = {");
out.tab(2).println("\"http://www.jooq.org\",");
out.tab(2).println("\"jOOQ version:%s\",", Constants.VERSION);
out.tab(2).println("\"schema version:%s\"", schemaVersions.get(schema).replace("\"", "\\\""));
out.tab(1).println("},");
out.tab(1).println("date = \"" + isoDate + "\",");
out.tab(1).println("comments = \"This class is generated by jOOQ\"");
}
else {
out.println("@javax.annotation.Generated(value = { \"http://www.jooq.org\", \"jOOQ version:%s\" },", Constants.VERSION);
out.println(" comments = \"This class is generated by jOOQ\")");
out.tab(1).println("value = {");
out.tab(2).println("\"http://www.jooq.org\",");
out.tab(2).println("\"jOOQ version:%s\"", Constants.VERSION);
out.tab(1).println("},");
out.tab(1).println("comments = \"This class is generated by jOOQ\"");
}
out.println(")");
}
out.println("@java.lang.SuppressWarnings({ \"all\", \"unchecked\", \"rawtypes\" })");

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PgCatalog extends org.jooq.impl.SchemaImpl {
private static final long serialVersionUID = -547042235;
private static final long serialVersionUID = -311127344;
/**
* The singleton instance of <code>pg_catalog</code>

View File

@ -4,12 +4,15 @@
package org.jooq.util.postgres.pg_catalog;
/**
* This class is generated by jOOQ.
*
* Convenience access to all stored procedures and functions in pg_catalog
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Routines {

View File

@ -4,12 +4,15 @@
package org.jooq.util.postgres.pg_catalog;
/**
* This class is generated by jOOQ.
*
* Convenience access to all tables in pg_catalog
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Tables {

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.routines;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Count1 extends org.jooq.impl.AbstractRoutine<java.lang.Long> {
private static final long serialVersionUID = 208079261;
private static final long serialVersionUID = -1185736664;
/**
* The parameter <code>pg_catalog.count.RETURN_VALUE</code>.

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.routines;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Count2 extends org.jooq.impl.AbstractRoutine<java.lang.Long> {
private static final long serialVersionUID = -1317511552;
private static final long serialVersionUID = 1235202955;
/**
* The parameter <code>pg_catalog.count.RETURN_VALUE</code>.

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.routines;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class FormatType extends org.jooq.impl.AbstractRoutine<java.lang.String> {
private static final long serialVersionUID = -763218796;
private static final long serialVersionUID = -219126807;
/**
* The parameter <code>pg_catalog.format_type.RETURN_VALUE</code>.

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PgAttribute extends org.jooq.impl.TableImpl<org.jooq.Record> {
private static final long serialVersionUID = 622630497;
private static final long serialVersionUID = 1196239094;
/**
* The singleton instance of <code>pg_catalog.pg_attribute</code>

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PgClass extends org.jooq.impl.TableImpl<org.jooq.Record> {
private static final long serialVersionUID = -554390261;
private static final long serialVersionUID = -620129824;
/**
* The singleton instance of <code>pg_catalog.pg_class</code>

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PgCursor extends org.jooq.impl.TableImpl<org.jooq.Record> {
private static final long serialVersionUID = 1972650578;
private static final long serialVersionUID = -1196682275;
/**
* The singleton instance of <code>pg_catalog.pg_cursor</code>

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PgDescription extends org.jooq.impl.TableImpl<org.jooq.Record> {
private static final long serialVersionUID = -1078340299;
private static final long serialVersionUID = 1954654848;
/**
* The singleton instance of <code>pg_catalog.pg_description</code>

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PgEnum extends org.jooq.impl.TableImpl<org.jooq.Record> {
private static final long serialVersionUID = 1493557577;
private static final long serialVersionUID = 1218777758;
/**
* The singleton instance of <code>pg_catalog.pg_enum</code>

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PgInherits extends org.jooq.impl.TableImpl<org.jooq.Record> {
private static final long serialVersionUID = 2110502137;
private static final long serialVersionUID = -898167858;
/**
* The singleton instance of <code>pg_catalog.pg_inherits</code>

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PgNamespace extends org.jooq.impl.TableImpl<org.jooq.Record> {
private static final long serialVersionUID = -238235012;
private static final long serialVersionUID = -1235099823;
/**
* The singleton instance of <code>pg_catalog.pg_namespace</code>

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PgProc extends org.jooq.impl.TableImpl<org.jooq.Record> {
private static final long serialVersionUID = -2023687916;
private static final long serialVersionUID = -1495646817;
/**
* The singleton instance of <code>pg_catalog.pg_proc</code>

View File

@ -6,12 +6,17 @@ package org.jooq.util.postgres.pg_catalog.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(value = { "http://www.jooq.org", "jOOQ version:3.5.0" },
comments = "This class is generated by jOOQ")
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.0"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class PgType extends org.jooq.impl.TableImpl<org.jooq.Record> {
private static final long serialVersionUID = 1535427324;
private static final long serialVersionUID = -1569534649;
/**
* The singleton instance of <code>pg_catalog.pg_type</code>