From d087e4a4f601ad12e4f1b08a6c4b8ff8cd791981 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 26 Jun 2019 16:45:39 +0200 Subject: [PATCH] Sync with commercial distribution --- jOOQ/src/main/java/org/jooq/Constants.java | 4 +- .../java/org/jooq/ConstraintTypeStep.java | 4 +- jOOQ/src/main/java/org/jooq/DSLContext.java | 36 +++++++------- .../java/org/jooq/DeleteReturningStep.java | 4 +- .../java/org/jooq/InsertReturningStep.java | 4 +- .../src/main/java/org/jooq/InsertSetStep.java | 4 +- .../main/java/org/jooq/MergeUsingStep.java | 4 +- jOOQ/src/main/java/org/jooq/Name.java | 4 +- jOOQ/src/main/java/org/jooq/Record.java | 4 +- jOOQ/src/main/java/org/jooq/Result.java | 4 +- jOOQ/src/main/java/org/jooq/ResultQuery.java | 4 +- .../main/java/org/jooq/SelectOrderByStep.java | 4 +- jOOQ/src/main/java/org/jooq/UpdateQuery.java | 4 +- .../java/org/jooq/UpdateReturningStep.java | 4 +- jOOQ/src/main/java/org/jooq/WithStep.java | 20 ++++---- .../main/java/org/jooq/impl/AbstractName.java | 4 +- .../java/org/jooq/impl/AbstractRecord.java | 4 +- .../org/jooq/impl/AbstractResultQuery.java | 4 +- .../java/org/jooq/impl/ConstraintImpl.java | 8 ++-- jOOQ/src/main/java/org/jooq/impl/DSL.java | 48 +++++++++---------- .../java/org/jooq/impl/DefaultDSLContext.java | 36 +++++++------- .../main/java/org/jooq/impl/DeleteImpl.java | 4 +- .../org/jooq/impl/DerivedColumnListImpl.java | 4 +- .../main/java/org/jooq/impl/MergeImpl.java | 20 ++++---- .../main/java/org/jooq/impl/ResultImpl.java | 4 +- .../main/java/org/jooq/impl/SelectImpl.java | 16 +++---- .../main/java/org/jooq/impl/UpdateImpl.java | 8 ++-- .../java/org/jooq/impl/UpdateQueryImpl.java | 4 +- .../src/main/java/org/jooq/impl/WithImpl.java | 24 +++++----- 29 files changed, 148 insertions(+), 148 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java index 98c763298e..a2df35f530 100644 --- a/jOOQ/src/main/java/org/jooq/Constants.java +++ b/jOOQ/src/main/java/org/jooq/Constants.java @@ -105,14 +105,14 @@ public final class Constants { */ public static final String NS_CODEGEN = "http://www.jooq.org/xsd/" + XSD_CODEGEN; - // [jooq-tools] START [max-row-degree] + /** * The maximum degree of {@link Row} and {@link Record} subtypes */ public static final int MAX_ROW_DEGREE = 22; - // [jooq-tools] END [max-row-degree] + /** * No further instances diff --git a/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java b/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java index 483dd5db3f..f9308a7469 100644 --- a/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java +++ b/jOOQ/src/main/java/org/jooq/ConstraintTypeStep.java @@ -119,7 +119,7 @@ public interface ConstraintTypeStep extends ConstraintFinalStep { @Support ConstraintForeignKeyReferencesStepN foreignKey(Field... fields); - // [jooq-tools] START [foreignKey] + /** * Add a FOREIGN KEY clause to the CONSTRAINT. @@ -517,7 +517,7 @@ public interface ConstraintTypeStep extends ConstraintFinalStep { @Support ConstraintForeignKeyReferencesStep22 foreignKey(String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13, String field14, String field15, String field16, String field17, String field18, String field19, String field20, String field21, String field22); - // [jooq-tools] END [foreignKey] + /** * Create a UNIQUE constraint. diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index 53bf96f1ce..6faac95a7c 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -3918,7 +3918,7 @@ public interface DSLContext extends Scope , AutoCloseable { WithAsStep with(String alias, BiFunction, ? super Integer, ? extends String> fieldNameFunction); - // [jooq-tools] START [with] + /** * Create a WITH clause to supply subsequent @@ -4624,7 +4624,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) WithAsStep22 with(Name alias, Name fieldAlias1, Name fieldAlias2, Name fieldAlias3, Name fieldAlias4, Name fieldAlias5, Name fieldAlias6, Name fieldAlias7, Name fieldAlias8, Name fieldAlias9, Name fieldAlias10, Name fieldAlias11, Name fieldAlias12, Name fieldAlias13, Name fieldAlias14, Name fieldAlias15, Name fieldAlias16, Name fieldAlias17, Name fieldAlias18, Name fieldAlias19, Name fieldAlias20, Name fieldAlias21, Name fieldAlias22); - // [jooq-tools] END [with] + /** * Create a WITH clause to supply subsequent @@ -4756,7 +4756,7 @@ public interface DSLContext extends Scope , AutoCloseable { WithAsStep withRecursive(String alias, BiFunction, ? super Integer, ? extends String> fieldNameFunction); - // [jooq-tools] START [with-recursive] + /** * Create a WITH clause to supply subsequent @@ -5462,7 +5462,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) WithAsStep22 withRecursive(Name alias, Name fieldAlias1, Name fieldAlias2, Name fieldAlias3, Name fieldAlias4, Name fieldAlias5, Name fieldAlias6, Name fieldAlias7, Name fieldAlias8, Name fieldAlias9, Name fieldAlias10, Name fieldAlias11, Name fieldAlias12, Name fieldAlias13, Name fieldAlias14, Name fieldAlias15, Name fieldAlias16, Name fieldAlias17, Name fieldAlias18, Name fieldAlias19, Name fieldAlias20, Name fieldAlias21, Name fieldAlias22); - // [jooq-tools] END [with-recursive] + /** * Create a WITH clause to supply subsequent @@ -5656,7 +5656,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support SelectSelectStep select(SelectFieldOrAsterisk... fields); - // [jooq-tools] START [select] + /** * Create a new DSL select statement. @@ -6296,7 +6296,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support SelectSelectStep> select(SelectField field1, SelectField field2, SelectField field3, SelectField field4, SelectField field5, SelectField field6, SelectField field7, SelectField field8, SelectField field9, SelectField field10, SelectField field11, SelectField field12, SelectField field13, SelectField field14, SelectField field15, SelectField field16, SelectField field17, SelectField field18, SelectField field19, SelectField field20, SelectField field21, SelectField field22); - // [jooq-tools] END [select] + /** * Create a new DSL select statement. @@ -6364,7 +6364,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support SelectSelectStep selectDistinct(SelectFieldOrAsterisk... fields); - // [jooq-tools] START [selectDistinct] + /** * Create a new DSL select statement. @@ -7004,7 +7004,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support SelectSelectStep> selectDistinct(SelectField field1, SelectField field2, SelectField field3, SelectField field4, SelectField field5, SelectField field6, SelectField field7, SelectField field8, SelectField field9, SelectField field10, SelectField field11, SelectField field12, SelectField field13, SelectField field14, SelectField field15, SelectField field16, SelectField field17, SelectField field18, SelectField field19, SelectField field20, SelectField field21, SelectField field22); - // [jooq-tools] END [selectDistinct] + /** * Create a new DSL select statement for a constant 0 literal. @@ -7128,7 +7128,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support InsertSetStep insertInto(Table into); - // [jooq-tools] START [insert] + /** * Create a new DSL insert statement. @@ -7504,7 +7504,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support InsertValuesStep22 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); - // [jooq-tools] END [insert] + /** * Create a new DSL insert statement. @@ -7654,7 +7654,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeUsingStep mergeInto(Table table); - // [jooq-tools] START [merge] + /** * Create a new DSL UPSERT statement ({@link SQLDialect#H2} @@ -7854,7 +7854,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep22 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); - // [jooq-tools] END [merge] + /** * Create a new DSL UPSERT statement ({@link SQLDialect#H2} @@ -10164,7 +10164,7 @@ public interface DSLContext extends Scope , AutoCloseable { */ Record newRecord(Collection> fields); - // [jooq-tools] START [newRecord] + /** * Create a new empty {@link Record}. @@ -10408,7 +10408,7 @@ public interface DSLContext extends Scope , AutoCloseable { */ Record22 newRecord(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); - // [jooq-tools] END [newRecord] + /** * Create a new empty {@link Result}. @@ -10446,7 +10446,7 @@ public interface DSLContext extends Scope , AutoCloseable { */ Result newResult(Collection> fields); - // [jooq-tools] START [newResult] + /** * Create a new empty {@link Result}. @@ -10690,7 +10690,7 @@ public interface DSLContext extends Scope , AutoCloseable { */ Result> newResult(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); - // [jooq-tools] END [newResult] + // ------------------------------------------------------------------------- // XXX Executing queries @@ -11315,7 +11315,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support Record fetchSingle(Collection> fields) throws DataAccessException; - // [jooq-tools] START [fetch-single] + /** * Execute and return exactly one record for @@ -11691,7 +11691,7 @@ public interface DSLContext extends Scope , AutoCloseable { @Support Record22 fetchSingle(SelectField field1, SelectField field2, SelectField field3, SelectField field4, SelectField field5, SelectField field6, SelectField field7, SelectField field8, SelectField field9, SelectField field10, SelectField field11, SelectField field12, SelectField field13, SelectField field14, SelectField field15, SelectField field16, SelectField field17, SelectField field18, SelectField field19, SelectField field20, SelectField field21, SelectField field22) throws DataAccessException; - // [jooq-tools] END [fetch-single] + /** diff --git a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java index 2dc0a2f48a..fa02968c42 100644 --- a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java +++ b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java @@ -157,7 +157,7 @@ public interface DeleteReturningStep extends DeleteFinalStep returningResult(Collection fields); - // [jooq-tools] START [returning] + /** * Configure the DELETE statement to return a list of fields in @@ -401,6 +401,6 @@ public interface DeleteReturningStep extends DeleteFinalStep DeleteResultStep> returningResult(SelectField field1, SelectField field2, SelectField field3, SelectField field4, SelectField field5, SelectField field6, SelectField field7, SelectField field8, SelectField field9, SelectField field10, SelectField field11, SelectField field12, SelectField field13, SelectField field14, SelectField field15, SelectField field16, SelectField field17, SelectField field18, SelectField field19, SelectField field20, SelectField field21, SelectField field22); - // [jooq-tools] END [returning] + } diff --git a/jOOQ/src/main/java/org/jooq/InsertReturningStep.java b/jOOQ/src/main/java/org/jooq/InsertReturningStep.java index a9a3791501..d6c5b8a263 100644 --- a/jOOQ/src/main/java/org/jooq/InsertReturningStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertReturningStep.java @@ -169,7 +169,7 @@ public interface InsertReturningStep extends InsertFinalStep returningResult(Collection fields); - // [jooq-tools] START [returning] + /** * Configure the INSERT statement to return a list of fields in @@ -435,6 +435,6 @@ public interface InsertReturningStep extends InsertFinalStep InsertResultStep> returningResult(SelectField field1, SelectField field2, SelectField field3, SelectField field4, SelectField field5, SelectField field6, SelectField field7, SelectField field8, SelectField field9, SelectField field10, SelectField field11, SelectField field12, SelectField field13, SelectField field14, SelectField field15, SelectField field16, SelectField field17, SelectField field18, SelectField field19, SelectField field20, SelectField field21, SelectField field22); - // [jooq-tools] END [returning] + } diff --git a/jOOQ/src/main/java/org/jooq/InsertSetStep.java b/jOOQ/src/main/java/org/jooq/InsertSetStep.java index 3f688bfb22..564a9b128f 100644 --- a/jOOQ/src/main/java/org/jooq/InsertSetStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertSetStep.java @@ -112,7 +112,7 @@ public interface InsertSetStep { @Support InsertValuesStepN columns(Collection> fields); - // [jooq-tools] START [columns] + /** * Set the columns for insert. @@ -246,7 +246,7 @@ public interface InsertSetStep { @Support InsertValuesStep22 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); - // [jooq-tools] END [columns] + /** * Set a value for a field in the INSERT statement. diff --git a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java index 7e10886dc3..2c792c1cd1 100644 --- a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java +++ b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java @@ -161,7 +161,7 @@ public interface MergeUsingStep extends MergeKeyStepN { @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL }) MergeKeyStepN columns(Collection> fields); - // [jooq-tools] START [columns] + /** * Create a new DSL UPSERT statement ({@link SQLDialect#H2} @@ -361,6 +361,6 @@ public interface MergeUsingStep extends MergeKeyStepN { @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep22 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); - // [jooq-tools] END [columns] + } diff --git a/jOOQ/src/main/java/org/jooq/Name.java b/jOOQ/src/main/java/org/jooq/Name.java index 3627f604d4..78346e9e0b 100644 --- a/jOOQ/src/main/java/org/jooq/Name.java +++ b/jOOQ/src/main/java/org/jooq/Name.java @@ -276,7 +276,7 @@ public interface Name extends QueryPart { DerivedColumnList fields(BiFunction, ? super Integer, ? extends String> fieldNameFunction); - // [jooq-tools] START [fields] + /** * Add a list of fields to this name to make this name a @@ -762,7 +762,7 @@ public interface Name extends QueryPart { @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) DerivedColumnList22 fields(Name fieldName1, Name fieldName2, Name fieldName3, Name fieldName4, Name fieldName5, Name fieldName6, Name fieldName7, Name fieldName8, Name fieldName9, Name fieldName10, Name fieldName11, Name fieldName12, Name fieldName13, Name fieldName14, Name fieldName15, Name fieldName16, Name fieldName17, Name fieldName18, Name fieldName19, Name fieldName20, Name fieldName21, Name fieldName22); - // [jooq-tools] END [fields] + @Override boolean equals(Object other); diff --git a/jOOQ/src/main/java/org/jooq/Record.java b/jOOQ/src/main/java/org/jooq/Record.java index f6d2e79803..742326942b 100644 --- a/jOOQ/src/main/java/org/jooq/Record.java +++ b/jOOQ/src/main/java/org/jooq/Record.java @@ -725,7 +725,7 @@ public interface Record extends Attachable, Comparable, Formattable { */ Record into(Field... fields); - // [jooq-tools] START [into-fields] + /** * Copy this record into a new record holding only a subset of the previous @@ -925,7 +925,7 @@ public interface Record extends Attachable, Comparable, Formattable { */ Record22 into(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); - // [jooq-tools] END [into-fields] + /** * Map resulting records onto a custom type. diff --git a/jOOQ/src/main/java/org/jooq/Result.java b/jOOQ/src/main/java/org/jooq/Result.java index 4a23b0ff0a..c35931aab4 100644 --- a/jOOQ/src/main/java/org/jooq/Result.java +++ b/jOOQ/src/main/java/org/jooq/Result.java @@ -2482,7 +2482,7 @@ public interface Result extends List, Attachable, Formattab */ Result into(Field... fields); - // [jooq-tools] START [into-fields] + /** * Copy all records from this result into a new result with new records @@ -2660,7 +2660,7 @@ public interface Result extends List, Attachable, Formattab */ Result> into(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); - // [jooq-tools] END [into-fields] + /** * Map resulting records onto a custom type. diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java index 50f5f3841d..31b161995a 100644 --- a/jOOQ/src/main/java/org/jooq/ResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java @@ -3939,7 +3939,7 @@ extends */ ResultQuery coerce(Collection> fields); - // [jooq-tools] START [coerce] + /** * Coerce the result record type of this query to that of a set of fields. @@ -4051,6 +4051,6 @@ extends */ ResultQuery> coerce(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); - // [jooq-tools] END [coerce] + } diff --git a/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java b/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java index 62a79fac0f..7629c4609d 100644 --- a/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectOrderByStep.java @@ -105,7 +105,7 @@ import java.util.Collection; */ public interface SelectOrderByStep extends SelectLimitStep { - // [jooq-tools] START [order-by-orderfield-array] + /** * Add an ORDER BY clause to the query. @@ -239,7 +239,7 @@ public interface SelectOrderByStep extends SelectLimitStep @Support SelectSeekStep22 orderBy(OrderField field1, OrderField field2, OrderField field3, OrderField field4, OrderField field5, OrderField field6, OrderField field7, OrderField field8, OrderField field9, OrderField field10, OrderField field11, OrderField field12, OrderField field13, OrderField field14, OrderField field15, OrderField field16, OrderField field17, OrderField field18, OrderField field19, OrderField field20, OrderField field21, OrderField field22); - // [jooq-tools] END [order-by-orderfield-array] + /** * Add an ORDER BY clause to the query diff --git a/jOOQ/src/main/java/org/jooq/UpdateQuery.java b/jOOQ/src/main/java/org/jooq/UpdateQuery.java index 69c9e6fc64..9283dbfa44 100644 --- a/jOOQ/src/main/java/org/jooq/UpdateQuery.java +++ b/jOOQ/src/main/java/org/jooq/UpdateQuery.java @@ -68,7 +68,7 @@ import java.util.Collection; @SuppressWarnings("deprecation") public interface UpdateQuery extends StoreQuery, ConditionProvider, Update { - // [jooq-tools] START [addValues] + /** * Specify a multi-column set clause for the UPDATE statement. @@ -346,7 +346,7 @@ public interface UpdateQuery extends StoreQuery, ConditionP @Support({ H2, HSQLDB }) void addValues(RowN row, Select select); - // [jooq-tools] END [addValues] + /** * Add tables to the table product. diff --git a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java index 2e82579f5a..18dcfa6305 100644 --- a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java +++ b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java @@ -165,7 +165,7 @@ public interface UpdateReturningStep extends UpdateFinalStep returningResult(Collection fields); - // [jooq-tools] START [returning] + /** * Configure the UPDATE statement to return a list of fields in @@ -431,6 +431,6 @@ public interface UpdateReturningStep extends UpdateFinalStep UpdateResultStep> returningResult(SelectField field1, SelectField field2, SelectField field3, SelectField field4, SelectField field5, SelectField field6, SelectField field7, SelectField field8, SelectField field9, SelectField field10, SelectField field11, SelectField field12, SelectField field13, SelectField field14, SelectField field15, SelectField field16, SelectField field17, SelectField field18, SelectField field19, SelectField field20, SelectField field21, SelectField field22); - // [jooq-tools] END [returning] + } diff --git a/jOOQ/src/main/java/org/jooq/WithStep.java b/jOOQ/src/main/java/org/jooq/WithStep.java index 78259d0aa5..8b66fd0e14 100644 --- a/jOOQ/src/main/java/org/jooq/WithStep.java +++ b/jOOQ/src/main/java/org/jooq/WithStep.java @@ -148,7 +148,7 @@ public interface WithStep extends QueryPart { WithAsStep with(String alias, BiFunction, ? super Integer, ? extends String> fieldNameFunction); - // [jooq-tools] START [with] + /** * Add another common table expression to the WITH clause. @@ -414,7 +414,7 @@ public interface WithStep extends QueryPart { @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) WithAsStep22 with(Name alias, Name fieldAlias1, Name fieldAlias2, Name fieldAlias3, Name fieldAlias4, Name fieldAlias5, Name fieldAlias6, Name fieldAlias7, Name fieldAlias8, Name fieldAlias9, Name fieldAlias10, Name fieldAlias11, Name fieldAlias12, Name fieldAlias13, Name fieldAlias14, Name fieldAlias15, Name fieldAlias16, Name fieldAlias17, Name fieldAlias18, Name fieldAlias19, Name fieldAlias20, Name fieldAlias21, Name fieldAlias22); - // [jooq-tools] END [with] + /** * Add another common table expression to the WITH clause. @@ -584,7 +584,7 @@ public interface WithStep extends QueryPart { @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) SelectSelectStep select(SelectFieldOrAsterisk... fields); - // [jooq-tools] START [select] + /** * Create a new DSL select statement. @@ -1246,7 +1246,7 @@ public interface WithStep extends QueryPart { @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) SelectSelectStep> select(SelectField field1, SelectField field2, SelectField field3, SelectField field4, SelectField field5, SelectField field6, SelectField field7, SelectField field8, SelectField field9, SelectField field10, SelectField field11, SelectField field12, SelectField field13, SelectField field14, SelectField field15, SelectField field16, SelectField field17, SelectField field18, SelectField field19, SelectField field20, SelectField field21, SelectField field22); - // [jooq-tools] END [select] + /** * Create a new DSL select statement. @@ -1296,7 +1296,7 @@ public interface WithStep extends QueryPart { @Support({ FIREBIRD, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) SelectSelectStep selectDistinct(SelectFieldOrAsterisk... fields); - // [jooq-tools] START [selectDistinct] + /** * Create a new DSL select statement. @@ -1958,7 +1958,7 @@ public interface WithStep extends QueryPart { @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) SelectSelectStep> selectDistinct(SelectField field1, SelectField field2, SelectField field3, SelectField field4, SelectField field5, SelectField field6, SelectField field7, SelectField field8, SelectField field9, SelectField field10, SelectField field11, SelectField field12, SelectField field13, SelectField field14, SelectField field15, SelectField field16, SelectField field17, SelectField field18, SelectField field19, SelectField field20, SelectField field21, SelectField field22); - // [jooq-tools] END [selectDistinct] + /** * Create a new DSL select statement for a constant 0 literal. @@ -2058,7 +2058,7 @@ public interface WithStep extends QueryPart { @Support({ POSTGRES, SQLITE }) InsertSetStep insertInto(Table into); - // [jooq-tools] START [insert] + /** * Create a new DSL insert statement. @@ -2456,7 +2456,7 @@ public interface WithStep extends QueryPart { @Support({ POSTGRES, SQLITE }) InsertValuesStep22 insertInto(Table into, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); - // [jooq-tools] END [insert] + /** * Create a new DSL insert statement. @@ -2597,7 +2597,7 @@ public interface WithStep extends QueryPart { @Support({}) MergeUsingStep mergeInto(Table table); - // [jooq-tools] START [merge] + /** * Create a new DSL merge statement (H2-specific syntax). @@ -3105,7 +3105,7 @@ public interface WithStep extends QueryPart { @Support({}) MergeKeyStep22 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); - // [jooq-tools] END [merge] + /** * Create a new DSL merge statement (H2-specific syntax). diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractName.java b/jOOQ/src/main/java/org/jooq/impl/AbstractName.java index 59260b143b..f062bd60e4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractName.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractName.java @@ -120,7 +120,7 @@ abstract class AbstractName extends AbstractQueryPart implements Name { - // [jooq-tools] START [fields] + @Override public final DerivedColumnListImpl fields(String fieldName1) { @@ -342,7 +342,7 @@ abstract class AbstractName extends AbstractQueryPart implements Name { return fields(new Name[] { fieldName1, fieldName2, fieldName3, fieldName4, fieldName5, fieldName6, fieldName7, fieldName8, fieldName9, fieldName10, fieldName11, fieldName12, fieldName13, fieldName14, fieldName15, fieldName16, fieldName17, fieldName18, fieldName19, fieldName20, fieldName21, fieldName22 }); } - // [jooq-tools] END [fields] + // ------------------------------------------------------------------------ // XXX: Object API diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java index bf1e13bab7..0aeb46ce54 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRecord.java @@ -612,7 +612,7 @@ abstract class AbstractRecord extends AbstractStore implements Record { return Tools.newRecord(fetched, Record.class, f, configuration()).operate(new TransferRecordState(f)); } - // [jooq-tools] START [into-fields] + @Override public final Record1 into(Field field1) { @@ -724,7 +724,7 @@ abstract class AbstractRecord extends AbstractStore implements Record { return (Record22) into(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [into-fields] + @Override public final E into(Class type) { diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java index cda6512b90..f9dfe20e06 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java @@ -1605,7 +1605,7 @@ abstract class AbstractResultQuery extends AbstractQuery imple return (ResultQuery) this; } - // [jooq-tools] START [coerce] + @Override @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -1739,6 +1739,6 @@ abstract class AbstractResultQuery extends AbstractQuery imple return (ResultQuery) coerce(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [coerce] + } diff --git a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java index 5d6484deea..ce7831a48d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java @@ -111,7 +111,7 @@ implements , ConstraintForeignKeyOnStep , ConstraintForeignKeyReferencesStepN -// [jooq-tools] START [implements] + , ConstraintForeignKeyReferencesStep1 , ConstraintForeignKeyReferencesStep2 , ConstraintForeignKeyReferencesStep3 @@ -135,7 +135,7 @@ implements , ConstraintForeignKeyReferencesStep21 , ConstraintForeignKeyReferencesStep22 -// [jooq-tools] END [implements] + { @@ -436,7 +436,7 @@ implements return this; } - // [jooq-tools] START [foreignKey] + @Override public final ConstraintImpl foreignKey(Field field1) { @@ -1098,7 +1098,7 @@ implements return references(table, new String[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [foreignKey] + enum Action { NO_ACTION("no action"), diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 277c5ccc44..c75bf4357c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -812,7 +812,7 @@ public class DSL { } - // [jooq-tools] START [with] + /** * Create a WITH clause to supply subsequent @@ -1606,7 +1606,7 @@ public class DSL { return new WithImpl(null, false).with(alias, fieldAlias1, fieldAlias2, fieldAlias3, fieldAlias4, fieldAlias5, fieldAlias6, fieldAlias7, fieldAlias8, fieldAlias9, fieldAlias10, fieldAlias11, fieldAlias12, fieldAlias13, fieldAlias14, fieldAlias15, fieldAlias16, fieldAlias17, fieldAlias18, fieldAlias19, fieldAlias20, fieldAlias21, fieldAlias22); } - // [jooq-tools] END [with] + /** * Create a WITH clause to supply subsequent @@ -1742,7 +1742,7 @@ public class DSL { } - // [jooq-tools] START [with-recursive] + /** * Create a WITH clause to supply subsequent @@ -2536,7 +2536,7 @@ public class DSL { return new WithImpl(null, true).with(alias, fieldAlias1, fieldAlias2, fieldAlias3, fieldAlias4, fieldAlias5, fieldAlias6, fieldAlias7, fieldAlias8, fieldAlias9, fieldAlias10, fieldAlias11, fieldAlias12, fieldAlias13, fieldAlias14, fieldAlias15, fieldAlias16, fieldAlias17, fieldAlias18, fieldAlias19, fieldAlias20, fieldAlias21, fieldAlias22); } - // [jooq-tools] END [with-recursive] + /** * Create a WITH clause to supply subsequent @@ -2814,7 +2814,7 @@ public class DSL { return dsl().select(fields); } - // [jooq-tools] START [select] + /** * Create a new DSL subselect statement. @@ -3630,7 +3630,7 @@ public class DSL { return (SelectSelectStep) select(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [select] + /** * Create a new DSL subselect statement. @@ -3712,7 +3712,7 @@ public class DSL { return dsl().selectDistinct(fields); } - // [jooq-tools] START [selectDistinct] + /** * Create a new DSL subselect statement. @@ -4528,7 +4528,7 @@ public class DSL { return (SelectSelectStep) selectDistinct(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [selectDistinct] + /** * Create a new DSL subselect statement for a constant 0 @@ -4661,7 +4661,7 @@ public class DSL { return dsl().insertInto(into); } - // [jooq-tools] START [insert] + /** * Create a new DSL insert statement. @@ -5257,7 +5257,7 @@ public class DSL { return (InsertValuesStep22) insertInto(into, new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [insert] + /** * Create a new DSL insert statement. @@ -5431,7 +5431,7 @@ public class DSL { return dsl().mergeInto(table); } - // [jooq-tools] START [merge] + /** * Create a new DSL UPSERT statement ({@link SQLDialect#H2} @@ -5675,7 +5675,7 @@ public class DSL { return using(new DefaultConfiguration()).mergeInto(table, field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22); } - // [jooq-tools] END [merge] + /** * Create a new DSL merge statement (H2-specific syntax). @@ -5931,7 +5931,7 @@ public class DSL { return constraint().foreignKey(fields); } - // [jooq-tools] START [foreignKey] + /** * Add an unnamed (system named) FOREIGN KEY clause to the CONSTRAINT. @@ -6461,7 +6461,7 @@ public class DSL { return constraint().foreignKey(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22); } - // [jooq-tools] END [foreignKey] + /** * Create an unnamed (system named) UNIQUE constraint. @@ -11729,7 +11729,7 @@ public class DSL { return field instanceof Field ? (Field) field : field("{0}", field.getDataType(), field); } - // [jooq-tools] START [row-field] + /** * EXPERIMENTAL: Turn a row value expression of degree 1 into a {@code Field}. @@ -11995,7 +11995,7 @@ public class DSL { return new RowField, Record22>(row); } - // [jooq-tools] END [row-field] + /** * EXPERIMENTAL: Turn a row value expression of arbitrary degree into a {@code Field}. @@ -20722,7 +20722,7 @@ public class DSL { return new Fields(fields); } - // [jooq-tools] START [record-type] + /** * Create a {@link RecordType} of degree 1. @@ -20878,9 +20878,9 @@ public class DSL { return new Fields(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22); } - // [jooq-tools] END [record-type] - // [jooq-tools] START [row-value] + + /** * Create a row value expression of degree 1. @@ -21146,7 +21146,7 @@ public class DSL { return row(Tools.field(t1), Tools.field(t2), Tools.field(t3), Tools.field(t4), Tools.field(t5), Tools.field(t6), Tools.field(t7), Tools.field(t8), Tools.field(t9), Tools.field(t10), Tools.field(t11), Tools.field(t12), Tools.field(t13), Tools.field(t14), Tools.field(t15), Tools.field(t16), Tools.field(t17), Tools.field(t18), Tools.field(t19), Tools.field(t20), Tools.field(t21), Tools.field(t22)); } - // [jooq-tools] END [row-value] + /** * Create a row value expression of degree N > 22. @@ -21160,7 +21160,7 @@ public class DSL { return row(Tools.fields(values).toArray(EMPTY_FIELD)); } - // [jooq-tools] START [row-expression] + /** * Create a row value expression of degree 1. @@ -21426,7 +21426,7 @@ public class DSL { return new RowImpl(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, t20, t21, t22); } - // [jooq-tools] END [row-expression] + /** * Create a row value expression of degree N > 22. @@ -21500,7 +21500,7 @@ public class DSL { return new Values(rows).as("v", columns); } - // [jooq-tools] START [values] + /** * Create a VALUES() expression of degree 1. @@ -22250,7 +22250,7 @@ public class DSL { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c15", "c16", "c17", "c18", "c19", "c20", "c21", "c22"); } - // [jooq-tools] END [values] + // ------------------------------------------------------------------------- // XXX Literals diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index d24253a1e5..39ec35470c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -1579,7 +1579,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri } - // [jooq-tools] START [with] + @Override public WithAsStep1 with(String alias, String fieldAlias1) { @@ -1801,7 +1801,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return new WithImpl(configuration(), false).with(alias, fieldAlias1, fieldAlias2, fieldAlias3, fieldAlias4, fieldAlias5, fieldAlias6, fieldAlias7, fieldAlias8, fieldAlias9, fieldAlias10, fieldAlias11, fieldAlias12, fieldAlias13, fieldAlias14, fieldAlias15, fieldAlias16, fieldAlias17, fieldAlias18, fieldAlias19, fieldAlias20, fieldAlias21, fieldAlias22); } - // [jooq-tools] END [with] + @Override public WithStep with(CommonTableExpression... tables) { @@ -1840,7 +1840,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri } - // [jooq-tools] START [with-recursive] + @Override public WithAsStep1 withRecursive(String alias, String fieldAlias1) { @@ -2062,7 +2062,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return new WithImpl(configuration(), true).with(alias, fieldAlias1, fieldAlias2, fieldAlias3, fieldAlias4, fieldAlias5, fieldAlias6, fieldAlias7, fieldAlias8, fieldAlias9, fieldAlias10, fieldAlias11, fieldAlias12, fieldAlias13, fieldAlias14, fieldAlias15, fieldAlias16, fieldAlias17, fieldAlias18, fieldAlias19, fieldAlias20, fieldAlias21, fieldAlias22); } - // [jooq-tools] END [with-recursive] + @Override public WithStep withRecursive(CommonTableExpression... tables) { @@ -2109,7 +2109,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return new SelectImpl(configuration(), null).select(fields); } - // [jooq-tools] START [select] + @Override public SelectSelectStep> select(SelectField field1) { @@ -2221,7 +2221,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return (SelectSelectStep) select(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [select] + @Override public SelectSelectStep selectDistinct(Collection fields) { @@ -2233,7 +2233,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return new SelectImpl(configuration(), null, true).select(fields); } - // [jooq-tools] START [selectDistinct] + @Override public SelectSelectStep> selectDistinct(SelectField field1) { @@ -2345,7 +2345,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return (SelectSelectStep) selectDistinct(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [selectDistinct] + @Override public SelectSelectStep> selectZero() { @@ -2382,7 +2382,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return new InsertImpl(configuration(), null, into, Collections.>emptyList()); } - // [jooq-tools] START [insert] + @Override public InsertValuesStep1 insertInto(Table into, Field field1) { @@ -2494,7 +2494,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return new InsertImpl(configuration(), null, into, Arrays.asList(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 })); } - // [jooq-tools] END [insert] + @Override public InsertValuesStepN insertInto(Table into, Field... fields) { @@ -2521,7 +2521,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return new MergeImpl(configuration(), null, table); } - // [jooq-tools] START [merge] + @Override public MergeKeyStep1 mergeInto(Table table, Field field1) { @@ -2633,7 +2633,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22)); } - // [jooq-tools] END [merge] + @Override public MergeKeyStepN mergeInto(Table table, Field... fields) { @@ -3804,7 +3804,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return newRecord(fields.toArray(EMPTY_FIELD)); } - // [jooq-tools] START [newRecord] + @Override public Record1 newRecord(Field field1) { @@ -3916,7 +3916,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return (Record22) newRecord(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [newRecord] + @Override public > R newRecord(UDT type) { @@ -3956,7 +3956,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return new ResultImpl(configuration(), fields); } - // [jooq-tools] START [newResult] + @Override public Result> newResult(Field field1) { @@ -4068,7 +4068,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return (Result) newResult(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [newResult] + // ------------------------------------------------------------------------- // XXX Executing queries @@ -4398,7 +4398,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return fetchSingle(DSL.select(fields)); } - // [jooq-tools] START [fetch-single] + @Override public Record1 fetchSingle(SelectField field1) { @@ -4510,7 +4510,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri return (Record22) fetchSingle(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [fetch-single] + @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java index 6253244a84..1df3a8b326 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java @@ -354,7 +354,7 @@ final class DeleteImpl return this; } - // [jooq-tools] START [returning] + @Override public final DeleteResultStep> returningResult(SelectField field1) { @@ -466,7 +466,7 @@ final class DeleteImpl return returningResult(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [returning] + @Override public final Result fetch() { diff --git a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java index 2e31dd22a7..d93b99bf3d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java @@ -75,7 +75,7 @@ import org.jooq.Select; final class DerivedColumnListImpl extends AbstractQueryPart implements - // [jooq-tools] START [implements-derived-column-list] + DerivedColumnList1, DerivedColumnList2, DerivedColumnList3, @@ -99,7 +99,7 @@ implements DerivedColumnList21, DerivedColumnList22, - // [jooq-tools] END [implements-derived-column-list] + DerivedColumnList { diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java index 4f9483f688..a76964c769 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java @@ -171,7 +171,7 @@ implements // Cascading interface implementations for Merge behaviour MergeUsingStep, - // [jooq-tools] START [implementsKeyStep] + MergeKeyStep1, MergeKeyStep2, @@ -196,7 +196,7 @@ implements MergeKeyStep21, MergeKeyStep22, - // [jooq-tools] END [implementsKeyStep] + MergeOnStep, MergeOnConditionStep, @@ -204,7 +204,7 @@ implements MergeMatchedDeleteStep, MergeNotMatchedSetMoreStep, - // [jooq-tools] START [implementsNotMatchedValuesStep] + MergeNotMatchedValuesStep1, MergeNotMatchedValuesStep2, @@ -229,7 +229,7 @@ implements MergeNotMatchedValuesStep21, MergeNotMatchedValuesStep22, - // [jooq-tools] END [implementsNotMatchedValuesStep] + MergeNotMatchedValuesStepN { @@ -317,7 +317,7 @@ implements return this; } - // [jooq-tools] START [columns] + @Override @SuppressWarnings("hiding") @@ -451,7 +451,7 @@ implements return columns(Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22)); } - // [jooq-tools] END [columns] + @Override public final MergeImpl select(Select select) { @@ -476,7 +476,7 @@ implements // Shared MERGE API // ------------------------------------------------------------------------- - // [jooq-tools] START [values] + @Override public final MergeImpl values(T1 value1) { @@ -699,7 +699,7 @@ implements return values(new Field[] { value1, value2, value3, value4, value5, value6, value7, value8, value9, value10, value11, value12, value13, value14, value15, value16, value17, value18, value19, value20, value21, value22 }); } - // [jooq-tools] END [values] + @Override public final MergeImpl values(Object... values) { @@ -974,7 +974,7 @@ implements return whenNotMatchedThenInsert(Collections.>emptyList()); } - // [jooq-tools] START [whenNotMatchedThenInsert] + @Override @SuppressWarnings("hiding") @@ -1109,7 +1109,7 @@ implements } - // [jooq-tools] END [whenNotMatchedThenInsert] + @Override public final MergeImpl whenNotMatchedThenInsert(Field... fields) { diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java index 9b8a1413a4..4c7e76a440 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java @@ -1161,7 +1161,7 @@ final class ResultImpl extends AbstractCursor implements Re return result; } - // [jooq-tools] START [into-fields] + @Override public final Result> into(Field field1) { @@ -1273,7 +1273,7 @@ final class ResultImpl extends AbstractCursor implements Re return (Result) into(new Field[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [into-fields] + @Override public final List into(Class type) { diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java index 205273c5f1..7a69100177 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java @@ -173,7 +173,7 @@ final class SelectImpl, SelectQualifyConditionStep, - // [jooq-tools] START [implements-select-seek-step] + SelectSeekStep1, SelectSeekStep2, SelectSeekStep3, @@ -197,7 +197,7 @@ final class SelectImpl, SelectSeekStep22, - // [jooq-tools] END [implements-select-seek-step] + SelectSeekStepN, SelectSeekLimitStep, @@ -718,7 +718,7 @@ final class SelectImpl... fields) { @@ -871,7 +871,7 @@ final class SelectImpl seek(Object t1) { @@ -1577,7 +1577,7 @@ final class SelectImpl> seekValues(Object[] values) { if (getQuery() instanceof SelectQueryImpl) { @@ -3949,7 +3949,7 @@ final class SelectImpl return set(Tools.mapOfChangedValues(record)); } - // [jooq-tools] START [set] + @Override public final UpdateFromStep set(Row1 row, Row1 value) { @@ -456,7 +456,7 @@ final class UpdateImpl return this; } - // [jooq-tools] END [set] + @Override public final UpdateWhereStep from(TableLike table) { @@ -747,7 +747,7 @@ final class UpdateImpl return this; } - // [jooq-tools] START [returning] + @Override public final UpdateResultStep> returningResult(SelectField field1) { @@ -859,7 +859,7 @@ final class UpdateImpl return returningResult(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [returning] + @Override public final Result fetch() { diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java index 1259b92aca..087e80c6aa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java @@ -183,7 +183,7 @@ final class UpdateQueryImpl extends AbstractStoreQuery impl return updateMap; } - // [jooq-tools] START [addValues] + @Override public final void addValues(Row1 row, Row1 value) { @@ -415,7 +415,7 @@ final class UpdateQueryImpl extends AbstractStoreQuery impl addValues0(row, select); } - // [jooq-tools] END [addValues] + private final void addValues0(Row row, Row value) { multiRow = row; diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java index 571bd4a151..c6e311f76d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java @@ -132,7 +132,7 @@ final class WithImpl extends AbstractQueryPart implements WithAsStep, - // [jooq-tools] START [implements-with-as-step] + WithAsStep1, WithAsStep2, WithAsStep3, @@ -156,7 +156,7 @@ implements WithAsStep21, WithAsStep22, - // [jooq-tools] END [implements-with-as-step] + WithStep { @@ -293,7 +293,7 @@ implements } - // [jooq-tools] START [with] + @Override public final WithImpl with(String a, String fieldAlias1) { @@ -515,7 +515,7 @@ implements return with(a, new Name[] { fieldAlias1, fieldAlias2, fieldAlias3, fieldAlias4, fieldAlias5, fieldAlias6, fieldAlias7, fieldAlias8, fieldAlias9, fieldAlias10, fieldAlias11, fieldAlias12, fieldAlias13, fieldAlias14, fieldAlias15, fieldAlias16, fieldAlias17, fieldAlias18, fieldAlias19, fieldAlias20, fieldAlias21, fieldAlias22 }); } - // [jooq-tools] END [with] + @Override public final WithStep with(CommonTableExpression... tables) { @@ -565,7 +565,7 @@ implements return new SelectImpl(configuration, this).select(fields); } - // [jooq-tools] START [select] + @Override public final SelectSelectStep> select(SelectField field1) { @@ -677,7 +677,7 @@ implements return (SelectSelectStep) select(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [select] + @Override public final SelectSelectStep selectDistinct(Collection fields) { @@ -689,7 +689,7 @@ implements return new SelectImpl(configuration, this, true).select(fields); } - // [jooq-tools] START [selectDistinct] + @Override public final SelectSelectStep> selectDistinct(SelectField field1) { @@ -801,7 +801,7 @@ implements return (SelectSelectStep) selectDistinct(new SelectField[] { field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22 }); } - // [jooq-tools] END [selectDistinct] + @Override public final SelectSelectStep> selectZero() { @@ -823,7 +823,7 @@ implements return new InsertImpl(configuration, this, into); } - // [jooq-tools] START [insert] + @Override public final InsertImpl insertInto(Table into, Field field1) { @@ -935,7 +935,7 @@ implements return insertInto(into, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22)); } - // [jooq-tools] END [insert] + @Override public final InsertImpl insertInto(Table into, Field... fields) { @@ -957,7 +957,7 @@ implements return new MergeImpl(configuration, this, table); } - // [jooq-tools] START [merge] + @Override public final MergeImpl mergeInto(Table table, Field field1) { @@ -1069,7 +1069,7 @@ implements return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22)); } - // [jooq-tools] END [merge] + @Override public final MergeImpl mergeInto(Table table, Field... fields) {