diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml index 485f18dadf..c94aa046ac 100644 --- a/jOOQ-codegen-maven/pom.xml +++ b/jOOQ-codegen-maven/pom.xml @@ -28,6 +28,15 @@ + + + + apache-snapshot-repository + Apache Snapshot Repository + https://repository.apache.org/snapshots/ + + + @@ -59,8 +68,17 @@ + + + + + org.apache.maven.plugin-tools + maven-plugin-tools-annotations + 3.6.1-SNAPSHOT + + - + org.apache.maven.plugins maven-jar-plugin @@ -100,7 +118,6 @@ org.apache.maven.plugin-tools maven-plugin-annotations - provided diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java index 5fdc443bf1..2beb333a71 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java @@ -334,7 +334,7 @@ public abstract class AbstractDatabase implements Database { // [#6226] This is mostly due to a wrong Maven groupId catch (NoSuchFieldError e) { - log.error("NoSuchFieldError may happen when the jOOQ Open Source Edition (Maven groupId 'org.jooq') is used with a commercial SQLDialect. Use an appropriate groupId instead: 'org.jooq.trial', 'org.jooq.trial-java-6', 'org.jooq.trial-java-8', 'org.jooq.pro', 'org.jooq.pro-java-6', or 'org.jooq.pro-java-8'. See also: https://www.jooq.org/doc/latest/manual/getting-started/tutorials/jooq-in-7-steps/jooq-in-7-steps-step1/"); + log.error("NoSuchFieldError may happen when the jOOQ Open Source Edition (Maven groupId 'org.jooq') is used with a commercial SQLDialect. Use an appropriate groupId instead: 'org.jooq.trial', 'org.jooq.trial-java-8', 'org.jooq.trial-java-11', 'org.jooq.pro', 'org.jooq.pro-java-8', or 'org.jooq.pro-java-11'. See also: https://www.jooq.org/doc/latest/manual/getting-started/tutorials/jooq-in-7-steps/jooq-in-7-steps-step1/"); throw e; } diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java index e39d06c3c3..3dd102469f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Abs.java +++ b/jOOQ/src/main/java/org/jooq/impl/Abs.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Acos.java b/jOOQ/src/main/java/org/jooq/impl/Acos.java index 221971ee5b..879d9a93d0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Acos.java +++ b/jOOQ/src/main/java/org/jooq/impl/Acos.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java index 05fcd95cfb..79e22caecd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java index 8c8c288958..2ced60f14c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java index b06dbf1787..6b28b60f66 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java index b017950f4e..413e934e2d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java index 7374cef39e..bdae0d18aa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java index df4d53a298..67dd24625f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java index 428b66026e..16f7a0321a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Ascii.java b/jOOQ/src/main/java/org/jooq/impl/Ascii.java index 363b1db5e0..c1cb9004ea 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Ascii.java +++ b/jOOQ/src/main/java/org/jooq/impl/Ascii.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Asin.java b/jOOQ/src/main/java/org/jooq/impl/Asin.java index cdf76bc39d..48bfcdec86 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Asin.java +++ b/jOOQ/src/main/java/org/jooq/impl/Asin.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan.java b/jOOQ/src/main/java/org/jooq/impl/Atan.java index 1fed77a103..89105b5fe1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Atan.java +++ b/jOOQ/src/main/java/org/jooq/impl/Atan.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan2.java b/jOOQ/src/main/java/org/jooq/impl/Atan2.java index 718e50f484..7d0def4319 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Atan2.java +++ b/jOOQ/src/main/java/org/jooq/impl/Atan2.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/BitLength.java b/jOOQ/src/main/java/org/jooq/impl/BitLength.java index 60fdab9954..b4a20cde63 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitLength.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Call.java b/jOOQ/src/main/java/org/jooq/impl/Call.java index f8b34fa1f5..83cf23b4d9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Call.java +++ b/jOOQ/src/main/java/org/jooq/impl/Call.java @@ -157,5 +157,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Ceil.java b/jOOQ/src/main/java/org/jooq/impl/Ceil.java index 3133945acc..c7c4fdd91c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Ceil.java +++ b/jOOQ/src/main/java/org/jooq/impl/Ceil.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CharLength.java b/jOOQ/src/main/java/org/jooq/impl/CharLength.java index 78e3b4997e..af8cc46076 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CharLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/CharLength.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Chr.java b/jOOQ/src/main/java/org/jooq/impl/Chr.java index ec1d4aedb0..2a93ec3c14 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Chr.java +++ b/jOOQ/src/main/java/org/jooq/impl/Chr.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java index 2305e54158..3f4a02a376 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java index 75bb04dbc4..e77d780813 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java @@ -103,5 +103,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java index 75bb04dbc4..e77d780813 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java @@ -103,5 +103,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java index 31ef6d5a9e..676ad0d4e7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java @@ -111,5 +111,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 33024d37bd..49d2af0e2b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Corr.java +++ b/jOOQ/src/main/java/org/jooq/impl/Corr.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Cos.java b/jOOQ/src/main/java/org/jooq/impl/Cos.java index 2f2aac4918..bea7c92363 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cos.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cos.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java index 698550a0db..08a6f6389f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java index 13a34b2f92..9764ab6d62 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cot.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Coth.java b/jOOQ/src/main/java/org/jooq/impl/Coth.java index d427424960..010db836e8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Coth.java +++ b/jOOQ/src/main/java/org/jooq/impl/Coth.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java index 6441aeff28..c4c184f121 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java +++ b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java index dd8cec84cc..cd9b7c054a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java index ea06df2e81..ff7eedd788 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java index 5623496b42..87f7e85967 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java index 8541f5eb78..b13bff527e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java @@ -305,5 +305,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 9c0288bcd5..39ed85e651 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java index ee7c36b292..35cde4cee1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java @@ -287,5 +287,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 4fc350bece..9b9f828a00 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java index 994c750382..aca5b122f9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java index aec9032b16..8a4d8b3e80 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java @@ -526,5 +526,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java index f9c849d5cc..14b7696e8f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java index 88fafa4b13..2cab9c87cb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java index b2d0e23eac..946911b102 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java +++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java index f5004f360b..d4b3e112d7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java +++ b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java index 052ba9dbdc..a8e4f1036a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRecordMapper.java @@ -667,13 +667,7 @@ public class DefaultRecordMapper implements RecordMapper implements Callable { - private final Constructor constructor; - - ConstructorCall(Constructor constructor) { - this.constructor = constructor; - } - + private static final /* record */ class ConstructorCall implements Callable { private final Constructor constructor; ConstructorCall(Constructor constructor) { this.constructor = constructor; } public Constructor constructor() { return constructor; } @Override public boolean equals(Object o) { if (!(o instanceof ConstructorCall)) return false; ConstructorCall other = (ConstructorCall) o; if (!java.util.Objects.equals(this.constructor, other.constructor)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.constructor); } @Override public String toString() { return new StringBuilder("ConstructorCall[").append("constructor=").append(this.constructor).append("]").toString(); } @Override public E call() throws Exception { return constructor.newInstance(); diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java index 68db4d393f..0996eb6c90 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java +++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Deleting.java b/jOOQ/src/main/java/org/jooq/impl/Deleting.java index 22478eef71..3b3b476845 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Deleting.java +++ b/jOOQ/src/main/java/org/jooq/impl/Deleting.java @@ -99,5 +99,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Diff.java b/jOOQ/src/main/java/org/jooq/impl/Diff.java index d2784d293d..76c2ad67a4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Diff.java +++ b/jOOQ/src/main/java/org/jooq/impl/Diff.java @@ -718,19 +718,11 @@ final class Diff { return result.iterator(); } - private static final class DiffResult { - final List queries; - final Set> droppedFks; - + private static final /* record */ class DiffResult { private final List queries; private final Set> droppedFks; DiffResult(List queries, Set> droppedFks) { this.queries = queries; this.droppedFks = droppedFks; } public List queries() { return queries; } public Set> droppedFks() { return droppedFks; } @Override public boolean equals(Object o) { if (!(o instanceof DiffResult)) return false; DiffResult other = (DiffResult) o; if (!java.util.Objects.equals(this.queries, other.queries)) return false; if (!java.util.Objects.equals(this.droppedFks, other.droppedFks)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.queries, this.droppedFks); } DiffResult() { this(new ArrayList<>(), new HashSet<>()); } - DiffResult(List queries, Set> droppedFks) { - this.queries = queries; - this.droppedFks = droppedFks; - } - void addAll(DiffResult other) { queries.addAll(other.queries); droppedFks.addAll(other.droppedFks); diff --git a/jOOQ/src/main/java/org/jooq/impl/Digits.java b/jOOQ/src/main/java/org/jooq/impl/Digits.java index e53ce9d714..b0649d702f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Digits.java +++ b/jOOQ/src/main/java/org/jooq/impl/Digits.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java index e2cdaea239..5ff366fd6a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java index 3d0090d4b6..b70abcc544 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java index d856dc4531..2d870d65b2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java @@ -118,5 +118,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 85eb66173d..2cb1c2c9ff 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java index d856dc4531..2d870d65b2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java @@ -118,5 +118,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 77bfe0e32e..3bcced6241 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java index e3638b7bd8..adc12c1ded 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java index 4086ade343..8a2fb3bcd0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java index 2d870d65b2..b9aa59cabe 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java @@ -119,5 +119,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java index 5db66f8836..16547ea664 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Euler.java b/jOOQ/src/main/java/org/jooq/impl/Euler.java index 7c08be304f..ba922fde3e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Euler.java +++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Exp.java b/jOOQ/src/main/java/org/jooq/impl/Exp.java index 82b404d0af..32d17680cb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Exp.java +++ b/jOOQ/src/main/java/org/jooq/impl/Exp.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java b/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java index 317832d0a2..c1243e77b4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/ExplainQuery.java @@ -147,36 +147,11 @@ final class ExplainQuery { return new ExplainImpl(rows, cost, result.format()); } - private static final class ExplainImpl implements Explain { - - private final double rows; - private final double cost; - private final String plan; - - ExplainImpl(double rows, double cost, String plan) { - this.rows = rows; - this.cost = cost; - this.plan = plan; - } - - @Override - public final double rows() { - return rows; - } - - @Override - public final double cost() { - return cost; - } - - @Override - public final String plan() { - return plan; - } + private static final /* record */ class ExplainImpl implements Explain { private final double rows; private final double cost; private final String plan; ExplainImpl(double rows, double cost, String plan) { this.rows = rows; this.cost = cost; this.plan = plan; } public double rows() { return rows; } public double cost() { return cost; } public String plan() { return plan; } @Override public boolean equals(Object o) { if (!(o instanceof ExplainImpl)) return false; ExplainImpl other = (ExplainImpl) o; if (!java.util.Objects.equals(this.rows, other.rows)) return false; if (!java.util.Objects.equals(this.cost, other.cost)) return false; if (!java.util.Objects.equals(this.plan, other.plan)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.rows, this.cost, this.plan); } @Override public String toString() { - return String.format("Explain [cost=%.2f, rows=%.2f]\n\n", cost, rows) + plan; + return String.format("Explain [cost=%.2f, rows=%.2f]nn", cost, rows) + plan; } } } diff --git a/jOOQ/src/main/java/org/jooq/impl/Floor.java b/jOOQ/src/main/java/org/jooq/impl/Floor.java index d84647b18e..70a0ee5ada 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Floor.java +++ b/jOOQ/src/main/java/org/jooq/impl/Floor.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java index 00e497b560..1dff7a0076 100644 --- a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Inserting.java b/jOOQ/src/main/java/org/jooq/impl/Inserting.java index 22478eef71..3b3b476845 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Inserting.java +++ b/jOOQ/src/main/java/org/jooq/impl/Inserting.java @@ -99,5 +99,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java index 7aff88d699..0abbe95fba 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java index 9f38de17d9..171b540243 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java index 155baa7f9b..3331db9d46 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Left.java b/jOOQ/src/main/java/org/jooq/impl/Left.java index 6c4fb4c333..666992470f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Left.java +++ b/jOOQ/src/main/java/org/jooq/impl/Left.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Level.java b/jOOQ/src/main/java/org/jooq/impl/Level.java index 75bb04dbc4..e77d780813 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Level.java +++ b/jOOQ/src/main/java/org/jooq/impl/Level.java @@ -103,5 +103,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 b2ac1711b7..98918de7a7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Log.java +++ b/jOOQ/src/main/java/org/jooq/impl/Log.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Log10.java b/jOOQ/src/main/java/org/jooq/impl/Log10.java index f012312251..f7af2e6dcb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Log10.java +++ b/jOOQ/src/main/java/org/jooq/impl/Log10.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Lower.java b/jOOQ/src/main/java/org/jooq/impl/Lower.java index 2e4081c37b..f2c06e03f4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Lower.java +++ b/jOOQ/src/main/java/org/jooq/impl/Lower.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Lpad.java b/jOOQ/src/main/java/org/jooq/impl/Lpad.java index 6d53853825..1951e8eb89 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java +++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/MD5.java b/jOOQ/src/main/java/org/jooq/impl/MD5.java index 629af85f7a..8d534582e2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MD5.java +++ b/jOOQ/src/main/java/org/jooq/impl/MD5.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Median.java b/jOOQ/src/main/java/org/jooq/impl/Median.java index f7f9557844..0f5503da1a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Median.java +++ b/jOOQ/src/main/java/org/jooq/impl/Median.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java index e76d28d947..9fd92fd6fa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java +++ b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Overlay.java b/jOOQ/src/main/java/org/jooq/impl/Overlay.java index 3def9f3097..6636820ed7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Overlay.java +++ b/jOOQ/src/main/java/org/jooq/impl/Overlay.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index ea4e89c588..571c572ab9 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -4103,19 +4103,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { return storageStep; } - private static final class ParseInlineConstraints { - final DataType type; - final Comment fieldComment; - final boolean primary; - final boolean identity; - - ParseInlineConstraints(DataType type, Comment fieldComment, boolean primary, boolean identity) { - this.type = type; - this.fieldComment = fieldComment; - this.primary = primary; - this.identity = identity; - } - } + private static final /* record */ class ParseInlineConstraints { private final DataType type; private final Comment fieldComment; private final boolean primary; private final boolean identity; ParseInlineConstraints(DataType type, Comment fieldComment, boolean primary, boolean identity) { this.type = type; this.fieldComment = fieldComment; this.primary = primary; this.identity = identity; } public DataType type() { return type; } public Comment fieldComment() { return fieldComment; } public boolean primary() { return primary; } public boolean identity() { return identity; } @Override public boolean equals(Object o) { if (!(o instanceof ParseInlineConstraints)) return false; ParseInlineConstraints other = (ParseInlineConstraints) o; if (!java.util.Objects.equals(this.type, other.type)) return false; if (!java.util.Objects.equals(this.fieldComment, other.fieldComment)) return false; if (!java.util.Objects.equals(this.primary, other.primary)) return false; if (!java.util.Objects.equals(this.identity, other.identity)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.type, this.fieldComment, this.primary, this.identity); } @Override public String toString() { return new StringBuilder("ParseInlineConstraints[").append("type=").append(this.type).append(", fieldComment=").append(this.fieldComment).append(", primary=").append(this.primary).append(", identity=").append(this.identity).append("]").toString(); } } private final ParseInlineConstraints parseInlineConstraints( Name fieldName, @@ -13345,7 +13333,7 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { found = resolveInTableScope(tableScope.valueIterable(), lookup.getQualifiedName(), lookup, found); if (found != null) - lookup.delegate((AbstractField) found.value); + lookup.delegate((AbstractField) found.value()); else retain.add(lookup); } @@ -13368,11 +13356,11 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { for (Value> t : tables) { Value> f; - if (t.value instanceof JoinTable) { + if (t.value() instanceof JoinTable) { found = resolveInTableScope( asList( - new Value<>(t.scopeLevel, ((JoinTable) t.value).lhs), - new Value<>(t.scopeLevel, ((JoinTable) t.value).rhs) + new Value<>(t.scopeLevel(), ((JoinTable) t.value()).lhs), + new Value<>(t.scopeLevel(), ((JoinTable) t.value()).rhs) ), lookupName, lookup, found ); @@ -13385,12 +13373,12 @@ final class DefaultParseContext extends AbstractScope implements ParseContext { // - Test fully qualified column names vs partially qualified column names Name q = lookupName.qualifier(); boolean x = q.qualified(); - if (x && q.equals(t.value.getQualifiedName()) || !x && q.last().equals(t.value.getName())) - if ((found = Value.of(t.scopeLevel, t.value.field(lookup.getName()))) != null) + if (x && q.equals(t.value().getQualifiedName()) || !x && q.last().equals(t.value().getName())) + if ((found = Value.of(t.scopeLevel(), t.value().field(lookup.getName()))) != null) break tableScopeLoop; } - else if ((f = Value.of(t.scopeLevel, t.value.field(lookup.getName()))) != null) { - if (found == null || found.scopeLevel < f.scopeLevel) { + else if ((f = Value.of(t.scopeLevel(), t.value().field(lookup.getName()))) != null) { + if (found == null || found.scopeLevel() < f.scopeLevel()) { found = f; } else { diff --git a/jOOQ/src/main/java/org/jooq/impl/Pi.java b/jOOQ/src/main/java/org/jooq/impl/Pi.java index 285a14afe1..154e1199be 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Pi.java +++ b/jOOQ/src/main/java/org/jooq/impl/Pi.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java index 4c9b1f7bf6..3fe89d17d8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Position.java +++ b/jOOQ/src/main/java/org/jooq/impl/Position.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Power.java b/jOOQ/src/main/java/org/jooq/impl/Power.java index 9e55a6c8d6..16b80b6d53 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Power.java +++ b/jOOQ/src/main/java/org/jooq/impl/Power.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Prior.java b/jOOQ/src/main/java/org/jooq/impl/Prior.java index de6736f1f7..986c8f6bd2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Prior.java +++ b/jOOQ/src/main/java/org/jooq/impl/Prior.java @@ -133,5 +133,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/R2DBC.java b/jOOQ/src/main/java/org/jooq/impl/R2DBC.java index 70e9c9f429..cd0ce2c9d4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/R2DBC.java +++ b/jOOQ/src/main/java/org/jooq/impl/R2DBC.java @@ -1052,15 +1052,7 @@ final class R2DBC { return new MockArray<>(c.dialect(), (Object[]) nullable(columnIndex, Object.class), Object[].class); } - private static final class DefaultRow implements Row { - - final Configuration c; - final Row r; - - DefaultRow(Configuration c, Row r) { - this.c = c; - this.r = r; - } + private static final /* record */ class DefaultRow implements Row { private final Configuration c; private final Row r; DefaultRow(Configuration c, Row r) { this.c = c; this.r = r; } public Configuration c() { return c; } public Row r() { return r; } @Override public boolean equals(Object o) { if (!(o instanceof DefaultRow)) return false; DefaultRow other = (DefaultRow) o; if (!java.util.Objects.equals(this.c, other.c)) return false; if (!java.util.Objects.equals(this.r, other.r)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.c, this.r); } @Override public String toString() { return new StringBuilder("DefaultRow[").append("c=").append(this.c).append(", r=").append(this.r).append("]").toString(); } // These methods are proxied for some drivers that can't convert // between data types. See: @@ -1105,15 +1097,7 @@ final class R2DBC { } } - static final class R2DBCResultSetMetaData implements ResultSetMetaData { - - final Configuration c; - final RowMetadata m; - - R2DBCResultSetMetaData(Configuration c, RowMetadata m) { - this.c = c; - this.m = m; - } + static final /* record */ class R2DBCResultSetMetaData implements ResultSetMetaData { private final Configuration c; private final RowMetadata m; R2DBCResultSetMetaData(Configuration c, RowMetadata m) { this.c = c; this.m = m; } public Configuration c() { return c; } public RowMetadata m() { return m; } @Override public boolean equals(Object o) { if (!(o instanceof R2DBCResultSetMetaData)) return false; R2DBCResultSetMetaData other = (R2DBCResultSetMetaData) o; if (!java.util.Objects.equals(this.c, other.c)) return false; if (!java.util.Objects.equals(this.m, other.m)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.c, this.m); } @Override public String toString() { return new StringBuilder("R2DBCResultSetMetaData[").append("c=").append(this.c).append(", m=").append(this.m).append("]").toString(); } private final ColumnMetadata meta(int column) { return m.getColumnMetadata(column - 1); diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java index 9f09a93b1a..bc4ef64bf3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Radians.java b/jOOQ/src/main/java/org/jooq/impl/Radians.java index 84b9d672c7..4fd4ddd899 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Radians.java +++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Rand.java b/jOOQ/src/main/java/org/jooq/impl/Rand.java index c4797e96c2..b1e85d1cba 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Rand.java +++ b/jOOQ/src/main/java/org/jooq/impl/Rand.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java index b8e207a8f6..788be0d3ea 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java index c7eaa44f67..43f14993fc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java index 4cc2fbb088..c55b1d2db7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java index 2319c81666..4b8173a41d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java index 20f9a28679..1ad8a5d4e8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java index ab332d2900..9289f01285 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java index 93d11e1d92..b7b5b24324 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java index 6436af55b3..749105fc9e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java index 4625640342..52cb96c968 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java index 81e394ff35..a1dfaa561d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java +++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java index 1990103b36..c2fb2b3f76 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Replace.java +++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultsImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultsImpl.java index 9113cdd41d..6845bc6963 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ResultsImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ResultsImpl.java @@ -193,12 +193,7 @@ final class ResultsImpl extends AbstractList> implements Results return translated; } - static final class ResultOrRowsImpl implements ResultOrRows { - - private final Result result; - private final int rows; - private final DataAccessException exception; - + static final /* record */ class ResultOrRowsImpl implements ResultOrRows { private final Result result; private final int rows; private final DataAccessException exception; ResultOrRowsImpl(Result result, int rows, DataAccessException exception) { this.result = result; this.rows = rows; this.exception = exception; } public Result result() { return result; } public int rows() { return rows; } public DataAccessException exception() { return exception; } @Override public boolean equals(Object o) { if (!(o instanceof ResultOrRowsImpl)) return false; ResultOrRowsImpl other = (ResultOrRowsImpl) o; if (!java.util.Objects.equals(this.result, other.result)) return false; if (!java.util.Objects.equals(this.rows, other.rows)) return false; if (!java.util.Objects.equals(this.exception, other.exception)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.result, this.rows, this.exception); } ResultOrRowsImpl(Result result) { this(result, result != null ? result.size() : 0, null); } @@ -211,63 +206,6 @@ final class ResultsImpl extends AbstractList> implements Results this(null, 0, exception); } - private ResultOrRowsImpl(Result result, int rows, DataAccessException exception) { - this.result = result; - this.rows = rows; - this.exception = exception; - } - - @Override - public final Result result() { - return result; - } - - @Override - public final int rows() { - return rows; - } - - @Override - public final DataAccessException exception() { - return exception; - } - - @Override - public int hashCode() { - final int prime = 31; - int r = 1; - r = prime * r + ((exception == null) ? 0 : exception.hashCode()); - r = prime * r + ((result == null) ? 0 : result.hashCode()); - r = prime * r + rows; - return r; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - ResultOrRowsImpl other = (ResultOrRowsImpl) obj; - if (exception == null) { - if (other.exception != null) - return false; - } - else if (!exception.equals(other.exception)) - return false; - if (result == null) { - if (other.result != null) - return false; - } - else if (!result.equals(other.result)) - return false; - if (rows != other.rows) - return false; - return true; - } - @Override public String toString() { if (exception != null) diff --git a/jOOQ/src/main/java/org/jooq/impl/Return.java b/jOOQ/src/main/java/org/jooq/impl/Return.java index 5c67ffdde7..10d5c40fbd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Return.java +++ b/jOOQ/src/main/java/org/jooq/impl/Return.java @@ -140,5 +140,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 d35c91bac7..3a2c4d7080 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java +++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java index 50a6059af1..96198a1163 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Right.java b/jOOQ/src/main/java/org/jooq/impl/Right.java index e179efa358..ab69a00752 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Right.java +++ b/jOOQ/src/main/java/org/jooq/impl/Right.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Round.java b/jOOQ/src/main/java/org/jooq/impl/Round.java index 35e79f735f..cbad2301ff 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Round.java +++ b/jOOQ/src/main/java/org/jooq/impl/Round.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Rownum.java b/jOOQ/src/main/java/org/jooq/impl/Rownum.java index f7bc570ad1..92a67ac8bc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Rownum.java +++ b/jOOQ/src/main/java/org/jooq/impl/Rownum.java @@ -114,5 +114,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Rpad.java b/jOOQ/src/main/java/org/jooq/impl/Rpad.java index eab0d24af7..abc1e2a343 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Rpad.java +++ b/jOOQ/src/main/java/org/jooq/impl/Rpad.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java b/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java index 7e98413389..1f4db7eee8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java +++ b/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java @@ -110,15 +110,7 @@ final class ScopeStack implements Iterable { return () -> new ScopeStackIterator<>(list -> list.get(list.size() - 1), filter); } - static final class Value { - final int scopeLevel; - final V value; - - Value(int scopeLevel, V value) { - this.scopeLevel = scopeLevel; - this.value = value; - } - + static final /* record */ class Value { private final int scopeLevel; private final V value; Value(int scopeLevel, V value) { this.scopeLevel = scopeLevel; this.value = value; } public int scopeLevel() { return scopeLevel; } public V value() { return value; } @Override public boolean equals(Object o) { if (!(o instanceof Value)) return false; Value other = (Value) o; if (!java.util.Objects.equals(this.scopeLevel, other.scopeLevel)) return false; if (!java.util.Objects.equals(this.value, other.value)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.scopeLevel, this.value); } @Override public String toString() { return new StringBuilder("Value[").append("scopeLevel=").append(this.scopeLevel).append(", value=").append(this.value).append("]").toString(); } static Value of(int scopeLevel, V value) { return value == null ? null : new Value<>(scopeLevel, value); } diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java index 44ad08c8f0..422dae0356 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java index ae62a4689f..2052463c0b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java index e383b80b4c..9e787a426d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java +++ b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Sign.java b/jOOQ/src/main/java/org/jooq/impl/Sign.java index 003c3e30f0..c0a54ef756 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sign.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sign.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Signal.java b/jOOQ/src/main/java/org/jooq/impl/Signal.java index 871c3d59aa..e9f45e856c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Signal.java +++ b/jOOQ/src/main/java/org/jooq/impl/Signal.java @@ -189,5 +189,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 1317980601..dd50f2eb6f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sin.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sin.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java index 7b5022265d..92cff497fb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Space.java b/jOOQ/src/main/java/org/jooq/impl/Space.java index 747d97139f..d52056d940 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Space.java +++ b/jOOQ/src/main/java/org/jooq/impl/Space.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java index 14390b71bf..503ebee65d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java +++ b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java index 6ee6ecabab..9820074731 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Square.java b/jOOQ/src/main/java/org/jooq/impl/Square.java index 72ba2d3ebe..d1f9627b4b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Square.java +++ b/jOOQ/src/main/java/org/jooq/impl/Square.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java index 681f16ceb2..f18cfa085e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java +++ b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java index f969131085..8ae1c1fa28 100644 --- a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java index 5377b14331..4e1eed1ba3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Substring.java +++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java b/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java index 45a760aef0..643085a4f8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java +++ b/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java index 92a67ac8bc..1dfd20a351 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java +++ b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java @@ -115,5 +115,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Tan.java b/jOOQ/src/main/java/org/jooq/impl/Tan.java index 76fdc0ae9e..ac76d17b42 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tan.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tan.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java index 857667d251..e043c32069 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Tau.java b/jOOQ/src/main/java/org/jooq/impl/Tau.java index 0b8aa93e6a..cbe71bcee4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tau.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tau.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/ToChar.java b/jOOQ/src/main/java/org/jooq/impl/ToChar.java index eacfa6baca..1a3e064069 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ToChar.java +++ b/jOOQ/src/main/java/org/jooq/impl/ToChar.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/ToDate.java b/jOOQ/src/main/java/org/jooq/impl/ToDate.java index badc378789..2a0ae540f5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ToDate.java +++ b/jOOQ/src/main/java/org/jooq/impl/ToDate.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java index 5dbcf1e098..2e72ad6f02 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index 7f6bdc0670..e769d272c7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -5656,20 +5656,21 @@ final class Tools { */ @SuppressWarnings("unchecked") static final > Iterable flatten(E field) { - // [#2530] [#6124] [#10481] TODO: Refactor and optimise these flattening algorithms - return () -> { - Iterator it = singletonList(field).iterator(); - if (field.getDataType().isEmbeddable()) - return new FlatteningIterator(it) { - @Override - List flatten(E e) { - return (List) Arrays.asList(embeddedFields(field)); - } - }; - else - return it; - }; + // [#2530] [#6124] [#10481] TODO: Refactor and optimise these flattening algorithms + Iterator it1 = singletonList(field).iterator(); + + // [#11729] Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=572873 + Iterator it2 = field.getDataType().isEmbeddable() + ? new FlatteningIterator(it1) { + @Override + List flatten(E e) { + return (List) Arrays.asList(embeddedFields(field)); + } + } + : it1; + + return () -> it2; } /** @@ -5681,7 +5682,8 @@ final class Tools { final boolean removeDuplicates ) { // [#2530] [#6124] [#10481] TODO: Refactor and optimise these flattening algorithms - return () -> new FlatteningIterator(iterable.iterator()) { + // [#11729] Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=572873 + Iterator it = new FlatteningIterator(iterable.iterator()) { @@ -5704,6 +5706,8 @@ final class Tools { return Tools.flatten(e); } }; + + return () -> it; } /** @@ -5716,7 +5720,8 @@ final class Tools { final boolean removeDuplicates ) { // [#2530] [#6124] [#10481] TODO: Refactor and optimise these flattening algorithms - return () -> new FlatteningIterator(iterable.iterator()) { + // [#11729] Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=572873 + Iterator it = new FlatteningIterator(iterable.iterator()) { @@ -5743,6 +5748,8 @@ final class Tools { return null; } }; + + return () -> it; } static final Set lazy(Set set) { @@ -5756,8 +5763,8 @@ final class Tools { */ static abstract class FlatteningIterator implements Iterator { private final Iterator delegate; - private Iterator flatten; - private E next; + private Iterator flatten; + private E next; FlatteningIterator(Iterator delegate) { this.delegate = delegate; diff --git a/jOOQ/src/main/java/org/jooq/impl/Translate.java b/jOOQ/src/main/java/org/jooq/impl/Translate.java index 5b5ec36632..8db072b75a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Translate.java +++ b/jOOQ/src/main/java/org/jooq/impl/Translate.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java index b8cb3603d8..9adc89f140 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Trim.java +++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Trunc.java b/jOOQ/src/main/java/org/jooq/impl/Trunc.java index b9e577b10d..76b93d76ac 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Trunc.java +++ b/jOOQ/src/main/java/org/jooq/impl/Trunc.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java index 6d3e3580fb..8d776bfdc5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/Updating.java b/jOOQ/src/main/java/org/jooq/impl/Updating.java index 22478eef71..3b3b476845 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Updating.java +++ b/jOOQ/src/main/java/org/jooq/impl/Updating.java @@ -99,5 +99,6 @@ package org.jooq.impl; + diff --git a/jOOQ/src/main/java/org/jooq/impl/Upper.java b/jOOQ/src/main/java/org/jooq/impl/Upper.java index 6c682234ba..33bcb49ae5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Upper.java +++ b/jOOQ/src/main/java/org/jooq/impl/Upper.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/VarPop.java b/jOOQ/src/main/java/org/jooq/impl/VarPop.java index d8507c5cd2..f22f5719e7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/VarPop.java +++ b/jOOQ/src/main/java/org/jooq/impl/VarPop.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java index f644ef26a0..8e428adfcf 100644 --- a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java +++ b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/VersionImpl.java b/jOOQ/src/main/java/org/jooq/impl/VersionImpl.java index ba653f8495..ed951ada9f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/VersionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/VersionImpl.java @@ -271,15 +271,7 @@ final class VersionImpl extends AbstractNode implements Version { return "-- Version: " + id() + "\n" + meta(); } - private static final class Parent { - final VersionImpl version; - final Queries queries; - - Parent(VersionImpl version, Queries queries) { - this.version = version; - this.queries = queries; - } - + private static final /* record */ class Parent { private final VersionImpl version; private final Queries queries; Parent(VersionImpl version, Queries queries) { this.version = version; this.queries = queries; } public VersionImpl version() { return version; } public Queries queries() { return queries; } @Override public boolean equals(Object o) { if (!(o instanceof Parent)) return false; Parent other = (Parent) o; if (!java.util.Objects.equals(this.version, other.version)) return false; if (!java.util.Objects.equals(this.queries, other.queries)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.version, this.queries); } @Override public String toString() { return version.toString(); diff --git a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java index 98b68b8608..cdc9b14d52 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java +++ b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java index c98109d2bd..a3d5df40e1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java index c40452c877..d9ca883d6e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java +++ b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java @@ -49,6 +49,7 @@ import static org.jooq.impl.Tools.DataKey.*; import static org.jooq.SQLDialect.*; import org.jooq.*; +import org.jooq.Record; import org.jooq.conf.*; import org.jooq.impl.*; import org.jooq.tools.*; diff --git a/pom.xml b/pom.xml index 3f4622034f..01a41779b0 100644 --- a/pom.xml +++ b/pom.xml @@ -568,6 +568,15 @@ org.apache.maven.plugins maven-plugin-plugin 3.6.0 + + + + + org.ow2.asm + asm + 9.1 + + @@ -649,6 +658,15 @@ none:none + + + + + org.ow2.asm + asm + 9.1 + + @@ -721,7 +739,13 @@ + + + +