From f55538ccd2689b92ab23f18ec16bee70c11e60f6 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 31 Dec 2021 16:05:28 +0100 Subject: [PATCH] [jOOQ/jOOQ#12425] Add a new org.jooq.Replacer type For better forward compatibility, let's introduce a wrapper type for replacement operations, rather than passing around its components individually (Predicate, Function) --- jOOQ/src/main/java/org/jooq/QueryPart.java | 161 +++++----- jOOQ/src/main/java/org/jooq/Replacer.java | 117 +++++++ jOOQ/src/main/java/org/jooq/Traverser.java | 294 +++++++++--------- jOOQ/src/main/java/org/jooq/Traversers.java | 173 ++++++----- jOOQ/src/main/java/org/jooq/impl/Abs.java | 4 - .../jooq/impl/AbstractAggregateFunction.java | 2 +- .../java/org/jooq/impl/AbstractLeadLag.java | 7 +- .../main/java/org/jooq/impl/AbstractRow.java | 6 +- .../org/jooq/impl/AbstractWindowFunction.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Acos.java | 4 - .../java/org/jooq/impl/AlterDatabaseImpl.java | 4 - .../java/org/jooq/impl/AlterDomainImpl.java | 4 - .../java/org/jooq/impl/AlterIndexImpl.java | 4 - .../java/org/jooq/impl/AlterSchemaImpl.java | 4 - .../java/org/jooq/impl/AlterSequenceImpl.java | 4 - .../java/org/jooq/impl/AlterTypeImpl.java | 4 - .../java/org/jooq/impl/AlterViewImpl.java | 4 - .../src/main/java/org/jooq/impl/AnyValue.java | 4 - jOOQ/src/main/java/org/jooq/impl/Array.java | 6 +- .../src/main/java/org/jooq/impl/ArrayGet.java | 4 - .../main/java/org/jooq/impl/ArrayQuery.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Ascii.java | 4 - jOOQ/src/main/java/org/jooq/impl/Asin.java | 4 - .../main/java/org/jooq/impl/Assignment.java | 2 - .../main/java/org/jooq/impl/AsteriskImpl.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Atan.java | 4 - jOOQ/src/main/java/org/jooq/impl/Atan2.java | 4 - jOOQ/src/main/java/org/jooq/impl/Avg.java | 4 - .../java/org/jooq/impl/BetweenCondition.java | 5 +- .../main/java/org/jooq/impl/BitAndAgg.java | 4 - .../src/main/java/org/jooq/impl/BitCount.java | 4 - .../main/java/org/jooq/impl/BitLength.java | 4 - .../src/main/java/org/jooq/impl/BitOrAgg.java | 4 - .../main/java/org/jooq/impl/BitXorAgg.java | 4 - .../main/java/org/jooq/impl/BlockImpl.java | 6 +- jOOQ/src/main/java/org/jooq/impl/BoolAnd.java | 4 - jOOQ/src/main/java/org/jooq/impl/BoolOr.java | 4 - jOOQ/src/main/java/org/jooq/impl/Call.java | 4 - .../main/java/org/jooq/impl/Cardinality.java | 4 - .../org/jooq/impl/CaseConditionStepImpl.java | 1 + jOOQ/src/main/java/org/jooq/impl/Cast.java | 7 +- .../main/java/org/jooq/impl/CatalogImpl.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Ceil.java | 4 - .../main/java/org/jooq/impl/CharLength.java | 4 - jOOQ/src/main/java/org/jooq/impl/Chr.java | 4 - jOOQ/src/main/java/org/jooq/impl/Coerce.java | 11 +- .../src/main/java/org/jooq/impl/Collated.java | 6 +- .../java/org/jooq/impl/CommentOnImpl.java | 4 - .../jooq/impl/CommonTableExpressionImpl.java | 6 +- .../java/org/jooq/impl/ConditionAsField.java | 4 - .../java/org/jooq/impl/ConnectByRoot.java | 4 - .../src/main/java/org/jooq/impl/Continue.java | 2 - .../java/org/jooq/impl/ConvertDateTime.java | 3 - jOOQ/src/main/java/org/jooq/impl/Corr.java | 4 - jOOQ/src/main/java/org/jooq/impl/Cos.java | 4 - jOOQ/src/main/java/org/jooq/impl/Cosh.java | 4 - jOOQ/src/main/java/org/jooq/impl/Cot.java | 4 - jOOQ/src/main/java/org/jooq/impl/Coth.java | 4 - jOOQ/src/main/java/org/jooq/impl/Count.java | 4 - .../main/java/org/jooq/impl/CountTable.java | 7 +- .../src/main/java/org/jooq/impl/CovarPop.java | 4 - .../main/java/org/jooq/impl/CovarSamp.java | 4 - .../org/jooq/impl/CreateDatabaseImpl.java | 4 - .../java/org/jooq/impl/CreateDomainImpl.java | 4 - .../org/jooq/impl/CreateFunctionImpl.java | 4 - .../java/org/jooq/impl/CreateIndexImpl.java | 4 - .../org/jooq/impl/CreateProcedureImpl.java | 4 - .../java/org/jooq/impl/CreateSchemaImpl.java | 4 - .../org/jooq/impl/CreateSequenceImpl.java | 4 - .../java/org/jooq/impl/CreateTriggerImpl.java | 4 - .../java/org/jooq/impl/CreateTypeImpl.java | 6 +- .../java/org/jooq/impl/CreateViewImpl.java | 6 +- .../src/main/java/org/jooq/impl/CumeDist.java | 7 +- .../org/jooq/impl/DataChangeDeltaTable.java | 6 +- jOOQ/src/main/java/org/jooq/impl/DateAdd.java | 4 - .../java/org/jooq/impl/DeclarationImpl.java | 2 - .../jooq/impl/DefaultAggregateFunction.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Degrees.java | 4 - .../main/java/org/jooq/impl/DenseRank.java | 7 +- .../org/jooq/impl/DerivedColumnListImpl.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Digits.java | 4 - .../java/org/jooq/impl/DropDatabaseImpl.java | 4 - .../java/org/jooq/impl/DropDomainImpl.java | 4 - .../java/org/jooq/impl/DropFunctionImpl.java | 4 - .../java/org/jooq/impl/DropIndexImpl.java | 4 - .../java/org/jooq/impl/DropProcedureImpl.java | 4 - .../java/org/jooq/impl/DropSchemaImpl.java | 4 - .../java/org/jooq/impl/DropSequenceImpl.java | 4 - .../java/org/jooq/impl/DropTableImpl.java | 4 - .../java/org/jooq/impl/DropTriggerImpl.java | 4 - .../main/java/org/jooq/impl/DropTypeImpl.java | 6 +- .../main/java/org/jooq/impl/DropViewImpl.java | 4 - jOOQ/src/main/java/org/jooq/impl/Execute.java | 4 - jOOQ/src/main/java/org/jooq/impl/Exists.java | 4 - jOOQ/src/main/java/org/jooq/impl/Exit.java | 2 - jOOQ/src/main/java/org/jooq/impl/Exp.java | 4 - jOOQ/src/main/java/org/jooq/impl/Extract.java | 6 +- .../main/java/org/jooq/impl/FieldAlias.java | 6 +- .../java/org/jooq/impl/FieldCondition.java | 4 - .../main/java/org/jooq/impl/FirstValue.java | 7 +- jOOQ/src/main/java/org/jooq/impl/Floor.java | 4 - .../src/main/java/org/jooq/impl/Function.java | 7 +- .../main/java/org/jooq/impl/Function1.java | 7 +- jOOQ/src/main/java/org/jooq/impl/Goto.java | 4 - .../main/java/org/jooq/impl/GrantImpl.java | 4 - .../main/java/org/jooq/impl/JSONArray.java | 4 - .../java/org/jooq/impl/JSONEntryImpl.java | 6 +- .../main/java/org/jooq/impl/JSONObject.java | 4 - jOOQ/src/main/java/org/jooq/impl/LTrim.java | 4 - .../main/java/org/jooq/impl/LabelImpl.java | 2 - .../java/org/jooq/impl/LabelledStatement.java | 2 - .../main/java/org/jooq/impl/LastValue.java | 7 +- .../main/java/org/jooq/impl/LazyCatalog.java | 6 +- .../main/java/org/jooq/impl/LazySchema.java | 6 +- jOOQ/src/main/java/org/jooq/impl/LazyVal.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Left.java | 4 - .../src/main/java/org/jooq/impl/LinkImpl.java | 2 - .../main/java/org/jooq/impl/LinkedTable.java | 2 - jOOQ/src/main/java/org/jooq/impl/Log.java | 4 - jOOQ/src/main/java/org/jooq/impl/Log10.java | 4 - jOOQ/src/main/java/org/jooq/impl/Lower.java | 4 - jOOQ/src/main/java/org/jooq/impl/Lpad.java | 4 - jOOQ/src/main/java/org/jooq/impl/MD5.java | 4 - jOOQ/src/main/java/org/jooq/impl/Max.java | 4 - jOOQ/src/main/java/org/jooq/impl/Median.java | 4 - jOOQ/src/main/java/org/jooq/impl/Min.java | 4 - .../src/main/java/org/jooq/impl/Multiset.java | 6 +- .../main/java/org/jooq/impl/MultisetAgg.java | 6 +- .../src/main/java/org/jooq/impl/NthValue.java | 7 +- jOOQ/src/main/java/org/jooq/impl/Ntile.java | 7 +- jOOQ/src/main/java/org/jooq/impl/Nullif.java | 4 - jOOQ/src/main/java/org/jooq/impl/Nvl.java | 4 - .../main/java/org/jooq/impl/OctetLength.java | 4 - jOOQ/src/main/java/org/jooq/impl/Overlay.java | 4 - .../main/java/org/jooq/impl/PackageImpl.java | 6 +- .../main/java/org/jooq/impl/PercentRank.java | 7 +- .../src/main/java/org/jooq/impl/Position.java | 4 - jOOQ/src/main/java/org/jooq/impl/Prior.java | 4 - jOOQ/src/main/java/org/jooq/impl/Product.java | 4 - jOOQ/src/main/java/org/jooq/impl/QOM.java | 50 +-- .../org/jooq/impl/QualifiedAsteriskImpl.java | 6 +- .../main/java/org/jooq/impl/QueriesImpl.java | 6 +- .../jooq/impl/QueryPartCollectionView.java | 6 +- jOOQ/src/main/java/org/jooq/impl/RTrim.java | 4 - jOOQ/src/main/java/org/jooq/impl/Radians.java | 4 - jOOQ/src/main/java/org/jooq/impl/Rank.java | 7 +- .../java/org/jooq/impl/RatioToReport.java | 6 +- .../main/java/org/jooq/impl/RegexpLike.java | 6 +- .../src/main/java/org/jooq/impl/RegrAvgX.java | 4 - .../src/main/java/org/jooq/impl/RegrAvgY.java | 4 - .../main/java/org/jooq/impl/RegrCount.java | 4 - .../java/org/jooq/impl/RegrIntercept.java | 4 - jOOQ/src/main/java/org/jooq/impl/RegrR2.java | 4 - .../main/java/org/jooq/impl/RegrSlope.java | 4 - jOOQ/src/main/java/org/jooq/impl/RegrSxx.java | 4 - jOOQ/src/main/java/org/jooq/impl/RegrSxy.java | 4 - jOOQ/src/main/java/org/jooq/impl/RegrSyy.java | 4 - jOOQ/src/main/java/org/jooq/impl/Repeat.java | 4 - jOOQ/src/main/java/org/jooq/impl/Replace.java | 4 - jOOQ/src/main/java/org/jooq/impl/Return.java | 4 - jOOQ/src/main/java/org/jooq/impl/Reverse.java | 4 - .../main/java/org/jooq/impl/RevokeImpl.java | 4 - jOOQ/src/main/java/org/jooq/impl/Right.java | 4 - .../src/main/java/org/jooq/impl/RoleImpl.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Round.java | 4 - .../src/main/java/org/jooq/impl/RowField.java | 6 +- .../main/java/org/jooq/impl/RowNumber.java | 7 +- .../src/main/java/org/jooq/impl/RowsFrom.java | 7 +- jOOQ/src/main/java/org/jooq/impl/Rpad.java | 4 - .../main/java/org/jooq/impl/SchemaImpl.java | 6 +- .../java/org/jooq/impl/SelectQueryImpl.java | 15 +- .../main/java/org/jooq/impl/SetCatalog.java | 4 - .../main/java/org/jooq/impl/SetCommand.java | 4 - .../main/java/org/jooq/impl/SetSchema.java | 4 - jOOQ/src/main/java/org/jooq/impl/Sign.java | 4 - jOOQ/src/main/java/org/jooq/impl/Signal.java | 4 - jOOQ/src/main/java/org/jooq/impl/Sin.java | 4 - jOOQ/src/main/java/org/jooq/impl/Sinh.java | 4 - .../java/org/jooq/impl/SortFieldImpl.java | 7 +- jOOQ/src/main/java/org/jooq/impl/Space.java | 4 - .../main/java/org/jooq/impl/SplitPart.java | 4 - jOOQ/src/main/java/org/jooq/impl/Sqrt.java | 4 - jOOQ/src/main/java/org/jooq/impl/Square.java | 4 - jOOQ/src/main/java/org/jooq/impl/StArea.java | 4 - .../main/java/org/jooq/impl/StAsBinary.java | 4 - .../src/main/java/org/jooq/impl/StAstext.java | 4 - .../main/java/org/jooq/impl/StCentroid.java | 4 - .../main/java/org/jooq/impl/StContains.java | 4 - .../main/java/org/jooq/impl/StCrosses.java | 4 - .../main/java/org/jooq/impl/StDifference.java | 4 - .../main/java/org/jooq/impl/StDisjoint.java | 4 - .../main/java/org/jooq/impl/StDistance.java | 4 - .../main/java/org/jooq/impl/StEndPoint.java | 4 - .../src/main/java/org/jooq/impl/StEquals.java | 4 - .../java/org/jooq/impl/StExteriorRing.java | 4 - .../java/org/jooq/impl/StGeomFromWKB.java | 4 - .../main/java/org/jooq/impl/StGeometryN.java | 4 - .../java/org/jooq/impl/StGeometryType.java | 4 - .../java/org/jooq/impl/StGeomfromtext.java | 4 - .../java/org/jooq/impl/StInteriorRingN.java | 4 - .../java/org/jooq/impl/StIntersection.java | 4 - .../main/java/org/jooq/impl/StIntersects.java | 4 - .../main/java/org/jooq/impl/StIsClosed.java | 4 - .../main/java/org/jooq/impl/StIsEmpty.java | 4 - .../src/main/java/org/jooq/impl/StLength.java | 4 - .../java/org/jooq/impl/StNumGeometries.java | 4 - .../org/jooq/impl/StNumInteriorRings.java | 4 - .../main/java/org/jooq/impl/StNumPoints.java | 4 - .../main/java/org/jooq/impl/StOverlaps.java | 4 - .../src/main/java/org/jooq/impl/StPointN.java | 4 - jOOQ/src/main/java/org/jooq/impl/StSrid.java | 4 - .../main/java/org/jooq/impl/StStartPoint.java | 4 - .../main/java/org/jooq/impl/StTouches.java | 4 - jOOQ/src/main/java/org/jooq/impl/StUnion.java | 4 - .../src/main/java/org/jooq/impl/StWithin.java | 4 - jOOQ/src/main/java/org/jooq/impl/StX.java | 4 - jOOQ/src/main/java/org/jooq/impl/StY.java | 4 - jOOQ/src/main/java/org/jooq/impl/StZ.java | 4 - .../main/java/org/jooq/impl/StddevPop.java | 4 - .../main/java/org/jooq/impl/StddevSamp.java | 4 - .../main/java/org/jooq/impl/Substring.java | 4 - .../java/org/jooq/impl/SubstringIndex.java | 4 - jOOQ/src/main/java/org/jooq/impl/Sum.java | 4 - .../java/org/jooq/impl/SysConnectByPath.java | 4 - .../main/java/org/jooq/impl/TableAlias.java | 6 +- .../main/java/org/jooq/impl/TableImpl.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Tan.java | 4 - jOOQ/src/main/java/org/jooq/impl/Tanh.java | 4 - jOOQ/src/main/java/org/jooq/impl/ToChar.java | 4 - jOOQ/src/main/java/org/jooq/impl/ToDate.java | 4 - jOOQ/src/main/java/org/jooq/impl/ToHex.java | 4 - .../main/java/org/jooq/impl/ToTimestamp.java | 4 - .../main/java/org/jooq/impl/Translate.java | 4 - jOOQ/src/main/java/org/jooq/impl/Trim.java | 4 - jOOQ/src/main/java/org/jooq/impl/Trunc.java | 4 - .../main/java/org/jooq/impl/TruncateImpl.java | 4 - jOOQ/src/main/java/org/jooq/impl/Unique.java | 4 - jOOQ/src/main/java/org/jooq/impl/Upper.java | 4 - .../src/main/java/org/jooq/impl/UserImpl.java | 6 +- jOOQ/src/main/java/org/jooq/impl/VarPop.java | 4 - jOOQ/src/main/java/org/jooq/impl/VarSamp.java | 4 - .../main/java/org/jooq/impl/VariableImpl.java | 2 - .../main/java/org/jooq/impl/WidthBucket.java | 4 - .../org/jooq/impl/WindowDefinitionImpl.java | 6 +- .../jooq/impl/WindowSpecificationImpl.java | 7 +- .../src/main/java/org/jooq/impl/WithImpl.java | 6 +- .../java/org/jooq/impl/XMLAttributesImpl.java | 6 +- .../main/java/org/jooq/impl/XMLComment.java | 4 - .../main/java/org/jooq/impl/XMLElement.java | 6 +- .../main/java/org/jooq/impl/XMLExists.java | 6 +- .../main/java/org/jooq/impl/XMLForest.java | 4 - .../src/main/java/org/jooq/impl/XMLParse.java | 6 +- .../src/main/java/org/jooq/impl/XMLQuery.java | 6 +- .../main/java/org/jooq/impl/Xmlconcat.java | 4 - .../main/java/org/jooq/impl/Xmldocument.java | 4 - jOOQ/src/main/java/org/jooq/impl/Xmlpi.java | 4 - .../main/java/org/jooq/impl/Xmlserialize.java | 4 - 257 files changed, 570 insertions(+), 1357 deletions(-) create mode 100644 jOOQ/src/main/java/org/jooq/Replacer.java diff --git a/jOOQ/src/main/java/org/jooq/QueryPart.java b/jOOQ/src/main/java/org/jooq/QueryPart.java index 663dbe1f97..bfe716900a 100644 --- a/jOOQ/src/main/java/org/jooq/QueryPart.java +++ b/jOOQ/src/main/java/org/jooq/QueryPart.java @@ -39,12 +39,11 @@ package org.jooq; import java.io.Serializable; import java.util.function.BiFunction; -import java.util.function.Predicate; +import java.util.function.Function; +import java.util.function.Supplier; import java.util.stream.Collector; import org.jooq.conf.Settings; -import org.jooq.impl.Internal; -import org.jooq.impl.QOM.NotYetImplementedException; import org.jetbrains.annotations.NotNull; @@ -108,81 +107,89 @@ public interface QueryPart extends Serializable { @Override int hashCode(); - // ------------------------------------------------------------------------- - // XXX: Query Object Model - // ------------------------------------------------------------------------- - /** - * Traverser this {@link QueryPart} expression tree using a composable - * {@link Traverser}, producing a result. - *

- * This offers a generic way to traverse expression trees to translate the - * tree to arbitrary other data structures. The simplest traversal would - * just count all the tree elements: - *

- * 

-     * int count = CUSTOMER.NAME.eq(1).$traverse(0, (i, p) -> i + 1);
-     *
- *

- * The same can be achieved by translating the JDK {@link Collector} API to - * the {@link Traverser} API using {@link Traversers#collecting(Collector)}. - *

- * 

-     * CUSTOMER.NAME.eq(1).$traverse(Traversers.collecting(Collectors.counting()));
-     *
- *

- * Unlike a {@link Collector}, a {@link Traverser} is optimised for tree - * traversal, not stream traversal: - *

- *

- * This is a commercial jOOQ edition only feature. - */ - default R $traverse(Traverser traverser) { - Internal.requireCommercial(() -> "Query object model traversal is available in the commercial jOOQ distribution only. Please consider upgrading to the jOOQ Professional Edition or jOOQ Enterprise Edition."); - throw new NotYetImplementedException(); - } - /** - * Traverse a {@link QueryPart} hierarchy and recursively replace its - * elements by alternatives. - *

- * This is a commercial jOOQ edition only feature. - * - * @param recurse A predicate to decide whether to recurse into a - * {@link QueryPart} subtree. - * @param replacement The replacement function. Replacement continues - * recursively until the function returns null or its input for - * any given input. - */ - @NotNull - default QueryPart $replace( - Predicate recurse, - Function1 replacement - ) { - Internal.requireCommercial(() -> "Query object model traversal is available in the commercial jOOQ distribution only. Please consider upgrading to the jOOQ Professional Edition or jOOQ Enterprise Edition."); - throw new NotYetImplementedException(); - } - /** - * Convenience method for {@link #$replace(Predicate, Function1)}. - */ - @NotNull - default QueryPart $replace(Function1 replacement) { - return $replace(p -> true, replacement); - } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + } diff --git a/jOOQ/src/main/java/org/jooq/Replacer.java b/jOOQ/src/main/java/org/jooq/Replacer.java new file mode 100644 index 0000000000..90e1e4f4d7 --- /dev/null +++ b/jOOQ/src/main/java/org/jooq/Replacer.java @@ -0,0 +1,117 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Other licenses: + * ----------------------------------------------------------------------------- + * Commercial licenses for this work are available. These replace the above + * ASL 2.0 and offer limited warranties, support, maintenance, and commercial + * database integrations. + * + * For more information, please visit: http://www.jooq.org/licenses + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + */ +package org.jooq; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/Traverser.java b/jOOQ/src/main/java/org/jooq/Traverser.java index d9325be8cf..87a2806173 100644 --- a/jOOQ/src/main/java/org/jooq/Traverser.java +++ b/jOOQ/src/main/java/org/jooq/Traverser.java @@ -37,164 +37,172 @@ */ package org.jooq; -import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.function.Supplier; -import java.util.stream.Collector; -import java.util.stream.Stream; -/** - * An API for {@link QueryPart#$traverse(Traverser)} query part traversals. - *

- * Similar to a {@link Collector} for {@link Stream#collect(Collector)}, this - * type wraps: - *

- *

- */ -public interface Traverser { - /** - * Convenience method to create a {@link Traverser} with a - * {@link #supplier()} and {@link #before()}. - */ - static Traverser of( - Supplier supplier, - BiFunction before - ) { - return of(supplier, a -> false, q -> true, before, (a, q) -> a, a -> a); - } - /** - * Convenience method to create a {@link Traverser} with a - * {@link #supplier()}, {@link #before()}, and {@link #after()}. - */ - static Traverser of( - Supplier supplier, - BiFunction before, - BiFunction after - ) { - return of(supplier, a -> false, q -> true, before, after, a -> a); - } - /** - * Convenience method to create a {@link Traverser} with a - * {@link #supplier()}, {@link #abort()}, {@link #recurse()}, and - * {@link #before()}. - */ - static Traverser of( - Supplier supplier, - Predicate abort, - Predicate recurse, - BiFunction before - ) { - return of(supplier, abort, recurse, before, (a, q) -> a, a -> a); - } - /** - * Convenience method to create a {@link Traverser} with a - * {@link #supplier()}, {@link #abort()}, {@link #recurse()}, - * {@link #before()}, and {@link #after()} - */ - static Traverser of( - Supplier supplier, - Predicate abort, - Predicate recurse, - BiFunction before, - BiFunction after - ) { - return of(supplier, abort, recurse, before, after, a -> a); - } - /** - * Convenience method to create a {@link Traverser} with a - * {@link #supplier()}, {@link #abort()}, {@link #recurse()}, - * {@link #before()}, {@link #after()}, and {@link #finisher()}. - */ - @SuppressWarnings("unchecked") - static Traverser of( - Supplier supplier, - Predicate abort, - Predicate recurse, - BiFunction before, - BiFunction after, - Function finisher - ) { - // The below casts can be considered safe as they can be replaced by - // respective x::test or x::apply method references turning variant - // versions of the functions into invariant ones. - return new Traverser() { - @Override - public Supplier supplier() { - return supplier; - } - @Override - public Predicate abort() { - return (Predicate) abort; - } - @Override - public Predicate recurse() { - return (Predicate) recurse; - } - @Override - public BiFunction before() { - return (BiFunction) before; - } - @Override - public BiFunction after() { - return (BiFunction) after; - } - @Override - public Function finisher() { - return (Function) finisher; - } - }; - } - /** - * A supplier for a temporary data structure to accumulate {@link QueryPart} - * objects into during traversal. - */ - Supplier supplier(); - /** - * An optional traversal abort condition to short circuit traversal e.g. - * when the searched object has been found. - */ - Predicate abort(); - /** - * An optional traversal abort condition to short circuit traversal e.g. - * when the searched object has been found. - */ - Predicate recurse(); - /** - * A callback that is invoked before recursing into a subtree. - */ - BiFunction before(); - /** - * A callback that is invoked after recursing into a subtree. - */ - BiFunction after(); - /** - * An optional transformation function to turn the temporary data structure - * supplied by {@link #supplier()} into the final data structure. - */ - Function finisher(); -} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/Traversers.java b/jOOQ/src/main/java/org/jooq/Traversers.java index 1228bce218..4e748fe93b 100644 --- a/jOOQ/src/main/java/org/jooq/Traversers.java +++ b/jOOQ/src/main/java/org/jooq/Traversers.java @@ -37,93 +37,100 @@ */ package org.jooq; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collector; -import org.jetbrains.annotations.NotNull; -/** - * A set of {@link Traverser} constructor methods. - * - * @author Lukas Eder - */ -public final class Traversers { - /** - * A traverser constructed from a {@link Collector}. - */ - public static Traverser collecting(Collector collector) { - return Traverser.of( - collector.supplier(), - t -> false, - p -> true, - (t, p) -> { - collector.accumulator().accept(t, p); - return t; - }, - (t, p) -> t, - collector.finisher() - ); - } - /** - * A traverser that checks whether a {@link QueryPart} contains another - * {@link QueryPart}. - * - * @param part The part to find within the traversed {@link QueryPart} tree. - */ - @NotNull - public static Traverser containing(QueryPart part) { - return Traverser.of( - () -> false, - b -> b, - p -> true, - (b, p) -> b || p.equals(part) - ); - } - /** - * A traverser that finds any {@link QueryPart} that satisfies a predicate - * within the traversed {@link QueryPart} tree. - * - * @param predicate The predicate to use to check the traversed tree for a - * {@link QueryPart} to find. - */ - @NotNull - public static Traverser> findingAny(Predicate predicate) { - return Traverser.>of( - () -> null, - p -> p != null, - p -> true, - (r, p) -> predicate.test(p) ? p : r, - (r, p) -> r, - Optional::ofNullable - ); - } - /** - * A traverser that finds all {@link QueryPart}s that satisfy a predicate - * within the traversed {@link QueryPart} tree. - * - * @param predicate The predicate to use to check the traversed tree for - * {@link QueryPart}s to find. - */ - @NotNull - public static Traverser> findingAll(Predicate predicate) { - return Traverser.of( - () -> new ArrayList<>(), - (l, p) -> { - if (predicate.test(p)) - l.add(p); - return l; - }, - (l, p) -> l - ); - } - private Traversers() {} -} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java index 4936dfd6dc..bd7f2b24ef 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Abs.java +++ b/jOOQ/src/main/java/org/jooq/impl/Abs.java @@ -149,10 +149,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java index 836c1aa8cd..f865551fbe 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java @@ -92,7 +92,7 @@ import org.jooq.OrderedAggregateFunction; import org.jooq.QueryPart; import org.jooq.SQL; import org.jooq.SQLDialect; -import org.jooq.Traverser; +// ... import org.jooq.WindowBeforeOverStep; /** diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractLeadLag.java b/jOOQ/src/main/java/org/jooq/impl/AbstractLeadLag.java index d5f3359b7c..92885d9240 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractLeadLag.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractLeadLag.java @@ -50,7 +50,8 @@ import org.jooq.Field; import org.jooq.Function1; import org.jooq.Name; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** @@ -192,10 +193,6 @@ abstract class AbstractLeadLag extends AbstractWindowFunction { - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRow.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRow.java index 41f3d6d74a..f42c212443 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRow.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRow.java @@ -61,11 +61,12 @@ import org.jooq.Field; import org.jooq.Function1; import org.jooq.Name; import org.jooq.Record; +// ... import org.jooq.Row; import org.jooq.Row1; import org.jooq.Row2; import org.jooq.SelectField; -import org.jooq.Traverser; +// ... import org.jooq.impl.QOM.UnmodifiableList; import org.jooq.QueryPart; @@ -442,7 +443,4 @@ abstract class AbstractRow extends AbstractQueryPart implement - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java b/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java index 5b7fd2273d..18ffb3f92f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java @@ -66,7 +66,7 @@ import org.jooq.OrderField; // ... import org.jooq.QueryPart; import org.jooq.SQLDialect; -import org.jooq.Traverser; +// ... import org.jooq.WindowDefinition; import org.jooq.WindowExcludeStep; import org.jooq.WindowFinalStep; diff --git a/jOOQ/src/main/java/org/jooq/impl/Acos.java b/jOOQ/src/main/java/org/jooq/impl/Acos.java index b3e6fe6396..68fd2f1ec4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Acos.java +++ b/jOOQ/src/main/java/org/jooq/impl/Acos.java @@ -165,10 +165,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java index 30664f53f7..c0611a2cd9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java @@ -226,10 +226,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java index 7812416392..027ab83a10 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java @@ -561,10 +561,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java index 73d4b39d5b..8389e5aabc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java @@ -317,10 +317,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java index b9ab099400..a8c0c90fed 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java @@ -248,10 +248,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java index 77bd18091b..cfde5cf6e9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java @@ -646,10 +646,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java index 9d8075531a..e66546f172 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java @@ -296,10 +296,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java index d0e4f6cca1..c8dc016bf6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java @@ -334,10 +334,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/AnyValue.java b/jOOQ/src/main/java/org/jooq/impl/AnyValue.java index 72cc63bc8e..f8b0cb4a38 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AnyValue.java +++ b/jOOQ/src/main/java/org/jooq/impl/AnyValue.java @@ -173,10 +173,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Array.java b/jOOQ/src/main/java/org/jooq/impl/Array.java index ca400ebead..4147d3f6d9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Array.java +++ b/jOOQ/src/main/java/org/jooq/impl/Array.java @@ -57,8 +57,9 @@ import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; import org.jooq.Record; +// ... import org.jooq.SQLDialect; -import org.jooq.Traverser; +// ... import org.jooq.impl.QOM.UnmodifiableList; /** @@ -130,7 +131,4 @@ final class Array extends AbstractField implements QOM.Array { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java b/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java index 69c0f6f246..0a3ba18106 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java @@ -196,10 +196,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayQuery.java b/jOOQ/src/main/java/org/jooq/impl/ArrayQuery.java index 3379f536bb..bf5ce04ecd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ArrayQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/ArrayQuery.java @@ -51,9 +51,10 @@ import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; import org.jooq.Record1; +// ... import org.jooq.Select; import org.jooq.Table; -import org.jooq.Traverser; +// ... /** * @author Lukas Eder @@ -118,7 +119,4 @@ final class ArrayQuery extends AbstractField implements QOM.ArrayQuery extends AbstractCondition implements BetweenAndS - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java index 79de4cb1bb..b51b2029fa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java @@ -326,10 +326,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/BitCount.java b/jOOQ/src/main/java/org/jooq/impl/BitCount.java index 5e757d54ad..6fafe0d27e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitCount.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitCount.java @@ -496,10 +496,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/BitLength.java b/jOOQ/src/main/java/org/jooq/impl/BitLength.java index 742ade006d..1d9c8e8684 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitLength.java @@ -180,10 +180,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java index 845be08576..fc0a0b942c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java @@ -326,10 +326,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java index 94c402fba7..197c070c27 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java @@ -331,10 +331,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java index 306d740466..051018f858 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java @@ -99,9 +99,10 @@ import org.jooq.Name; // ... import org.jooq.Query; import org.jooq.QueryPart; +// ... import org.jooq.SQLDialect; import org.jooq.Statement; -import org.jooq.Traverser; +// ... // ... import org.jooq.conf.ParamType; import org.jooq.impl.QOM.UnmodifiableList; @@ -610,7 +611,4 @@ final class BlockImpl extends AbstractRowCountQuery implements Block { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java index ef8c324b7f..5ad01058b6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java +++ b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java @@ -164,10 +164,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java index d771ca1a70..203943ea21 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java +++ b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java @@ -165,10 +165,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Call.java b/jOOQ/src/main/java/org/jooq/impl/Call.java index ce1e476c06..d5c8c3d694 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Call.java +++ b/jOOQ/src/main/java/org/jooq/impl/Call.java @@ -202,10 +202,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Cardinality.java b/jOOQ/src/main/java/org/jooq/impl/Cardinality.java index c602f9d131..e0ee1294d8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cardinality.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cardinality.java @@ -149,10 +149,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java index c9f88c71c2..0a7221e59e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java @@ -61,6 +61,7 @@ import org.jooq.Context; import org.jooq.Field; // ... import org.jooq.Record1; +// ... import org.jooq.Select; import org.jooq.impl.QOM.UNotYetImplemented; diff --git a/jOOQ/src/main/java/org/jooq/impl/Cast.java b/jOOQ/src/main/java/org/jooq/impl/Cast.java index 17ae1b7074..434e31576a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cast.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cast.java @@ -69,7 +69,8 @@ import org.jooq.LanguageContext; // ... import org.jooq.QueryPart; import org.jooq.RenderContext.CastMode; -import org.jooq.Traverser; +// ... +// ... import org.jooq.impl.QOM.UTransient; /** @@ -377,10 +378,6 @@ final class Cast extends AbstractField implements QOM.Cast { - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java index 6326319b75..f424b7609b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CatalogImpl.java @@ -54,8 +54,9 @@ import org.jooq.Context; import org.jooq.Function1; import org.jooq.Name; import org.jooq.Schema; -import org.jooq.Traverser; +// ... import org.jooq.QueryPart; +// ... import org.jooq.tools.StringUtils; /** @@ -138,9 +139,6 @@ public class CatalogImpl extends AbstractNamed implements Catalog { - - - // ------------------------------------------------------------------------ diff --git a/jOOQ/src/main/java/org/jooq/impl/Ceil.java b/jOOQ/src/main/java/org/jooq/impl/Ceil.java index 267d631da8..040ca6c54d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Ceil.java +++ b/jOOQ/src/main/java/org/jooq/impl/Ceil.java @@ -168,10 +168,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CharLength.java b/jOOQ/src/main/java/org/jooq/impl/CharLength.java index 3072b95123..5ae29785fe 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CharLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/CharLength.java @@ -169,10 +169,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Chr.java b/jOOQ/src/main/java/org/jooq/impl/Chr.java index 47bd3ecbba..aed513ad6e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Chr.java +++ b/jOOQ/src/main/java/org/jooq/impl/Chr.java @@ -169,10 +169,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Coerce.java b/jOOQ/src/main/java/org/jooq/impl/Coerce.java index 3261525cfc..e822f8f96e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Coerce.java +++ b/jOOQ/src/main/java/org/jooq/impl/Coerce.java @@ -37,17 +37,14 @@ */ package org.jooq.impl; -import java.util.function.BiFunction; -import java.util.function.Predicate; - import org.jooq.Clause; import org.jooq.Context; import org.jooq.DataType; import org.jooq.Field; -import org.jooq.Function1; import org.jooq.Name; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -149,10 +146,6 @@ final class Coerce extends AbstractField implements QOM.Coerce { - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Collated.java b/jOOQ/src/main/java/org/jooq/impl/Collated.java index dff634a2dc..e99debc6df 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Collated.java +++ b/jOOQ/src/main/java/org/jooq/impl/Collated.java @@ -49,7 +49,8 @@ import org.jooq.DataType; import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -113,7 +114,4 @@ final class Collated extends AbstractField implements QOM.Collated { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java index 9e4b530955..90f267d42a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java @@ -329,10 +329,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java index 4c3123299b..9a2d4bee55 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java @@ -59,11 +59,12 @@ import org.jooq.Function1; // ... import org.jooq.QueryPart; import org.jooq.Record; +// ... import org.jooq.ResultQuery; import org.jooq.SQLDialect; import org.jooq.Select; import org.jooq.TableOptions; -import org.jooq.Traverser; +// ... import org.jooq.impl.QOM.Materialized; import org.jooq.impl.Tools.DataKey; @@ -205,7 +206,4 @@ final class CommonTableExpressionImpl extends AbstractTable - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java index 3f48df275c..bd7fd135b6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java @@ -172,10 +172,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java index 1633672fbb..83cf23b4d9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java @@ -155,10 +155,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Continue.java b/jOOQ/src/main/java/org/jooq/impl/Continue.java index 13fbfa2a7a..91b38ac18a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Continue.java +++ b/jOOQ/src/main/java/org/jooq/impl/Continue.java @@ -182,8 +182,6 @@ package org.jooq.impl; - - diff --git a/jOOQ/src/main/java/org/jooq/impl/ConvertDateTime.java b/jOOQ/src/main/java/org/jooq/impl/ConvertDateTime.java index f71f479a41..d58e0ec782 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConvertDateTime.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConvertDateTime.java @@ -226,9 +226,6 @@ package org.jooq.impl; - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Corr.java b/jOOQ/src/main/java/org/jooq/impl/Corr.java index ceaad34e96..c00d4e8608 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Corr.java +++ b/jOOQ/src/main/java/org/jooq/impl/Corr.java @@ -169,10 +169,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Cos.java b/jOOQ/src/main/java/org/jooq/impl/Cos.java index 4e4064a87c..7247f9f3a9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cos.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cos.java @@ -150,10 +150,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java index 87e9df6ae3..26d3c19531 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java @@ -177,10 +177,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java index 28270a7f76..1dc3186873 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cot.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java @@ -161,10 +161,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Coth.java b/jOOQ/src/main/java/org/jooq/impl/Coth.java index fa6d71c411..07f72fc85c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Coth.java +++ b/jOOQ/src/main/java/org/jooq/impl/Coth.java @@ -153,10 +153,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Count.java b/jOOQ/src/main/java/org/jooq/impl/Count.java index 73e924531a..8555d4d6f6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Count.java +++ b/jOOQ/src/main/java/org/jooq/impl/Count.java @@ -134,10 +134,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CountTable.java b/jOOQ/src/main/java/org/jooq/impl/CountTable.java index 5e1a03fbf5..7a0f7475e0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CountTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/CountTable.java @@ -43,8 +43,9 @@ import java.util.function.Predicate; import org.jooq.Context; import org.jooq.Function1; import org.jooq.QueryPart; +// ... import org.jooq.Table; -import org.jooq.Traverser; +// ... import org.jooq.UniqueKey; /** @@ -114,10 +115,6 @@ final class CountTable extends AbstractAggregateFunction implements QOM - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java index 63953a75fe..f527dc973c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java +++ b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java @@ -169,10 +169,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java index 5e7a36611c..e3183ac3c5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java @@ -169,10 +169,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java index 7c91dd8956..90f07cc75b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java @@ -162,10 +162,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java index ffe519206b..2a55590e06 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java @@ -282,10 +282,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java index 843c67649f..0947ba8090 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java @@ -441,10 +441,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java index b93279a769..7900f8b099 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java @@ -487,10 +487,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java index d7967e3ef4..473c05542d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java @@ -384,10 +384,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java index 5d92a7ab47..8be1db0086 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java @@ -217,10 +217,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java index 76f65198f0..e821dfbf5e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java @@ -455,10 +455,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java index be7f0c03a0..3c4e42bcf5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java @@ -719,10 +719,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java index 4b9fd4cbce..abf1611eef 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java @@ -60,7 +60,8 @@ import org.jooq.conf.ParamType; import org.jooq.impl.QOM.CreateType; import org.jooq.impl.QOM.UnmodifiableList; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -150,7 +151,4 @@ final class CreateTypeImpl extends AbstractDDLQuery implements - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java index c530dedcbe..236e1b68d0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java @@ -87,12 +87,13 @@ import org.jooq.Function1; import org.jooq.Name; import org.jooq.QueryPart; import org.jooq.Record; +// ... import org.jooq.ResultQuery; import org.jooq.SQL; import org.jooq.SQLDialect; import org.jooq.Select; import org.jooq.Table; -import org.jooq.Traverser; +// ... import org.jooq.impl.QOM.CreateView; import org.jooq.impl.QOM.UnmodifiableList; @@ -326,8 +327,5 @@ final class CreateViewImpl extends AbstractDDLQuery implements - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/CumeDist.java b/jOOQ/src/main/java/org/jooq/impl/CumeDist.java index 5059604847..c65b5e20e7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CumeDist.java +++ b/jOOQ/src/main/java/org/jooq/impl/CumeDist.java @@ -53,8 +53,9 @@ import org.jooq.Context; import org.jooq.Function1; // ... import org.jooq.QueryPart; +// ... import org.jooq.SQLDialect; -import org.jooq.Traverser; +// ... import org.jooq.WindowSpecification; /** @@ -109,10 +110,6 @@ final class CumeDist extends AbstractWindowFunction implements QOM.C - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DataChangeDeltaTable.java b/jOOQ/src/main/java/org/jooq/impl/DataChangeDeltaTable.java index 05e37ffc9b..de11ac3d0a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DataChangeDeltaTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/DataChangeDeltaTable.java @@ -66,10 +66,11 @@ import org.jooq.Merge; import org.jooq.Name; import org.jooq.QueryPart; import org.jooq.Record; +// ... import org.jooq.SQLDialect; import org.jooq.Table; import org.jooq.TableOptions; -import org.jooq.Traverser; +// ... import org.jooq.Update; import org.jooq.impl.QOM.ResultOption; @@ -218,7 +219,4 @@ implements - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java index 93053e2f1c..b3664683d0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java +++ b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java @@ -474,10 +474,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DeclarationImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeclarationImpl.java index 4bdfd4cd54..a5a99cf5e2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DeclarationImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DeclarationImpl.java @@ -223,8 +223,6 @@ package org.jooq.impl; - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java b/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java index 997adc44ca..5fba3a91ca 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultAggregateFunction.java @@ -47,6 +47,7 @@ import org.jooq.Field; import org.jooq.Function1; import org.jooq.Name; import org.jooq.QueryPart; +// ... /** * A field that handles built-in functions, aggregate functions, and window @@ -88,7 +89,4 @@ final class DefaultAggregateFunction extends AbstractAggregateFunction { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java index 6ee2876155..f392dbdea3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java +++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java @@ -177,10 +177,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DenseRank.java b/jOOQ/src/main/java/org/jooq/impl/DenseRank.java index accbc1b8e1..170b34f662 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DenseRank.java +++ b/jOOQ/src/main/java/org/jooq/impl/DenseRank.java @@ -46,7 +46,8 @@ import java.util.function.Predicate; import org.jooq.Context; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -90,10 +91,6 @@ final class DenseRank extends AbstractWindowFunction implements QOM.Den - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java index e3ec94b480..4a03989d6f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java @@ -72,9 +72,10 @@ import org.jooq.Field; import org.jooq.Function1; import org.jooq.Name; import org.jooq.ResultQuery; -import org.jooq.Traverser; +// ... import org.jooq.impl.QOM.UnmodifiableList; import org.jooq.QueryPart; +// ... import org.jooq.impl.QOM.Materialized; /** @@ -205,7 +206,4 @@ implements - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/Digits.java b/jOOQ/src/main/java/org/jooq/impl/Digits.java index db2675d7d7..b5bdda2071 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Digits.java +++ b/jOOQ/src/main/java/org/jooq/impl/Digits.java @@ -166,10 +166,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java index ee887aadd4..c4a414aa18 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java @@ -162,10 +162,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java index dfe7a4463b..20664a4026 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java @@ -217,10 +217,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java index a7c40c3dd4..7eeac22b0b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java @@ -163,10 +163,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java index e326f5f5ce..25979175da 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java @@ -259,10 +259,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java index a7c40c3dd4..7eeac22b0b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java @@ -163,10 +163,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java index 0e90876157..4275b0183f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java @@ -252,10 +252,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java index 1288c8c557..25cb2c5de5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java @@ -189,10 +189,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java index 29452eaaa1..a38e4585fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java @@ -241,10 +241,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java index 3dab840fb3..6e5bf052e2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java @@ -164,10 +164,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java index 09d6c15b6c..9917dafd06 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java @@ -58,7 +58,8 @@ import org.jooq.impl.QOM.Cascade; import org.jooq.impl.QOM.DropType; import org.jooq.impl.QOM.UnmodifiableList; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -151,8 +152,5 @@ implements - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java index 6c3dd4566f..ebeeb28f5e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java @@ -176,10 +176,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Execute.java b/jOOQ/src/main/java/org/jooq/impl/Execute.java index 871c3d59aa..13fbfa2a7a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Execute.java +++ b/jOOQ/src/main/java/org/jooq/impl/Execute.java @@ -182,10 +182,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Exists.java b/jOOQ/src/main/java/org/jooq/impl/Exists.java index fd8e3c7bce..3908432397 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Exists.java +++ b/jOOQ/src/main/java/org/jooq/impl/Exists.java @@ -162,10 +162,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Exit.java b/jOOQ/src/main/java/org/jooq/impl/Exit.java index 255d7e8f08..13fbfa2a7a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Exit.java +++ b/jOOQ/src/main/java/org/jooq/impl/Exit.java @@ -184,8 +184,6 @@ package org.jooq.impl; - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Exp.java b/jOOQ/src/main/java/org/jooq/impl/Exp.java index 0e21196d3c..ce6b7c3c3c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Exp.java +++ b/jOOQ/src/main/java/org/jooq/impl/Exp.java @@ -161,10 +161,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Extract.java b/jOOQ/src/main/java/org/jooq/impl/Extract.java index 45e4c346e5..bb426e67c0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Extract.java +++ b/jOOQ/src/main/java/org/jooq/impl/Extract.java @@ -82,7 +82,8 @@ import org.jooq.Field; import org.jooq.Function1; import org.jooq.Keyword; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -519,7 +520,4 @@ final class Extract extends AbstractField implements QOM.Extract { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldAlias.java b/jOOQ/src/main/java/org/jooq/impl/FieldAlias.java index a153a21dcc..9107f5f7e8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FieldAlias.java +++ b/jOOQ/src/main/java/org/jooq/impl/FieldAlias.java @@ -47,7 +47,8 @@ import org.jooq.Field; import org.jooq.Function1; import org.jooq.Name; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -124,7 +125,4 @@ final class FieldAlias extends AbstractField implements QOM.FieldAlias - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java index e6d58496d7..9b42f468ae 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java @@ -159,10 +159,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/FirstValue.java b/jOOQ/src/main/java/org/jooq/impl/FirstValue.java index 1854cbbfed..596eb23c22 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FirstValue.java +++ b/jOOQ/src/main/java/org/jooq/impl/FirstValue.java @@ -46,7 +46,8 @@ import org.jooq.Context; import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -111,10 +112,6 @@ final class FirstValue extends AbstractWindowFunction implements QOM.First - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Floor.java b/jOOQ/src/main/java/org/jooq/impl/Floor.java index 5a98f1c797..94277c1440 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Floor.java +++ b/jOOQ/src/main/java/org/jooq/impl/Floor.java @@ -156,10 +156,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Function.java b/jOOQ/src/main/java/org/jooq/impl/Function.java index 9e9f665c5f..8c45f8aa1c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Function.java +++ b/jOOQ/src/main/java/org/jooq/impl/Function.java @@ -50,7 +50,8 @@ import org.jooq.Field; import org.jooq.Function1; import org.jooq.Name; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... import org.jooq.impl.QOM.UnmodifiableList; /** @@ -111,10 +112,6 @@ final class Function extends AbstractField implements QOM.Function { - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Function1.java b/jOOQ/src/main/java/org/jooq/impl/Function1.java index a07137aca2..3b69514f84 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Function1.java +++ b/jOOQ/src/main/java/org/jooq/impl/Function1.java @@ -47,7 +47,8 @@ import org.jooq.DataType; import org.jooq.Field; import org.jooq.Name; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... import org.jooq.impl.QOM.UnmodifiableList; /** @@ -102,10 +103,6 @@ final class Function1 extends AbstractField implements QOM.Function { - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Goto.java b/jOOQ/src/main/java/org/jooq/impl/Goto.java index b5a24b3414..f8b34fa1f5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Goto.java +++ b/jOOQ/src/main/java/org/jooq/impl/Goto.java @@ -154,10 +154,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java index b6acd8b58f..34eddc6e13 100644 --- a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java @@ -275,10 +275,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java index 65dea5bbbc..85e5b86e55 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java @@ -291,10 +291,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONEntryImpl.java b/jOOQ/src/main/java/org/jooq/impl/JSONEntryImpl.java index a56bdfa9cb..9550c72bcf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONEntryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONEntryImpl.java @@ -82,10 +82,11 @@ import org.jooq.JSONEntryValueStep; import org.jooq.Param; // ... import org.jooq.Record1; +// ... import org.jooq.SQLDialect; import org.jooq.Scope; import org.jooq.Select; -import org.jooq.Traverser; +// ... import org.jooq.conf.NestedCollectionEmulation; import org.jooq.QueryPart; @@ -331,7 +332,4 @@ final class JSONEntryImpl extends AbstractQueryPart implements JSONEntry, - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java index b52b81fa62..5992c7b720 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java @@ -323,10 +323,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java index 57e236c8a7..aec02a0b8c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java @@ -203,10 +203,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/LabelImpl.java b/jOOQ/src/main/java/org/jooq/impl/LabelImpl.java index e77d780813..cc1cb0edc3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LabelImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/LabelImpl.java @@ -101,8 +101,6 @@ package org.jooq.impl; - - diff --git a/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java b/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java index 1dfd20a351..f7bc570ad1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java +++ b/jOOQ/src/main/java/org/jooq/impl/LabelledStatement.java @@ -113,8 +113,6 @@ package org.jooq.impl; - - diff --git a/jOOQ/src/main/java/org/jooq/impl/LastValue.java b/jOOQ/src/main/java/org/jooq/impl/LastValue.java index 056f5eb3c4..e2ba14896a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LastValue.java +++ b/jOOQ/src/main/java/org/jooq/impl/LastValue.java @@ -46,7 +46,8 @@ import org.jooq.Context; import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -111,10 +112,6 @@ final class LastValue extends AbstractWindowFunction implements QOM.LastVa - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/LazyCatalog.java b/jOOQ/src/main/java/org/jooq/impl/LazyCatalog.java index 09237f9d5b..0ea49589ad 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LazyCatalog.java +++ b/jOOQ/src/main/java/org/jooq/impl/LazyCatalog.java @@ -48,8 +48,9 @@ import org.jooq.Function1; import org.jooq.Internal; import org.jooq.Name; import org.jooq.Schema; -import org.jooq.Traverser; +// ... import org.jooq.QueryPart; +// ... /** * A schema that references a lazy initialisable {@link Catalog} singleton, for @@ -131,8 +132,5 @@ public final class LazyCatalog extends AbstractNamed implements Catalog { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/LazySchema.java b/jOOQ/src/main/java/org/jooq/impl/LazySchema.java index 69b0226dbb..ef1e3cc2ac 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LazySchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/LazySchema.java @@ -54,10 +54,11 @@ import org.jooq.Name; import org.jooq.Schema; import org.jooq.Sequence; import org.jooq.Table; -import org.jooq.Traverser; +// ... import org.jooq.UDT; import org.jooq.UniqueKey; import org.jooq.QueryPart; +// ... /** * A schema that references a lazy initialisable {@link Schema} singleton, for @@ -284,8 +285,5 @@ public final class LazySchema extends AbstractNamed implements Schema { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/LazyVal.java b/jOOQ/src/main/java/org/jooq/impl/LazyVal.java index 29bc932bbe..2feef27291 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LazyVal.java +++ b/jOOQ/src/main/java/org/jooq/impl/LazyVal.java @@ -46,7 +46,8 @@ import org.jooq.Function1; import org.jooq.Param; import org.jooq.ParamMode; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... import org.jooq.conf.ParamType; /** @@ -171,7 +172,4 @@ final class LazyVal extends AbstractParamX implements QOM.Val { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/Left.java b/jOOQ/src/main/java/org/jooq/impl/Left.java index 6160618e70..5055e602bf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Left.java +++ b/jOOQ/src/main/java/org/jooq/impl/Left.java @@ -172,10 +172,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/LinkImpl.java b/jOOQ/src/main/java/org/jooq/impl/LinkImpl.java index 37f3e645b7..92a67ac8bc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LinkImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/LinkImpl.java @@ -114,8 +114,6 @@ package org.jooq.impl; - - diff --git a/jOOQ/src/main/java/org/jooq/impl/LinkedTable.java b/jOOQ/src/main/java/org/jooq/impl/LinkedTable.java index d856dc4531..1dfd20a351 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LinkedTable.java +++ b/jOOQ/src/main/java/org/jooq/impl/LinkedTable.java @@ -115,8 +115,6 @@ package org.jooq.impl; - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Log.java b/jOOQ/src/main/java/org/jooq/impl/Log.java index 0a29e2757e..1b16310ad3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Log.java +++ b/jOOQ/src/main/java/org/jooq/impl/Log.java @@ -240,10 +240,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Log10.java b/jOOQ/src/main/java/org/jooq/impl/Log10.java index b8a0ba4ef4..f244974d9c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Log10.java +++ b/jOOQ/src/main/java/org/jooq/impl/Log10.java @@ -177,10 +177,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Lower.java b/jOOQ/src/main/java/org/jooq/impl/Lower.java index af915cd16a..4b3929f4dc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Lower.java +++ b/jOOQ/src/main/java/org/jooq/impl/Lower.java @@ -155,10 +155,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Lpad.java b/jOOQ/src/main/java/org/jooq/impl/Lpad.java index bb1a1f25bd..9f10803177 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java +++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java @@ -224,10 +224,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/MD5.java b/jOOQ/src/main/java/org/jooq/impl/MD5.java index 2b32cbf93c..df6e2ea35f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MD5.java +++ b/jOOQ/src/main/java/org/jooq/impl/MD5.java @@ -179,10 +179,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Max.java b/jOOQ/src/main/java/org/jooq/impl/Max.java index 955242f15e..2ef01416ef 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Max.java +++ b/jOOQ/src/main/java/org/jooq/impl/Max.java @@ -135,10 +135,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Median.java b/jOOQ/src/main/java/org/jooq/impl/Median.java index e43927b31e..47dd11d329 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Median.java +++ b/jOOQ/src/main/java/org/jooq/impl/Median.java @@ -138,10 +138,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Min.java b/jOOQ/src/main/java/org/jooq/impl/Min.java index 0d5b34d7ab..4aa38ed4e4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Min.java +++ b/jOOQ/src/main/java/org/jooq/impl/Min.java @@ -135,10 +135,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Multiset.java b/jOOQ/src/main/java/org/jooq/impl/Multiset.java index 33fbcd27e3..c12f753a15 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Multiset.java +++ b/jOOQ/src/main/java/org/jooq/impl/Multiset.java @@ -91,12 +91,13 @@ import org.jooq.Name; import org.jooq.QueryPart; import org.jooq.Record; import org.jooq.Record1; +// ... import org.jooq.Result; import org.jooq.SQLDialect; import org.jooq.Scope; import org.jooq.Select; import org.jooq.Table; -import org.jooq.Traverser; +// ... import org.jooq.XML; import org.jooq.XMLAggOrderByStep; @@ -417,7 +418,4 @@ final class Multiset extends AbstractField> implemen - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/MultisetAgg.java b/jOOQ/src/main/java/org/jooq/impl/MultisetAgg.java index be21f72350..3361a2cd40 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MultisetAgg.java +++ b/jOOQ/src/main/java/org/jooq/impl/MultisetAgg.java @@ -66,10 +66,11 @@ import org.jooq.JSONArrayAggOrderByStep; import org.jooq.JSONB; import org.jooq.QueryPart; import org.jooq.Record; +// ... import org.jooq.Result; import org.jooq.Row; import org.jooq.SelectField; -import org.jooq.Traverser; +// ... import org.jooq.XML; import org.jooq.XMLAggOrderByStep; @@ -193,7 +194,4 @@ final class MultisetAgg extends AbstractAggregateFunction extends AbstractWindowFunction implements QOM.NthValu - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Ntile.java b/jOOQ/src/main/java/org/jooq/impl/Ntile.java index 698dad81bf..b65de71dcf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Ntile.java +++ b/jOOQ/src/main/java/org/jooq/impl/Ntile.java @@ -47,7 +47,8 @@ import org.jooq.Context; import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -102,10 +103,6 @@ final class Ntile extends AbstractWindowFunction implements QOM.Ntile { - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Nullif.java b/jOOQ/src/main/java/org/jooq/impl/Nullif.java index b05e7681f7..6831b9f3c7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Nullif.java +++ b/jOOQ/src/main/java/org/jooq/impl/Nullif.java @@ -173,10 +173,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Nvl.java b/jOOQ/src/main/java/org/jooq/impl/Nvl.java index b255b997c8..8158fb311e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Nvl.java +++ b/jOOQ/src/main/java/org/jooq/impl/Nvl.java @@ -214,10 +214,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java index 1db6ec3588..cf91300bf7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java @@ -171,10 +171,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Overlay.java b/jOOQ/src/main/java/org/jooq/impl/Overlay.java index ea4ee72a50..160ff9ea1f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Overlay.java +++ b/jOOQ/src/main/java/org/jooq/impl/Overlay.java @@ -251,10 +251,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java b/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java index 465b804a85..5a158fb754 100644 --- a/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/PackageImpl.java @@ -46,8 +46,9 @@ import org.jooq.Function1; import org.jooq.Package; import org.jooq.SQLDialect; import org.jooq.Schema; -import org.jooq.Traverser; +// ... import org.jooq.QueryPart; +// ... /** * A default implementation for packages (containers of stored procedures and @@ -112,7 +113,4 @@ public class PackageImpl extends AbstractNamed implements Package { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/PercentRank.java b/jOOQ/src/main/java/org/jooq/impl/PercentRank.java index 37a535826a..dee3ddbcfd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/PercentRank.java +++ b/jOOQ/src/main/java/org/jooq/impl/PercentRank.java @@ -56,8 +56,9 @@ import org.jooq.Context; import org.jooq.Function1; // ... import org.jooq.QueryPart; +// ... import org.jooq.SQLDialect; -import org.jooq.Traverser; +// ... import org.jooq.WindowSpecification; /** @@ -118,10 +119,6 @@ final class PercentRank extends AbstractWindowFunction implements QO - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java index e42ee9cc4a..bc4323fe82 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Position.java +++ b/jOOQ/src/main/java/org/jooq/impl/Position.java @@ -267,10 +267,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Prior.java b/jOOQ/src/main/java/org/jooq/impl/Prior.java index cbcf8eed67..f292852914 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Prior.java +++ b/jOOQ/src/main/java/org/jooq/impl/Prior.java @@ -177,10 +177,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Product.java b/jOOQ/src/main/java/org/jooq/impl/Product.java index 28ff799789..6ddf7a10f6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Product.java +++ b/jOOQ/src/main/java/org/jooq/impl/Product.java @@ -217,10 +217,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/QOM.java b/jOOQ/src/main/java/org/jooq/impl/QOM.java index 1b69cea789..3f8477dcba 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QOM.java +++ b/jOOQ/src/main/java/org/jooq/impl/QOM.java @@ -103,6 +103,7 @@ import org.jooq.Query; import org.jooq.QueryPart; import org.jooq.Record; import org.jooq.Record1; +// ... import org.jooq.Result; import org.jooq.ResultQuery; import org.jooq.Role; @@ -116,7 +117,7 @@ import org.jooq.Sequence; // ... import org.jooq.Statement; import org.jooq.Table; -import org.jooq.Traverser; +// ... // ... import org.jooq.WindowDefinition; import org.jooq.WindowSpecification; @@ -5950,10 +5951,6 @@ public final class QOM { - - - - @@ -5985,10 +5982,6 @@ public final class QOM { - - - - @@ -6023,10 +6016,6 @@ public final class QOM { - - - - @@ -6078,9 +6067,6 @@ public final class QOM { - - - } interface UEmpty extends org.jooq.QueryPart { @@ -6101,9 +6087,6 @@ public final class QOM { - - - } // ------------------------------------------------------------------------- @@ -7022,35 +7005,6 @@ public final class QOM { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/QualifiedAsteriskImpl.java b/jOOQ/src/main/java/org/jooq/impl/QualifiedAsteriskImpl.java index d20574c9f9..ed65adcbe8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QualifiedAsteriskImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/QualifiedAsteriskImpl.java @@ -49,8 +49,9 @@ import org.jooq.Function1; import org.jooq.Name; import org.jooq.QualifiedAsterisk; import org.jooq.QueryPart; +// ... import org.jooq.Table; -import org.jooq.Traverser; +// ... import org.jooq.impl.QOM.UnmodifiableList; /** @@ -147,7 +148,4 @@ final class QualifiedAsteriskImpl extends AbstractQueryPart implements Qualified - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java b/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java index 36bf91da81..76ac6dad4e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java @@ -56,9 +56,10 @@ import org.jooq.Function1; import org.jooq.Queries; import org.jooq.Query; import org.jooq.QueryPart; +// ... import org.jooq.ResultQuery; import org.jooq.Results; -import org.jooq.Traverser; +// ... import org.jooq.impl.DefaultParseContext.IgnoreQuery; import org.jooq.impl.QOM.UnmodifiableList; import org.jooq.impl.ResultsImpl.ResultOrRowsImpl; @@ -196,9 +197,6 @@ final class QueriesImpl extends AbstractAttachableQueryPart implements Queries { - - - // ------------------------------------------------------------------------ // Object API // ------------------------------------------------------------------------ diff --git a/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java b/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java index 6abd0812f9..2651ad315b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java +++ b/jOOQ/src/main/java/org/jooq/impl/QueryPartCollectionView.java @@ -60,7 +60,8 @@ import org.jooq.Context; import org.jooq.Function1; import org.jooq.QueryPart; import org.jooq.QueryPartInternal; -import org.jooq.Traverser; +// ... +// ... import org.jooq.impl.QOM.UnmodifiableCollection; /** @@ -371,9 +372,6 @@ implements - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java index 5b91ea02f5..41d8cf476c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java @@ -203,10 +203,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Radians.java b/jOOQ/src/main/java/org/jooq/impl/Radians.java index 9315b04311..d4f887b9cd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Radians.java +++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java @@ -166,10 +166,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Rank.java b/jOOQ/src/main/java/org/jooq/impl/Rank.java index 3fd508ec19..8aaa961f10 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Rank.java +++ b/jOOQ/src/main/java/org/jooq/impl/Rank.java @@ -46,7 +46,8 @@ import java.util.function.Predicate; import org.jooq.Context; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -90,10 +91,6 @@ final class Rank extends AbstractWindowFunction implements QOM.Rank { - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RatioToReport.java b/jOOQ/src/main/java/org/jooq/impl/RatioToReport.java index 47b8172468..ec50bc83cf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RatioToReport.java +++ b/jOOQ/src/main/java/org/jooq/impl/RatioToReport.java @@ -52,7 +52,8 @@ import org.jooq.DataType; import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... import org.jetbrains.annotations.NotNull; @@ -151,7 +152,4 @@ implements - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java b/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java index 867e623de0..97b4b383c2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java @@ -51,7 +51,8 @@ import org.jooq.Context; import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -163,7 +164,4 @@ final class RegexpLike extends AbstractCondition implements QOM.RegexpLike { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java index 59bf0ec5e8..649d19c9a7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgX.java @@ -179,10 +179,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java index 82a5cf4c01..c72a0fe0ed 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgY.java @@ -179,10 +179,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java index 496f34143e..a38d236d60 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java @@ -165,10 +165,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java index 81283f2bae..96ef8df513 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java @@ -169,10 +169,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java index bc1031ae72..e551d3206a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java @@ -173,10 +173,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java index edb5d17d75..6f1e148f41 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java @@ -169,10 +169,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java index 1be5245fa3..01d11743d9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java @@ -179,10 +179,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java index 4582b19725..070c56c286 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java @@ -183,10 +183,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java index 0018f25c5a..e0909fcb21 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java @@ -179,10 +179,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java index 7c88814944..f0c5d43fe0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java +++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java @@ -193,10 +193,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java index f9c9d47794..a15cde4180 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Replace.java +++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java @@ -246,10 +246,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Return.java b/jOOQ/src/main/java/org/jooq/impl/Return.java index f31aafc056..e0eac43726 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Return.java +++ b/jOOQ/src/main/java/org/jooq/impl/Return.java @@ -189,10 +189,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Reverse.java b/jOOQ/src/main/java/org/jooq/impl/Reverse.java index ecb185e9b9..939f1c4de8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java +++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java @@ -155,10 +155,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java index d9f7a7783a..a1f3c7cd54 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java @@ -273,10 +273,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Right.java b/jOOQ/src/main/java/org/jooq/impl/Right.java index 3d831cee4a..d1ae2405ea 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Right.java +++ b/jOOQ/src/main/java/org/jooq/impl/Right.java @@ -175,10 +175,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RoleImpl.java b/jOOQ/src/main/java/org/jooq/impl/RoleImpl.java index 3f5a6c6ead..0319592b25 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RoleImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/RoleImpl.java @@ -48,8 +48,9 @@ import org.jooq.Context; import org.jooq.Function1; import org.jooq.Name; import org.jooq.QueryPart; +// ... import org.jooq.Role; -import org.jooq.Traverser; +// ... /** * A common implementation of the Role type. @@ -94,8 +95,5 @@ final class RoleImpl extends AbstractNamed implements Role { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/Round.java b/jOOQ/src/main/java/org/jooq/impl/Round.java index f7fb1e297e..e2448d7945 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Round.java +++ b/jOOQ/src/main/java/org/jooq/impl/Round.java @@ -242,10 +242,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RowField.java b/jOOQ/src/main/java/org/jooq/impl/RowField.java index 9948b341e4..5408d7dc3f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowField.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowField.java @@ -98,9 +98,10 @@ import org.jooq.Function1; import org.jooq.Name; import org.jooq.QueryPart; import org.jooq.Record; +// ... import org.jooq.Row; import org.jooq.SQLDialect; -import org.jooq.Traverser; +// ... /** * @author Lukas Eder @@ -289,7 +290,4 @@ final class RowField extends AbstractField< - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/RowNumber.java b/jOOQ/src/main/java/org/jooq/impl/RowNumber.java index fdb8a1cae8..160292cce3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowNumber.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowNumber.java @@ -47,7 +47,8 @@ import java.util.function.Predicate; import org.jooq.Context; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * @author Lukas Eder @@ -97,10 +98,6 @@ final class RowNumber extends AbstractWindowFunction implements QOM.Row - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java b/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java index 22c9ed33e0..a3e4c5f57c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java @@ -52,9 +52,10 @@ import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; import org.jooq.Record; +// ... import org.jooq.Table; import org.jooq.TableOptions; -import org.jooq.Traverser; +// ... import org.jooq.impl.QOM.UnmodifiableList; /** @@ -116,10 +117,6 @@ final class RowsFrom extends AbstractTable implements QOM.RowsFrom { - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Rpad.java b/jOOQ/src/main/java/org/jooq/impl/Rpad.java index 57edda4d5d..d8439476f4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Rpad.java +++ b/jOOQ/src/main/java/org/jooq/impl/Rpad.java @@ -224,10 +224,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java index b5db310413..50bb76f755 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SchemaImpl.java @@ -65,10 +65,11 @@ import org.jooq.Name; import org.jooq.Schema; import org.jooq.Sequence; import org.jooq.Table; -import org.jooq.Traverser; +// ... import org.jooq.UDT; import org.jooq.UniqueKey; import org.jooq.QueryPart; +// ... import org.jooq.tools.StringUtils; /** @@ -362,9 +363,6 @@ public class SchemaImpl extends AbstractNamed implements Schema { - - - // ------------------------------------------------------------------------ diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 1934ea8a19..41c77258e2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -40,7 +40,6 @@ package org.jooq.impl; import static java.lang.Boolean.TRUE; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import static java.util.function.Function.identity; import static java.util.stream.IntStream.range; import static org.jooq.Clause.SELECT; import static org.jooq.Clause.SELECT_CONNECT_BY; @@ -109,7 +108,7 @@ import static org.jooq.SQLDialect.SQLITE; // ... import static org.jooq.SQLDialect.YUGABYTEDB; import static org.jooq.SortOrder.DESC; -import static org.jooq.Traversers.containing; +// ... import static org.jooq.conf.ParamType.INLINED; import static org.jooq.impl.AsteriskImpl.NO_SUPPORT_UNQUALIFIED_COMBINED; import static org.jooq.impl.AsteriskImpl.SUPPORT_NATIVE_EXCEPT; @@ -234,7 +233,6 @@ import java.util.Set; import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; -import java.util.function.Predicate; import org.jooq.Clause; import org.jooq.Comparator; @@ -244,7 +242,6 @@ import org.jooq.Context; import org.jooq.DataType; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function1; import org.jooq.GroupField; import org.jooq.JSONEntry; import org.jooq.JSONObjectNullStep; @@ -258,6 +255,7 @@ import org.jooq.Param; import org.jooq.QualifiedAsterisk; import org.jooq.QueryPart; import org.jooq.Record; +// ... import org.jooq.Row; import org.jooq.SQLDialect; import org.jooq.Scope; @@ -277,7 +275,7 @@ import org.jooq.TableLike; import org.jooq.TableOnStep; import org.jooq.TableOptionalOnStep; import org.jooq.TablePartitionByStep; -import org.jooq.Traverser; +// ... // ... import org.jooq.WindowDefinition; import org.jooq.XML; @@ -285,8 +283,8 @@ import org.jooq.exception.DataAccessException; import org.jooq.impl.ForLock.ForLockMode; import org.jooq.impl.ForLock.ForLockWaitMode; import org.jooq.impl.QOM.CompareCondition; -import org.jooq.impl.QOM.UnmodifiableList; import org.jooq.impl.QOM.Materialized; +import org.jooq.impl.QOM.UnmodifiableList; import org.jooq.impl.Tools.BooleanDataKey; import org.jooq.impl.Tools.DataExtendedKey; import org.jooq.impl.Tools.DataKey; @@ -1217,6 +1215,7 @@ final class SelectQueryImpl extends AbstractResultQuery imp + @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -4688,10 +4687,6 @@ final class SelectQueryImpl extends AbstractResultQuery imp - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java index b4e490cfaa..df8df869ee 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java @@ -161,10 +161,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java index 323912cd6d..fabbadf7db 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java @@ -165,10 +165,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java index 206a6e7195..6af994cec4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java @@ -166,10 +166,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Sign.java b/jOOQ/src/main/java/org/jooq/impl/Sign.java index 9193b6a3ce..2b80c5e580 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sign.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sign.java @@ -161,10 +161,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Signal.java b/jOOQ/src/main/java/org/jooq/impl/Signal.java index 4104af4247..2c47b7030c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Signal.java +++ b/jOOQ/src/main/java/org/jooq/impl/Signal.java @@ -251,10 +251,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Sin.java b/jOOQ/src/main/java/org/jooq/impl/Sin.java index aaade32645..da90f3da16 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sin.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sin.java @@ -150,10 +150,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java index 0b849cbafd..47768cf869 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java @@ -174,10 +174,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java index aaf66ee09f..da963eb7a3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java @@ -71,8 +71,9 @@ import org.jooq.Function1; import org.jooq.SQLDialect; import org.jooq.SortField; import org.jooq.SortOrder; -import org.jooq.Traverser; +// ... import org.jooq.QueryPart; +// ... import org.jooq.impl.QOM.NullOrdering; @@ -233,10 +234,6 @@ final class SortFieldImpl extends AbstractQueryPart implements SortField, - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Space.java b/jOOQ/src/main/java/org/jooq/impl/Space.java index 2ee394e39f..4114283fd9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Space.java +++ b/jOOQ/src/main/java/org/jooq/impl/Space.java @@ -173,10 +173,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java index 6960c81b70..0e66dbd37d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java +++ b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java @@ -258,10 +258,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java index 413b098c30..2385675899 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java @@ -169,10 +169,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Square.java b/jOOQ/src/main/java/org/jooq/impl/Square.java index 21ec04b3f0..073b4e8438 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Square.java +++ b/jOOQ/src/main/java/org/jooq/impl/Square.java @@ -187,10 +187,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StArea.java b/jOOQ/src/main/java/org/jooq/impl/StArea.java index 723d3df8d4..672b7e22cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StArea.java +++ b/jOOQ/src/main/java/org/jooq/impl/StArea.java @@ -166,10 +166,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java b/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java index 723d3df8d4..672b7e22cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java +++ b/jOOQ/src/main/java/org/jooq/impl/StAsBinary.java @@ -166,10 +166,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StAstext.java b/jOOQ/src/main/java/org/jooq/impl/StAstext.java index 723d3df8d4..672b7e22cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StAstext.java +++ b/jOOQ/src/main/java/org/jooq/impl/StAstext.java @@ -166,10 +166,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StCentroid.java b/jOOQ/src/main/java/org/jooq/impl/StCentroid.java index 723d3df8d4..672b7e22cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StCentroid.java +++ b/jOOQ/src/main/java/org/jooq/impl/StCentroid.java @@ -166,10 +166,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StContains.java b/jOOQ/src/main/java/org/jooq/impl/StContains.java index 255d7e8f08..91b38ac18a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StContains.java +++ b/jOOQ/src/main/java/org/jooq/impl/StContains.java @@ -180,10 +180,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StCrosses.java b/jOOQ/src/main/java/org/jooq/impl/StCrosses.java index 91b38ac18a..23cf821cf1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StCrosses.java +++ b/jOOQ/src/main/java/org/jooq/impl/StCrosses.java @@ -176,10 +176,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StDifference.java b/jOOQ/src/main/java/org/jooq/impl/StDifference.java index 7a6937b26f..255d7e8f08 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StDifference.java +++ b/jOOQ/src/main/java/org/jooq/impl/StDifference.java @@ -184,10 +184,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java b/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java index 91b38ac18a..23cf821cf1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java +++ b/jOOQ/src/main/java/org/jooq/impl/StDisjoint.java @@ -176,10 +176,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StDistance.java b/jOOQ/src/main/java/org/jooq/impl/StDistance.java index 7a6937b26f..255d7e8f08 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StDistance.java +++ b/jOOQ/src/main/java/org/jooq/impl/StDistance.java @@ -184,10 +184,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java b/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java index 672b7e22cc..5c89fcd75c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java +++ b/jOOQ/src/main/java/org/jooq/impl/StEndPoint.java @@ -162,10 +162,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StEquals.java b/jOOQ/src/main/java/org/jooq/impl/StEquals.java index 255d7e8f08..91b38ac18a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StEquals.java +++ b/jOOQ/src/main/java/org/jooq/impl/StEquals.java @@ -180,10 +180,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java b/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java index 723d3df8d4..672b7e22cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java +++ b/jOOQ/src/main/java/org/jooq/impl/StExteriorRing.java @@ -166,10 +166,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java b/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java index 1d634d40ee..ed882cf3a4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java +++ b/jOOQ/src/main/java/org/jooq/impl/StGeomFromWKB.java @@ -196,10 +196,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java b/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java index 255d7e8f08..91b38ac18a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java +++ b/jOOQ/src/main/java/org/jooq/impl/StGeometryN.java @@ -180,10 +180,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java b/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java index cbcf8eed67..f292852914 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java +++ b/jOOQ/src/main/java/org/jooq/impl/StGeometryType.java @@ -177,10 +177,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java b/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java index 1d634d40ee..ed882cf3a4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java +++ b/jOOQ/src/main/java/org/jooq/impl/StGeomfromtext.java @@ -196,10 +196,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java b/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java index 7a6937b26f..255d7e8f08 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java +++ b/jOOQ/src/main/java/org/jooq/impl/StInteriorRingN.java @@ -184,10 +184,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StIntersection.java b/jOOQ/src/main/java/org/jooq/impl/StIntersection.java index 7a6937b26f..255d7e8f08 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StIntersection.java +++ b/jOOQ/src/main/java/org/jooq/impl/StIntersection.java @@ -184,10 +184,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StIntersects.java b/jOOQ/src/main/java/org/jooq/impl/StIntersects.java index 255d7e8f08..91b38ac18a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StIntersects.java +++ b/jOOQ/src/main/java/org/jooq/impl/StIntersects.java @@ -180,10 +180,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java b/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java index 5c89fcd75c..b5a24b3414 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java +++ b/jOOQ/src/main/java/org/jooq/impl/StIsClosed.java @@ -158,10 +158,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java b/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java index 5c89fcd75c..b5a24b3414 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java +++ b/jOOQ/src/main/java/org/jooq/impl/StIsEmpty.java @@ -158,10 +158,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StLength.java b/jOOQ/src/main/java/org/jooq/impl/StLength.java index 723d3df8d4..672b7e22cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/StLength.java @@ -166,10 +166,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java b/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java index 723d3df8d4..672b7e22cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java +++ b/jOOQ/src/main/java/org/jooq/impl/StNumGeometries.java @@ -166,10 +166,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java b/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java index 068797ad35..723d3df8d4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java +++ b/jOOQ/src/main/java/org/jooq/impl/StNumInteriorRings.java @@ -170,10 +170,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java b/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java index 672b7e22cc..5c89fcd75c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java +++ b/jOOQ/src/main/java/org/jooq/impl/StNumPoints.java @@ -162,10 +162,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java b/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java index 255d7e8f08..91b38ac18a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java +++ b/jOOQ/src/main/java/org/jooq/impl/StOverlaps.java @@ -180,10 +180,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StPointN.java b/jOOQ/src/main/java/org/jooq/impl/StPointN.java index 255d7e8f08..91b38ac18a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StPointN.java +++ b/jOOQ/src/main/java/org/jooq/impl/StPointN.java @@ -180,10 +180,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StSrid.java b/jOOQ/src/main/java/org/jooq/impl/StSrid.java index 723d3df8d4..672b7e22cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StSrid.java +++ b/jOOQ/src/main/java/org/jooq/impl/StSrid.java @@ -166,10 +166,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java b/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java index 672b7e22cc..5c89fcd75c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java +++ b/jOOQ/src/main/java/org/jooq/impl/StStartPoint.java @@ -162,10 +162,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StTouches.java b/jOOQ/src/main/java/org/jooq/impl/StTouches.java index 255d7e8f08..91b38ac18a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StTouches.java +++ b/jOOQ/src/main/java/org/jooq/impl/StTouches.java @@ -180,10 +180,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StUnion.java b/jOOQ/src/main/java/org/jooq/impl/StUnion.java index 55aca93bbb..6dfc01ae15 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StUnion.java +++ b/jOOQ/src/main/java/org/jooq/impl/StUnion.java @@ -191,10 +191,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StWithin.java b/jOOQ/src/main/java/org/jooq/impl/StWithin.java index 91b38ac18a..23cf821cf1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StWithin.java +++ b/jOOQ/src/main/java/org/jooq/impl/StWithin.java @@ -176,10 +176,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StX.java b/jOOQ/src/main/java/org/jooq/impl/StX.java index 723d3df8d4..672b7e22cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StX.java +++ b/jOOQ/src/main/java/org/jooq/impl/StX.java @@ -166,10 +166,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StY.java b/jOOQ/src/main/java/org/jooq/impl/StY.java index 723d3df8d4..672b7e22cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StY.java +++ b/jOOQ/src/main/java/org/jooq/impl/StY.java @@ -166,10 +166,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StZ.java b/jOOQ/src/main/java/org/jooq/impl/StZ.java index 723d3df8d4..672b7e22cc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StZ.java +++ b/jOOQ/src/main/java/org/jooq/impl/StZ.java @@ -166,10 +166,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java index 6af3e5a2f1..8833d63b25 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java +++ b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java @@ -152,10 +152,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java index c918ee2155..464493705a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java @@ -152,10 +152,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java index 7a5e1db225..aebcc22db8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Substring.java +++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java @@ -251,10 +251,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java b/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java index 42f1fffe8d..445ad461d2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java +++ b/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java @@ -197,10 +197,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Sum.java b/jOOQ/src/main/java/org/jooq/impl/Sum.java index 1eeae76526..de9403daa2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sum.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sum.java @@ -136,10 +136,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java index 99c5944a82..3d2d2dcb79 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java +++ b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java @@ -175,10 +175,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/TableAlias.java b/jOOQ/src/main/java/org/jooq/impl/TableAlias.java index 715d9e6339..45f08d280f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableAlias.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableAlias.java @@ -50,9 +50,10 @@ import org.jooq.Function1; import org.jooq.Name; import org.jooq.QueryPart; import org.jooq.Record; +// ... import org.jooq.Table; import org.jooq.TableField; -import org.jooq.Traverser; +// ... import org.jooq.UniqueKey; /** @@ -199,9 +200,6 @@ final class TableAlias extends AbstractTable implements QOM - - - // ------------------------------------------------------------------------ // XXX: Object API // ------------------------------------------------------------------------ diff --git a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java index 1c823ba1b9..57b5e56079 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TableImpl.java @@ -76,13 +76,14 @@ import org.jooq.Name; // ... import org.jooq.QueryPart; import org.jooq.Record; +// ... import org.jooq.Row; import org.jooq.SQLDialect; import org.jooq.Schema; import org.jooq.Select; import org.jooq.Table; import org.jooq.TableOptions; -import org.jooq.Traverser; +// ... import org.jooq.impl.QOM.UNotYetImplemented; import org.jooq.tools.StringUtils; @@ -457,9 +458,6 @@ implements - - - // ------------------------------------------------------------------------ diff --git a/jOOQ/src/main/java/org/jooq/impl/Tan.java b/jOOQ/src/main/java/org/jooq/impl/Tan.java index b4e58c69fd..296a77042b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tan.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tan.java @@ -150,10 +150,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java index 32bc0301c8..57cb5678df 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java @@ -174,10 +174,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/ToChar.java b/jOOQ/src/main/java/org/jooq/impl/ToChar.java index 40f82c666c..681893183a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ToChar.java +++ b/jOOQ/src/main/java/org/jooq/impl/ToChar.java @@ -197,10 +197,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/ToDate.java b/jOOQ/src/main/java/org/jooq/impl/ToDate.java index 250b89cc4e..7b5b59b605 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ToDate.java +++ b/jOOQ/src/main/java/org/jooq/impl/ToDate.java @@ -182,10 +182,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/ToHex.java b/jOOQ/src/main/java/org/jooq/impl/ToHex.java index 039c17cf16..aabd6194ff 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ToHex.java +++ b/jOOQ/src/main/java/org/jooq/impl/ToHex.java @@ -169,10 +169,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java index edc9e24f31..cd85aca9d0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java @@ -182,10 +182,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Translate.java b/jOOQ/src/main/java/org/jooq/impl/Translate.java index edb79b5924..ad36364cb1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Translate.java +++ b/jOOQ/src/main/java/org/jooq/impl/Translate.java @@ -192,10 +192,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java index 634aa97156..637c3bee93 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Trim.java +++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java @@ -209,10 +209,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Trunc.java b/jOOQ/src/main/java/org/jooq/impl/Trunc.java index fc76459141..b9670dd76d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Trunc.java +++ b/jOOQ/src/main/java/org/jooq/impl/Trunc.java @@ -226,10 +226,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java index b3eb1b1f8a..62bd12df1a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java @@ -252,10 +252,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Unique.java b/jOOQ/src/main/java/org/jooq/impl/Unique.java index 39f9a562b7..6c1d219e2e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Unique.java +++ b/jOOQ/src/main/java/org/jooq/impl/Unique.java @@ -168,10 +168,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Upper.java b/jOOQ/src/main/java/org/jooq/impl/Upper.java index 14a0075f9d..097ea02ef9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Upper.java +++ b/jOOQ/src/main/java/org/jooq/impl/Upper.java @@ -155,10 +155,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/UserImpl.java b/jOOQ/src/main/java/org/jooq/impl/UserImpl.java index 0f7bd41848..2dc15f2706 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UserImpl.java @@ -49,7 +49,8 @@ import org.jooq.Function1; import org.jooq.Name; import org.jooq.User; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... /** * A common implementation of the User type. @@ -94,8 +95,5 @@ final class UserImpl extends AbstractNamed implements User { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/VarPop.java b/jOOQ/src/main/java/org/jooq/impl/VarPop.java index f49b38f90c..5eed53379e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/VarPop.java +++ b/jOOQ/src/main/java/org/jooq/impl/VarPop.java @@ -163,10 +163,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java index f9dd22ea24..05398a3e0c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java @@ -151,10 +151,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/VariableImpl.java b/jOOQ/src/main/java/org/jooq/impl/VariableImpl.java index f9cd176ece..0e0178dc0e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/VariableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/VariableImpl.java @@ -149,8 +149,6 @@ package org.jooq.impl; - - diff --git a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java index 287b591aae..3ef50725c9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java +++ b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java @@ -216,10 +216,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java b/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java index 9b79b6bf23..200e3cbeec 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java @@ -53,8 +53,9 @@ import org.jooq.Function1; import org.jooq.Name; import org.jooq.OrderField; import org.jooq.QueryPart; +// ... import org.jooq.SortField; -import org.jooq.Traverser; +// ... import org.jooq.WindowDefinition; import org.jooq.WindowSpecification; import org.jooq.WindowSpecificationExcludeStep; @@ -370,7 +371,4 @@ final class WindowDefinitionImpl extends AbstractQueryPart implements WindowDefi - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java b/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java index a98f9461a0..4837de7a11 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java @@ -97,9 +97,10 @@ import org.jooq.Function1; import org.jooq.OrderField; // ... import org.jooq.QueryPart; +// ... import org.jooq.SQLDialect; import org.jooq.SortField; -import org.jooq.Traverser; +// ... import org.jooq.WindowSpecificationExcludeStep; import org.jooq.WindowSpecificationFinalStep; import org.jooq.WindowSpecificationOrderByStep; @@ -747,10 +748,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java index 7f66f86d4b..b36f5fb555 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java @@ -96,6 +96,7 @@ import org.jooq.Record6; import org.jooq.Record7; import org.jooq.Record8; import org.jooq.Record9; +// ... import org.jooq.ResultQuery; import org.jooq.SQL; import org.jooq.SQLDialect; @@ -104,7 +105,7 @@ import org.jooq.SelectFieldOrAsterisk; import org.jooq.SelectSelectStep; import org.jooq.SelectWhereStep; import org.jooq.Table; -import org.jooq.Traverser; +// ... import org.jooq.WithAsStep; import org.jooq.WithAsStep1; import org.jooq.WithAsStep10; @@ -1194,7 +1195,4 @@ implements - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLAttributesImpl.java b/jOOQ/src/main/java/org/jooq/impl/XMLAttributesImpl.java index 5e1086abf9..064a0c00f7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLAttributesImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLAttributesImpl.java @@ -51,7 +51,8 @@ import org.jooq.Context; import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... import org.jooq.XMLAttributes; import org.jooq.impl.QOM.UnmodifiableList; @@ -115,7 +116,4 @@ final class XMLAttributesImpl extends AbstractQueryPart implements XMLAttributes - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java index 8448d50ee8..2c88c4f3c4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java @@ -148,10 +148,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLElement.java b/jOOQ/src/main/java/org/jooq/impl/XMLElement.java index 68b7bdf947..114af92b95 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLElement.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLElement.java @@ -59,7 +59,8 @@ import org.jooq.Field; import org.jooq.Function1; import org.jooq.Name; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... import org.jooq.XML; import org.jooq.XMLAttributes; import org.jooq.impl.QOM.UnmodifiableList; @@ -194,7 +195,4 @@ final class XMLElement extends AbstractField implements QOM.XMLElement { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLExists.java b/jOOQ/src/main/java/org/jooq/impl/XMLExists.java index 0705f6540b..5f88b4e747 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLExists.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLExists.java @@ -51,7 +51,8 @@ import org.jooq.Context; import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... import org.jooq.XML; import org.jooq.XMLExistsPassingStep; import org.jooq.impl.QOM.UNotYetImplemented; @@ -153,7 +154,4 @@ final class XMLExists extends AbstractCondition implements XMLExistsPassingStep, - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java index 952e135463..e37d015786 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java @@ -152,10 +152,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLParse.java b/jOOQ/src/main/java/org/jooq/impl/XMLParse.java index 22957badbe..82e907dfc2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLParse.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLParse.java @@ -56,7 +56,8 @@ import org.jooq.Context; import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... import org.jooq.XML; import org.jooq.impl.QOM.DocumentOrContent; @@ -150,7 +151,4 @@ final class XMLParse extends AbstractField implements QOM.XMLParse { - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java index 9437c5395f..3e62358fe4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLQuery.java @@ -57,7 +57,8 @@ import org.jooq.Context; import org.jooq.Field; import org.jooq.Function1; import org.jooq.QueryPart; -import org.jooq.Traverser; +// ... +// ... import org.jooq.XML; import org.jooq.XMLQueryPassingStep; import org.jooq.impl.QOM.XMLPassingMechanism; @@ -185,7 +186,4 @@ final class XMLQuery extends AbstractField implements XMLQueryPassingStep, - - - } diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java b/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java index f42f808718..46af40e152 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java +++ b/jOOQ/src/main/java/org/jooq/impl/Xmlconcat.java @@ -150,10 +150,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java b/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java index 6e5bf052e2..9bc6ca4dc5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java +++ b/jOOQ/src/main/java/org/jooq/impl/Xmldocument.java @@ -160,10 +160,6 @@ package org.jooq.impl; - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java b/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java index b50b249bc3..ac79e61f2f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java +++ b/jOOQ/src/main/java/org/jooq/impl/Xmlpi.java @@ -184,10 +184,6 @@ implements - - - - diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java b/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java index cd39574deb..bc9e98920d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java +++ b/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java @@ -195,10 +195,6 @@ implements - - - -