From a86fbe412f2cb9beb9ed8e5863e97a49db193569 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 16 Apr 2020 13:44:54 +0200 Subject: [PATCH] [jOOQ/jOOQ#10074] Provide default implementation of AbstractTable.as(Name) --- jOOQ/src/main/java/org/jooq/impl/AbstractTable.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/ArrayTable.java | 10 ---------- .../org/jooq/impl/CommonTableExpressionImpl.java | 12 ------------ jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java | 12 ------------ jOOQ/src/main/java/org/jooq/impl/JSONTable.java | 6 ------ jOOQ/src/main/java/org/jooq/impl/LinkedTable.java | 12 ------------ jOOQ/src/main/java/org/jooq/impl/PeriodTable.java | 11 ----------- jOOQ/src/main/java/org/jooq/impl/RowsFrom.java | 11 ----------- jOOQ/src/main/java/org/jooq/impl/SQLTable.java | 12 ------------ jOOQ/src/main/java/org/jooq/impl/ScalarSubquery.java | 7 ------- 10 files changed, 2 insertions(+), 95 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java index 9e49c16a04..9cc52f60b5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java @@ -366,12 +366,12 @@ abstract class AbstractTable extends AbstractNamed implements @Override public /* non-final for covariant overriding */ Table as(Name alias) { - throw new UnsupportedOperationException("Subtypes should override this method. If using the jOOQ code generator, please re-generate your code"); + return new TableAlias<>(this, alias); } @Override public /* non-final for covariant overriding */ Table as(Name alias, Name... fieldAliases) { - throw new UnsupportedOperationException("Subtypes should override this method. If using the jOOQ code generator, please re-generate your code"); + return new TableAlias<>(this, alias, fieldAliases); } diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java b/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java index f73a92e74f..7d9866f2bf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java @@ -283,16 +283,6 @@ final class ArrayTable extends AbstractTable { return RecordImplN.class; } - @Override - public final Table as(Name as) { - return new TableAlias<>(this, as); - } - - @Override - public final Table as(Name as, Name... fields) { - return new TableAlias<>(this, as, fields); - } - @Override final Fields fields0() { return ArrayTable.this.fields0(); diff --git a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java index 3d502975bd..402c3709e8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java @@ -44,10 +44,8 @@ import java.util.List; import org.jooq.CommonTableExpression; import org.jooq.Context; import org.jooq.Field; -import org.jooq.Name; import org.jooq.Record; import org.jooq.Select; -import org.jooq.Table; import org.jooq.TableOptions; /** @@ -77,16 +75,6 @@ final class CommonTableExpressionImpl extends AbstractTable return select.getRecordType(); } - @Override - public final Table as(Name alias) { - return new TableAlias<>(this, alias); - } - - @Override - public final Table as(Name alias, Name... fieldAliases) { - return new TableAlias<>(this, alias, fieldAliases); - } - @Override public final boolean declaresCTE() { return true; diff --git a/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java b/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java index 12e69c1daa..7124b659dc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java +++ b/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java @@ -47,10 +47,8 @@ import org.jooq.Clause; import org.jooq.Configuration; import org.jooq.Context; import org.jooq.Field; -import org.jooq.Name; import org.jooq.QueryPart; import org.jooq.Record1; -import org.jooq.Table; import org.jooq.TableOptions; /** @@ -131,16 +129,6 @@ final class GenerateSeries extends AbstractTable> { return (Class) RecordImpl1.class; } - @Override - public final Table> as(Name alias) { - return new TableAlias<>(this, alias); - } - - @Override - public final Table> as(Name alias, Name... fieldAliases) { - return new TableAlias<>(this, alias, fieldAliases); - } - @Override final Fields> fields0() { return new Fields<>(DSL.field(name("generate_series"), Integer.class)); diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONTable.java b/jOOQ/src/main/java/org/jooq/impl/JSONTable.java index 02fcae36f0..e0314b7e49 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONTable.java @@ -70,7 +70,6 @@ import org.jooq.Name; import org.jooq.Record; import org.jooq.SQLDialect; import org.jooq.SelectField; -import org.jooq.Table; import org.jooq.TableOptions; import org.jooq.conf.ParamType; @@ -272,11 +271,6 @@ implements ctx.visit(path); } - @Override - public final Table as(Name alias) { - return new TableAlias<>(this, alias); - } - @Override public boolean declaresTables() { return true; diff --git a/jOOQ/src/main/java/org/jooq/impl/LinkedTable.java b/jOOQ/src/main/java/org/jooq/impl/LinkedTable.java index e55bd2407b..d31ef5257a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LinkedTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/LinkedTable.java @@ -75,18 +75,6 @@ package org.jooq.impl; - - - - - - - - - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/PeriodTable.java b/jOOQ/src/main/java/org/jooq/impl/PeriodTable.java index 85e9392ad3..3e4b1a69bb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/PeriodTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/PeriodTable.java @@ -126,17 +126,6 @@ package org.jooq.impl; - - - - - - - - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java b/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java index 14ca03a89c..1e0ece22a6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java @@ -46,7 +46,6 @@ import java.util.List; import org.jooq.Context; import org.jooq.Field; -import org.jooq.Name; import org.jooq.Record; import org.jooq.Table; import org.jooq.TableOptions; @@ -75,16 +74,6 @@ final class RowsFrom extends AbstractTable { return RecordImplN.class; } - @Override - public final Table as(Name alias) { - return new TableAlias<>(this, alias); - } - - @Override - public final Table as(Name alias, Name... fieldAliases) { - return new TableAlias<>(this, alias, fieldAliases); - } - @Override final Fields fields0() { List> fields = new ArrayList<>(); diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLTable.java b/jOOQ/src/main/java/org/jooq/impl/SQLTable.java index 5debddf4ec..e9e08acf15 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SQLTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/SQLTable.java @@ -38,10 +38,8 @@ package org.jooq.impl; import org.jooq.Context; -import org.jooq.Name; import org.jooq.QueryPart; import org.jooq.Record; -import org.jooq.Table; import org.jooq.TableOptions; /** @@ -68,16 +66,6 @@ final class SQLTable extends AbstractTable { return RecordImplN.class; } - @Override - public final Table as(Name alias) { - return new TableAlias<>(this, alias); - } - - @Override - public final Table as(Name alias, Name... fieldAliases) { - return new TableAlias<>(this, alias, fieldAliases); - } - @Override public final void accept(Context ctx) { ctx.visit(delegate); diff --git a/jOOQ/src/main/java/org/jooq/impl/ScalarSubquery.java b/jOOQ/src/main/java/org/jooq/impl/ScalarSubquery.java index a80d0d2edf..0c420b31fd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ScalarSubquery.java +++ b/jOOQ/src/main/java/org/jooq/impl/ScalarSubquery.java @@ -42,8 +42,6 @@ import static org.jooq.impl.Names.N_SELECT; import org.jooq.Context; import org.jooq.DataType; -import org.jooq.Field; -import org.jooq.Name; import org.jooq.Select; /** @@ -60,11 +58,6 @@ final class ScalarSubquery extends AbstractField { this.query = query; } - @Override - public final Field as(Name alias) { - return new FieldAlias<>(this, alias); - } - @Override public final void accept(Context ctx) { ctx.sql('(')