From d51a7b53dcec48b35dab71994cf18ef7ab7cee4c Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 8 Feb 2013 12:24:06 +0100 Subject: [PATCH] Removed AbstractFieldProviderQueryPart --- .../impl/AbstractFieldProviderQueryPart.java | 89 ------------------- .../java/org/jooq/impl/AbstractTable.java | 12 ++- .../main/java/org/jooq/impl/ArrayTable.java | 6 +- .../org/jooq/impl/ArrayTableSimulation.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Dual.java | 2 +- .../java/org/jooq/impl/FunctionTable.java | 2 +- .../main/java/org/jooq/impl/JoinTable.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Pivot.java | 6 +- .../java/org/jooq/impl/QualifiedTable.java | 2 +- .../src/main/java/org/jooq/impl/SQLTable.java | 2 +- .../org/jooq/impl/SelectQueryAsTable.java | 2 +- .../main/java/org/jooq/impl/TableAlias.java | 2 +- .../java/org/jooq/impl/TableFieldImpl.java | 2 +- .../main/java/org/jooq/impl/TableImpl.java | 2 +- .../main/java/org/jooq/impl/UDTFieldImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/UDTImpl.java | 5 +- jOOQ/src/main/java/org/jooq/impl/Values.java | 2 +- .../main/java/org/jooq/impl/WithTable.java | 4 +- 18 files changed, 32 insertions(+), 114 deletions(-) delete mode 100644 jOOQ/src/main/java/org/jooq/impl/AbstractFieldProviderQueryPart.java diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractFieldProviderQueryPart.java b/jOOQ/src/main/java/org/jooq/impl/AbstractFieldProviderQueryPart.java deleted file mode 100644 index df040f143d..0000000000 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractFieldProviderQueryPart.java +++ /dev/null @@ -1,89 +0,0 @@ -/** - * Copyright (c) 2009-2013, Lukas Eder, lukas.eder@gmail.com - * All rights reserved. - * - * This software is licensed to you under the Apache License, Version 2.0 - * (the "License"); You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * . Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * . Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * . Neither the name "jOOQ" nor the names of its contributors may be - * used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -package org.jooq.impl; - -import java.util.ArrayList; -import java.util.List; - -import org.jooq.Field; -import org.jooq.Record; - -/** - * @author Lukas Eder - */ -abstract class AbstractFieldProviderQueryPart extends AbstractQueryPart { - - /** - * Generated UID - */ - private static final long serialVersionUID = -4629861305735726005L; - - AbstractFieldProviderQueryPart() { - super(); - } - - public final List> getFields() { - return new ArrayList>(getFieldList()); - } - - public final Field getField(Field field) { - return getFieldList().field(field); - } - - public final Field getField(String name) { - return getFieldList().field(name); - } - - public final Field getField(int index) { - return getFieldList().field(index); - } - - public final int getIndex(Field field) { - return getFieldList().indexOf(field); - } - - public final int getIndex(String fieldName) { - return getFieldList().indexOf(fieldName); - } - - /** - * Subclasses should override this method to provide the set of fields - * contained in the concrete table implementation. For example, a - * TableAlias contains aliased fields of its - * AliasProvider table. - */ - protected abstract FieldList getFieldList(); -} diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java index 99ea0bbde8..8af2290835 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java @@ -64,7 +64,7 @@ import org.jooq.tools.StringUtils; /** * @author Lukas Eder */ -abstract class AbstractTable extends AbstractFieldProviderQueryPart implements Table { +abstract class AbstractTable extends AbstractQueryPart implements Table { /** * Generated UID @@ -89,10 +89,18 @@ abstract class AbstractTable extends AbstractFieldProviderQuer // XXX: TableLike API // ------------------------------------------------------------------------ + /** + * Subclasses should override this method to provide the set of fields + * contained in the concrete table implementation. For example, a + * TableAlias contains aliased fields of its + * AliasProvider table. + */ + abstract FieldList fields0(); + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public final Row fieldsRow() { - return new RowImpl(getFieldList()); + return new RowImpl(fields0()); } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java b/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java index 6fc331a201..1e3e237918 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java @@ -286,8 +286,8 @@ class ArrayTable extends AbstractTable { } @Override - protected final FieldList getFieldList() { - return ArrayTable.this.getFieldList(); + final FieldList fields0() { + return ArrayTable.this.fields0(); } } @@ -297,7 +297,7 @@ class ArrayTable extends AbstractTable { } @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { return field; } } diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayTableSimulation.java b/jOOQ/src/main/java/org/jooq/impl/ArrayTableSimulation.java index 502282df93..4a75d9d2fe 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayTableSimulation.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayTableSimulation.java @@ -127,7 +127,7 @@ class ArrayTableSimulation extends AbstractTable { } @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { return field; } diff --git a/jOOQ/src/main/java/org/jooq/impl/Dual.java b/jOOQ/src/main/java/org/jooq/impl/Dual.java index 6f5b7729a0..af7f3215f8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Dual.java +++ b/jOOQ/src/main/java/org/jooq/impl/Dual.java @@ -125,7 +125,7 @@ class Dual extends AbstractTable { public final void bind(BindContext context) {} @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { return new FieldList(); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java b/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java index 3b06e9ab37..8937a36053 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java @@ -102,7 +102,7 @@ class FunctionTable extends AbstractTable { } @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { return new FieldList(); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java index 89ca6dd98b..15b6da1b01 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java @@ -289,7 +289,7 @@ class JoinTable extends AbstractTable implements TableOptionalOnStep, Ta } @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { Field[] l = lhs.asTable().fields(); Field[] r = rhs.asTable().fields(); Field[] all = new Field[l.length + r.length]; diff --git a/jOOQ/src/main/java/org/jooq/impl/Pivot.java b/jOOQ/src/main/java/org/jooq/impl/Pivot.java index 8e18c2cbf5..28dd042c07 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Pivot.java +++ b/jOOQ/src/main/java/org/jooq/impl/Pivot.java @@ -287,8 +287,8 @@ implements } @Override - protected FieldList getFieldList() { - return Pivot.this.getFieldList(); + final FieldList fields0() { + return Pivot.this.fields0(); } } @@ -321,7 +321,7 @@ implements } @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { return new FieldList(); } diff --git a/jOOQ/src/main/java/org/jooq/impl/QualifiedTable.java b/jOOQ/src/main/java/org/jooq/impl/QualifiedTable.java index d328c85b20..066d4d2ef2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QualifiedTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/QualifiedTable.java @@ -95,7 +95,7 @@ class QualifiedTable extends AbstractTable { } @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { return new FieldList(); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLTable.java b/jOOQ/src/main/java/org/jooq/impl/SQLTable.java index 55ced3bd49..9a47337e83 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SQLTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/SQLTable.java @@ -90,7 +90,7 @@ class SQLTable extends AbstractTable { } @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { return new FieldList(); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryAsTable.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryAsTable.java index f14f0a2727..513415639b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryAsTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryAsTable.java @@ -68,7 +68,7 @@ class SelectQueryAsTable extends AbstractTable { } @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { return new FieldList(query.getSelect()); } diff --git a/jOOQ/src/main/java/org/jooq/impl/TableAlias.java b/jOOQ/src/main/java/org/jooq/impl/TableAlias.java index 5ecb39d5a6..a89153465e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableAlias.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableAlias.java @@ -145,7 +145,7 @@ class TableAlias extends AbstractTable { } @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { return aliasedFields; } diff --git a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java index 2cd0d2d22e..8e817912e7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java @@ -62,7 +62,7 @@ class TableFieldImpl extends AbstractField implements Ta // [#1199] The public API of Table returns immutable field lists if (table instanceof TableImpl) { - ((TableImpl) table).getFieldList().add(this); + ((TableImpl) table).fields0().add(this); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java index 85eeb19c86..c311182d6b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java @@ -97,7 +97,7 @@ public class TableImpl extends AbstractTable { } @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { return fields; } diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java index 6be55d5bc4..4b52ff65f5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java @@ -61,7 +61,7 @@ class UDTFieldImpl, T> extends AbstractField implement // [#1199] The public API of UDT returns immutable field lists if (udt instanceof UDTImpl) { - ((UDTImpl) udt).getFieldList().add(this); + ((UDTImpl) udt).fields0().add(this); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java index 3f481fe647..cfbc75fe8a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java @@ -54,7 +54,7 @@ import org.jooq.UDTRecord; * * @author Lukas Eder */ -public class UDTImpl> extends AbstractFieldProviderQueryPart implements UDT { +public class UDTImpl> extends AbstractQueryPart implements UDT { private static final long serialVersionUID = -2208672099190913126L; @@ -105,8 +105,7 @@ public class UDTImpl> extends AbstractFieldProviderQueryP return fieldsRow().fields(); } - @Override - protected final FieldList getFieldList() { + final FieldList fields0() { return fields; } diff --git a/jOOQ/src/main/java/org/jooq/impl/Values.java b/jOOQ/src/main/java/org/jooq/impl/Values.java index 03d26c1196..aaba48093a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Values.java +++ b/jOOQ/src/main/java/org/jooq/impl/Values.java @@ -157,7 +157,7 @@ class Values extends AbstractTable { } @Override - protected final FieldList getFieldList() { + protected final FieldList fields0() { return new FieldList(rows[0].fields()); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/WithTable.java b/jOOQ/src/main/java/org/jooq/impl/WithTable.java index 21665ba645..2cceb35fb6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WithTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/WithTable.java @@ -95,7 +95,7 @@ class WithTable extends AbstractTable { } @Override - protected final FieldList getFieldList() { - return delegate.getFieldList(); + final FieldList fields0() { + return delegate.fields0(); } }