From 4652fb2c08baeb3ee6a75e425ceaff2bd07d8ffc Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 21 Nov 2019 10:57:09 +0100 Subject: [PATCH] Organise code in DSL API / QueryPart API sections --- .../java/org/jooq/impl/AbstractDMLQuery.java | 8 +++++ .../java/org/jooq/impl/CommentOnImpl.java | 30 ++++++++++++------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java index 79d52ca861..c8d53fb594 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java @@ -163,6 +163,10 @@ abstract class AbstractDMLQuery extends AbstractRowCountQuery this.returningResolvedAsterisks = new ArrayList<>(); } + // ------------------------------------------------------------------------ + // XXX: DSL API + // ------------------------------------------------------------------------ + // @Override public final void setReturning() { setReturning(table.fields()); @@ -253,6 +257,10 @@ abstract class AbstractDMLQuery extends AbstractRowCountQuery return returnedResult; } + // ------------------------------------------------------------------------ + // XXX: QueryPart API + // ------------------------------------------------------------------------ + @Override public final void accept(Context ctx) { WithImpl w = with; diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java index 56a812e6ee..bb5bd9e94b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java @@ -112,6 +112,25 @@ implements final Field $field() { return field; } final Comment $comment() { return comment; } + // ------------------------------------------------------------------------ + // XXX: DSL API + // ------------------------------------------------------------------------ + + @Override + public final CommentOnImpl is(String c) { + return is(comment(c)); + } + + @Override + public final CommentOnImpl is(Comment c) { + this.comment = c; + return this; + } + + // ------------------------------------------------------------------------ + // XXX: QueryPart API + // ------------------------------------------------------------------------ + @Override public final void accept(Context ctx) { switch (ctx.family()) { @@ -204,15 +223,4 @@ implements ctx.sql(' ').visit(K_IS).sql(' ').visit(comment); } - - @Override - public final CommentOnImpl is(String c) { - return is(comment(c)); - } - - @Override - public final CommentOnImpl is(Comment c) { - this.comment = c; - return this; - } }