From 0134941e311bed5d30df81ff58f9bbba73d95f36 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 28 May 2024 14:33:33 +0200 Subject: [PATCH] [jOOQ/jOOQ#14398] Don't import class in generated code, update api.xml --- jOOQ/src/main/java/org/jooq/impl/Add.java | 3 +-- jOOQ/src/main/java/org/jooq/impl/And.java | 3 +-- jOOQ/src/main/java/org/jooq/impl/BitAnd.java | 3 +-- jOOQ/src/main/java/org/jooq/impl/BitOr.java | 3 +-- jOOQ/src/main/java/org/jooq/impl/BitXor.java | 3 +-- jOOQ/src/main/java/org/jooq/impl/Div.java | 3 +-- jOOQ/src/main/java/org/jooq/impl/Mul.java | 3 +-- jOOQ/src/main/java/org/jooq/impl/Or.java | 3 +-- jOOQ/src/main/java/org/jooq/impl/Sub.java | 3 +-- jOOQ/src/main/java/org/jooq/impl/Xor.java | 3 +-- 10 files changed, 10 insertions(+), 20 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/Add.java b/jOOQ/src/main/java/org/jooq/impl/Add.java index 94dc08cc7d..9c6836ecab 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Add.java +++ b/jOOQ/src/main/java/org/jooq/impl/Add.java @@ -63,7 +63,6 @@ import java.util.List; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; -import org.jooq.impl.Expression.Associativity; /** @@ -119,7 +118,7 @@ implements this, q -> new Expression.Expr<>(q.arg1, Operators.OP_PLUS, q.arg2), c -> c.sql(' '), - Associativity.BOTH + Expression.Associativity.BOTH ); ctx.sql(')'); } diff --git a/jOOQ/src/main/java/org/jooq/impl/And.java b/jOOQ/src/main/java/org/jooq/impl/And.java index 2eac71416d..83b00cac01 100644 --- a/jOOQ/src/main/java/org/jooq/impl/And.java +++ b/jOOQ/src/main/java/org/jooq/impl/And.java @@ -52,7 +52,6 @@ import org.jooq.*; import org.jooq.Function1; import org.jooq.Record; import org.jooq.conf.ParamType; -import org.jooq.impl.Expression.Associativity; import org.jooq.tools.StringUtils; import java.util.ArrayList; @@ -124,7 +123,7 @@ implements this, q -> new Expression.Expr<>(q.arg1, Operator.AND.toKeyword(), q.arg2), Context::formatSeparator, - Associativity.BOTH + Expression.Associativity.BOTH ); ctx.sqlIndentEnd(')'); } diff --git a/jOOQ/src/main/java/org/jooq/impl/BitAnd.java b/jOOQ/src/main/java/org/jooq/impl/BitAnd.java index 4a334b3548..884508fc5f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitAnd.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitAnd.java @@ -52,7 +52,6 @@ import org.jooq.*; import org.jooq.Function1; import org.jooq.Record; import org.jooq.conf.ParamType; -import org.jooq.impl.Expression.Associativity; import org.jooq.tools.StringUtils; import java.util.ArrayList; @@ -173,7 +172,7 @@ implements this, q -> new Expression.Expr<>(q.arg1, Operators.OP_AMP, q.arg2), c -> c.sql(' '), - Associativity.BOTH + Expression.Associativity.BOTH ); ctx.sql(')'); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/BitOr.java b/jOOQ/src/main/java/org/jooq/impl/BitOr.java index 83b3d34c42..a0c0180b21 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitOr.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitOr.java @@ -52,7 +52,6 @@ import org.jooq.*; import org.jooq.Function1; import org.jooq.Record; import org.jooq.conf.ParamType; -import org.jooq.impl.Expression.Associativity; import org.jooq.tools.StringUtils; import java.util.ArrayList; @@ -182,7 +181,7 @@ implements this, q -> new Expression.Expr<>(q.arg1, Operators.OP_VERBAR, q.arg2), c -> c.sql(' '), - Associativity.BOTH + Expression.Associativity.BOTH ); ctx.sql(')'); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXor.java b/jOOQ/src/main/java/org/jooq/impl/BitXor.java index 8ad032b30e..00ddaa81a6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BitXor.java +++ b/jOOQ/src/main/java/org/jooq/impl/BitXor.java @@ -52,7 +52,6 @@ import org.jooq.*; import org.jooq.Function1; import org.jooq.Record; import org.jooq.conf.ParamType; -import org.jooq.impl.Expression.Associativity; import org.jooq.tools.StringUtils; import java.util.ArrayList; @@ -192,7 +191,7 @@ implements this, q -> new Expression.Expr<>(q.arg1, op, q.arg2), c -> c.sql(' '), - Associativity.BOTH + Expression.Associativity.BOTH ); ctx.sql(')'); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/Div.java b/jOOQ/src/main/java/org/jooq/impl/Div.java index 11226f8014..5ceda14cf0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Div.java +++ b/jOOQ/src/main/java/org/jooq/impl/Div.java @@ -63,7 +63,6 @@ import java.util.List; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; -import org.jooq.impl.Expression.Associativity; /** @@ -119,7 +118,7 @@ implements this, q -> new Expression.Expr<>(q.arg1, Operators.OP_SOL, q.arg2), c -> c.sql(' '), - Associativity.LEFT + Expression.Associativity.LEFT ); ctx.sql(')'); } diff --git a/jOOQ/src/main/java/org/jooq/impl/Mul.java b/jOOQ/src/main/java/org/jooq/impl/Mul.java index f14a89e55e..2842c43829 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Mul.java +++ b/jOOQ/src/main/java/org/jooq/impl/Mul.java @@ -63,7 +63,6 @@ import java.util.List; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; -import org.jooq.impl.Expression.Associativity; /** @@ -119,7 +118,7 @@ implements this, q -> new Expression.Expr<>(q.arg1, Operators.OP_AST, q.arg2), c -> c.sql(' '), - Associativity.BOTH + Expression.Associativity.BOTH ); ctx.sql(')'); } diff --git a/jOOQ/src/main/java/org/jooq/impl/Or.java b/jOOQ/src/main/java/org/jooq/impl/Or.java index c3b47809f8..cf900bb85f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Or.java +++ b/jOOQ/src/main/java/org/jooq/impl/Or.java @@ -52,7 +52,6 @@ import org.jooq.*; import org.jooq.Function1; import org.jooq.Record; import org.jooq.conf.ParamType; -import org.jooq.impl.Expression.Associativity; import org.jooq.tools.StringUtils; import java.util.ArrayList; @@ -124,7 +123,7 @@ implements this, q -> new Expression.Expr<>(q.arg1, Operator.OR.toKeyword(), q.arg2), Context::formatSeparator, - Associativity.BOTH + Expression.Associativity.BOTH ); ctx.sqlIndentEnd(')'); } diff --git a/jOOQ/src/main/java/org/jooq/impl/Sub.java b/jOOQ/src/main/java/org/jooq/impl/Sub.java index 7f2e969678..4c5b0f8579 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sub.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sub.java @@ -63,7 +63,6 @@ import java.util.List; import java.util.Set; import org.jooq.conf.TransformUnneededArithmeticExpressions; -import org.jooq.impl.Expression.Associativity; /** @@ -119,7 +118,7 @@ implements this, q -> new Expression.Expr<>(q.arg1, Operators.OP_MINUS, q.arg2), c -> c.sql(' '), - Associativity.LEFT + Expression.Associativity.LEFT ); ctx.sql(')'); } diff --git a/jOOQ/src/main/java/org/jooq/impl/Xor.java b/jOOQ/src/main/java/org/jooq/impl/Xor.java index 04923f903e..67dab40008 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Xor.java +++ b/jOOQ/src/main/java/org/jooq/impl/Xor.java @@ -52,7 +52,6 @@ import org.jooq.*; import org.jooq.Function1; import org.jooq.Record; import org.jooq.conf.ParamType; -import org.jooq.impl.Expression.Associativity; import org.jooq.tools.StringUtils; import java.util.ArrayList; @@ -121,7 +120,7 @@ implements this, q -> new Expression.Expr<>(q.arg1, Operator.XOR.toKeyword(), q.arg2), Context::formatSeparator, - Associativity.BOTH + Expression.Associativity.BOTH ); ctx.sqlIndentEnd(')'); }