diff --git a/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java b/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java index a1d5f887d1..a62ecb07f6 100644 --- a/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java +++ b/jOOQ/src/main/java/org/jooq/AggregateFilterStep.java @@ -97,12 +97,14 @@ public interface AggregateFilterStep extends WindowBeforeOverStep { /** * Add a FILTER clause to the aggregate function. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #filterWhere(Condition)} or - * {@link #filterWhere(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #filterWhere(Condition)} + * (typically with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #filterWhere(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/Condition.java b/jOOQ/src/main/java/org/jooq/Condition.java index fd6044764a..5294e3b67c 100644 --- a/jOOQ/src/main/java/org/jooq/Condition.java +++ b/jOOQ/src/main/java/org/jooq/Condition.java @@ -107,12 +107,14 @@ public interface Condition extends QueryPart { * * @param other The other condition * @return The combined condition - * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between calling - * this method using {@link Field#equals(Object)} argument, vs. - * calling the other method via a {@link Field#equal(Object)} - * argument, this method will be removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -222,13 +224,14 @@ public interface Condition extends QueryPart { * * @param other The other condition * @return The combined condition - * - * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or - * {@link #andNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #andNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -280,12 +283,14 @@ public interface Condition extends QueryPart { * * @param other The other condition * @return The combined condition - * - * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or - * {@link #or(Field)} instead. Due to ambiguity between calling - * this method using {@link Field#equals(Object)} argument, vs. - * calling the other method via a {@link Field#equal(Object)} - * argument, this method will be removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #or(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -395,13 +400,14 @@ public interface Condition extends QueryPart { * * @param other The other condition * @return The combined condition - * - * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or - * {@link #orNot(Boolean)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #orNot(Boolean)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java index e3df4c1f87..6889876e68 100644 --- a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java @@ -91,11 +91,14 @@ public interface DeleteConditionStep extends DeleteOrderByStep * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between calling - * this method using {@link Field#equals(Object)} argument, vs. - * calling the other method via a {@link Field#equal(Object)} - * argument, this method will be removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -185,12 +188,14 @@ public interface DeleteConditionStep extends DeleteOrderByStep * Combine the currently assembled conditions with a negated other one using * the {@link Operator#AND} operator * - * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or - * {@link #andNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #andNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -227,11 +232,14 @@ public interface DeleteConditionStep extends DeleteOrderByStep * Combine the currently assembled conditions with another one using the * {@link Operator#OR} operator * - * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or - * {@link #or(Field)} instead. Due to ambiguity between calling - * this method using {@link Field#equals(Object)} argument, vs. - * calling the other method via a {@link Field#equal(Object)} - * argument, this method will be removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #or(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -321,12 +329,14 @@ public interface DeleteConditionStep extends DeleteOrderByStep * Combine the currently assembled conditions with a negated other one using * the {@link Operator#OR} operator * - * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or - * {@link #orNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #orNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java index 7e9b1f3aa6..4a69133970 100644 --- a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java +++ b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java @@ -104,12 +104,14 @@ public interface DeleteWhereStep extends DeleteOrderByStep /** * Add conditions to the query. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} or - * {@link #where(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #where(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java index fb088f5917..7e32b0b7b9 100644 --- a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java @@ -108,11 +108,14 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between calling - * this method using {@link Field#equals(Object)} argument, vs. - * calling the other method via a {@link Field#equal(Object)} - * argument, this method will be removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -202,12 +205,14 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * Combine the currently assembled conditions with a negated other one using * the {@link Operator#AND} operator. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or - * {@link #andNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #andNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -245,11 +250,14 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * Combine the currently assembled conditions with another one using the * {@link Operator#OR} operator. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or - * {@link #or(Field)} instead. Due to ambiguity between calling - * this method using {@link Field#equals(Object)} argument, vs. - * calling the other method via a {@link Field#equal(Object)} - * argument, this method will be removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #or(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -339,12 +347,14 @@ public interface DivideByOnConditionStep extends DivideByReturningStep { * Combine the currently assembled conditions with a negated other one using * the {@link Operator#OR} operator. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or - * {@link #orNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #orNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java index 16cbf78169..61568cde72 100644 --- a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java +++ b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java @@ -113,11 +113,14 @@ public interface DivideByOnStep { /** * Add a division condition to the DIVIDE BY clause * - * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition)} or - * {@link #on(Field)} instead. Due to ambiguity between calling - * this method using {@link Field#equals(Object)} argument, vs. - * calling the other method via a {@link Field#equal(Object)} - * argument, this method will be removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #on(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java index 263a73f81f..54ba2cb434 100644 --- a/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java +++ b/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java @@ -42,6 +42,8 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; // ... +import org.jooq.impl.DSL; + /** * This type is used for the {@link Merge}'s DSL API. *

@@ -123,12 +125,14 @@ public interface MergeMatchedDeleteStep extends MergeNotMatche * >http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016. * htm for a full definition of the Oracle MERGE statement * - * @deprecated - 3.8.0 - [#4763] - Use {@link #deleteWhere(Condition)} or - * {@link #deleteWhere(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #deleteWhere(Condition)} + * (typically with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #deleteWhere(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID, DERBY, H2 }) diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java index 15d3a28612..f683ab2de2 100644 --- a/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java +++ b/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java @@ -44,6 +44,8 @@ import static org.jooq.SQLDialect.H2; // ... // ... +import org.jooq.impl.DSL; + /** * This type is used for the {@link Merge}'s DSL API. *

@@ -133,16 +135,22 @@ public interface MergeMatchedWhereStep extends MergeNotMatched *

*

In SQL Server, this will produce:

*

- * 

-     * WHEN MATCHED AND [ condition ] THEN UPDATE SET ..
-     *
+ * * - * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} or - * {@link #where(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * 
+     * WHEN MATCHED AND [ condition ] THEN UPDATE SET ..
+     *
+ * + * + * + * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #where(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID, DERBY, H2 }) diff --git a/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java b/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java index 1c0da42bf8..bd98eae49f 100644 --- a/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java +++ b/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java @@ -42,6 +42,8 @@ import static org.jooq.SQLDialect.DERBY; import static org.jooq.SQLDialect.H2; // ... +import org.jooq.impl.DSL; + /** * This type is used for the {@link Merge}'s DSL API. *

@@ -123,12 +125,14 @@ public interface MergeNotMatchedWhereStep extends MergeFinalSt * >http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016. * htm for a full definition of the Oracle MERGE statement * - * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} or - * {@link #where(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #where(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID, DERBY, H2 }) diff --git a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java index 87a0a8fb6a..b2444b6e62 100644 --- a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java @@ -108,12 +108,14 @@ public interface MergeOnConditionStep extends MergeMatchedStep * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB }) @@ -203,12 +205,14 @@ public interface MergeOnConditionStep extends MergeMatchedStep * Combine the currently assembled conditions with a negated other one using * the {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or - * {@link #andNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #andNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB }) @@ -246,12 +250,14 @@ public interface MergeOnConditionStep extends MergeMatchedStep * Combine the currently assembled conditions with another one using the * {@link Operator#OR} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or - * {@link #or(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #or(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB }) @@ -341,12 +347,14 @@ public interface MergeOnConditionStep extends MergeMatchedStep * Combine the currently assembled conditions with a negated other one using * the {@link Operator#OR} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or - * {@link #orNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #orNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB }) diff --git a/jOOQ/src/main/java/org/jooq/MergeOnStep.java b/jOOQ/src/main/java/org/jooq/MergeOnStep.java index 341bac301f..70b350a0c4 100644 --- a/jOOQ/src/main/java/org/jooq/MergeOnStep.java +++ b/jOOQ/src/main/java/org/jooq/MergeOnStep.java @@ -113,12 +113,14 @@ public interface MergeOnStep { /** * Provide join conditions and proceed to the next step * - * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition)} or - * {@link #on(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #on(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB }) diff --git a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java index e3e877e871..733b1d7944 100644 --- a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java @@ -120,12 +120,14 @@ public interface SelectConditionStep extends SelectConnectBySt * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -215,12 +217,14 @@ public interface SelectConditionStep extends SelectConnectBySt * Combine the currently assembled conditions with a negated other one using * the {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or - * {@link #andNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #andNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -258,12 +262,14 @@ public interface SelectConditionStep extends SelectConnectBySt * Combine the currently assembled conditions with another one using the * {@link Operator#OR} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or - * {@link #or(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #or(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -353,12 +359,14 @@ public interface SelectConditionStep extends SelectConnectBySt * Combine the currently assembled conditions with a negated other one using * the {@link Operator#OR} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or - * {@link #orNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #orNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByAfterStartWithConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByAfterStartWithConditionStep.java index 9160897225..8f8a747399 100644 --- a/jOOQ/src/main/java/org/jooq/SelectConnectByAfterStartWithConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectConnectByAfterStartWithConditionStep.java @@ -122,12 +122,14 @@ public interface SelectConnectByAfterStartWithConditionStep ex * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID }) diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByAfterStartWithStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByAfterStartWithStep.java index c0cd9818b7..2feeb856d2 100644 --- a/jOOQ/src/main/java/org/jooq/SelectConnectByAfterStartWithStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectConnectByAfterStartWithStep.java @@ -120,12 +120,14 @@ public interface SelectConnectByAfterStartWithStep { /** * Add an Oracle-specific CONNECT BY clause to the query * - * @deprecated - 3.8.0 - [#4763] - Use {@link #connectBy(Condition)} or - * {@link #connectBy(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #connectBy(Condition)} + * (typically with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #connectBy(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID }) @@ -212,8 +214,10 @@ public interface SelectConnectByAfterStartWithStep { * query * * @deprecated - 3.8.0 - [#4763] - Use {@link #connectByNoCycle(Condition)} - * or {@link #connectByNoCycle(Field)} instead. Due to ambiguity - * between calling this method using + * (typically with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #connectByNoCycle(Field)} instead. + * Due to ambiguity between calling this method using * {@link Field#equals(Object)} argument, vs. calling the other * method via a {@link Field#equal(Object)} argument, this * method will be removed in the future. diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java index 25e309dda8..432e9aa73e 100644 --- a/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java @@ -122,12 +122,14 @@ public interface SelectConnectByConditionStep extends SelectSt * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID }) diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java index bb7432b54e..1c6ce1537f 100644 --- a/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java @@ -120,12 +120,14 @@ public interface SelectConnectByStep extends SelectGroupByStep /** * Add an Oracle-specific CONNECT BY clause to the query * - * @deprecated - 3.8.0 - [#4763] - Use {@link #connectBy(Condition)} or - * {@link #connectBy(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #connectBy(Condition)} + * (typically with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #connectBy(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID }) @@ -212,8 +214,10 @@ public interface SelectConnectByStep extends SelectGroupByStep * query * * @deprecated - 3.8.0 - [#4763] - Use {@link #connectByNoCycle(Condition)} - * or {@link #connectByNoCycle(Field)} instead. Due to ambiguity - * between calling this method using + * (typically with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #connectByNoCycle(Field)} instead. + * Due to ambiguity between calling this method using * {@link Field#equals(Object)} argument, vs. calling the other * method via a {@link Field#equal(Object)} argument, this * method will be removed in the future. @@ -306,12 +310,14 @@ public interface SelectConnectByStep extends SelectGroupByStep * Add an Oracle-specific START WITH clause to the query's * CONNECT BY clause. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #startWith(Condition)} or - * {@link #startWith(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #startWith(Condition)} + * (typically with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #startWith(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID }) diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java index 5a787d7347..f1aa93fb7e 100644 --- a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java @@ -120,12 +120,14 @@ public interface SelectHavingConditionStep extends SelectWindo * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -215,12 +217,14 @@ public interface SelectHavingConditionStep extends SelectWindo * Combine the currently assembled conditions with a negated other one using * the {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or - * {@link #andNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #andNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -258,12 +262,14 @@ public interface SelectHavingConditionStep extends SelectWindo * Combine the currently assembled conditions with another one using the * {@link Operator#OR} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or - * {@link #or(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #or(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -353,12 +359,14 @@ public interface SelectHavingConditionStep extends SelectWindo * Combine the currently assembled conditions with a negated other one using * the {@link Operator#OR} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or - * {@link #orNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #orNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java index 9ca28f7ce0..8e5e5c368f 100644 --- a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java @@ -133,12 +133,14 @@ public interface SelectHavingStep extends SelectWindowStep /** * Add a HAVING clause to the query. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #having(Condition)} or - * {@link #having(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #having(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #having(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java index 6cf8ea4701..249a49b03e 100644 --- a/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java @@ -120,12 +120,14 @@ public interface SelectOnConditionStep extends SelectJoinStep< * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -215,12 +217,14 @@ public interface SelectOnConditionStep extends SelectJoinStep< * Combine the currently assembled conditions with a negated other one using * the {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or - * {@link #andNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #andNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -258,12 +262,14 @@ public interface SelectOnConditionStep extends SelectJoinStep< * Combine the currently assembled conditions with another one using the * {@link Operator#OR} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or - * {@link #or(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #or(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -353,12 +359,14 @@ public interface SelectOnConditionStep extends SelectJoinStep< * Combine the currently assembled conditions with a negated other one using * the {@link Operator#OR} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or - * {@link #orNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #orNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/SelectOnStep.java b/jOOQ/src/main/java/org/jooq/SelectOnStep.java index 28350bc0e8..f9a037d1cf 100644 --- a/jOOQ/src/main/java/org/jooq/SelectOnStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectOnStep.java @@ -127,12 +127,14 @@ public interface SelectOnStep { /** * Add an ON clause to the previous JOIN. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition)} or - * {@link #on(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #on(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/SelectQualifyConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectQualifyConditionStep.java index 450c5dd1f9..2acfa1821c 100644 --- a/jOOQ/src/main/java/org/jooq/SelectQualifyConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectQualifyConditionStep.java @@ -120,12 +120,14 @@ public interface SelectQualifyConditionStep extends SelectOrde * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -215,12 +217,14 @@ public interface SelectQualifyConditionStep extends SelectOrde * Combine the currently assembled conditions with a negated other one using * the {@link Operator#AND} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or - * {@link #andNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #andNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -258,12 +262,14 @@ public interface SelectQualifyConditionStep extends SelectOrde * Combine the currently assembled conditions with another one using the * {@link Operator#OR} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or - * {@link #or(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #or(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -353,12 +359,14 @@ public interface SelectQualifyConditionStep extends SelectOrde * Combine the currently assembled conditions with a negated other one using * the {@link Operator#OR} operator and proceed to the next step. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or - * {@link #orNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #orNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java b/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java index 5d795066d3..d1d9875786 100644 --- a/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java @@ -123,12 +123,14 @@ public interface SelectStartWithStep extends SelectGroupByStep * Add an Oracle-specific START WITH clause to the query's * CONNECT BY clause. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #startWith(Condition)} or - * {@link #startWith(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #startWith(Condition)} + * (typically with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #startWith(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support({ CUBRID }) diff --git a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java index a48ad3b182..4ddb44687e 100644 --- a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java +++ b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java @@ -133,12 +133,14 @@ public interface SelectWhereStep extends SelectConnectByStepWHERE clause to the query. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} or - * {@link #where(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #where(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java index e0d490abcf..bbafba5707 100644 --- a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java @@ -86,12 +86,14 @@ public interface TableOnConditionStep extends Table { * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -181,12 +183,14 @@ public interface TableOnConditionStep extends Table { * Combine the currently assembled conditions with a negated other one using * the {@link Operator#AND} operator. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or - * {@link #andNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #andNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -224,12 +228,14 @@ public interface TableOnConditionStep extends Table { * Combine the currently assembled conditions with another one using the * {@link Operator#OR} operator. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or - * {@link #or(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #or(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -319,12 +325,14 @@ public interface TableOnConditionStep extends Table { * Combine the currently assembled conditions with a negated other one using * the {@link Operator#OR} operator. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or - * {@link #orNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #orNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/TableOnStep.java b/jOOQ/src/main/java/org/jooq/TableOnStep.java index 6b156a464b..5a630c6a60 100644 --- a/jOOQ/src/main/java/org/jooq/TableOnStep.java +++ b/jOOQ/src/main/java/org/jooq/TableOnStep.java @@ -93,12 +93,14 @@ public interface TableOnStep { /** * Add an ON clause to the JOIN. * - * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition)} or - * {@link #on(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #on(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #on(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java index 60aee1d185..506d0cbeed 100644 --- a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java +++ b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java @@ -93,12 +93,14 @@ public interface UpdateConditionStep extends UpdateOrderByStep * Combine the currently assembled conditions with another one using the * {@link Operator#AND} operator * - * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} or - * {@link #and(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #and(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #and(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -188,12 +190,14 @@ public interface UpdateConditionStep extends UpdateOrderByStep * Combine the currently assembled conditions with a negated other one using * the {@link Operator#AND} operator * - * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} or - * {@link #andNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #andNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #andNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -231,12 +235,14 @@ public interface UpdateConditionStep extends UpdateOrderByStep * Combine the currently assembled conditions with another one using the * {@link Operator#OR} operator * - * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} or - * {@link #or(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #or(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #or(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support @@ -326,12 +332,14 @@ public interface UpdateConditionStep extends UpdateOrderByStep * Combine the currently assembled conditions with a negated other one using * the {@link Operator#OR} operator * - * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} or - * {@link #orNot(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #orNot(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #orNot(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support diff --git a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java index e6b11be4a8..fe904ed1e6 100644 --- a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java +++ b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java @@ -106,12 +106,14 @@ public interface UpdateWhereStep extends UpdateOrderByStep /** * Add conditions to the query * - * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} or - * {@link #where(Field)} instead. Due to ambiguity between - * calling this method using {@link Field#equals(Object)} - * argument, vs. calling the other method via a - * {@link Field#equal(Object)} argument, this method will be - * removed in the future. + * @deprecated - 3.8.0 - [#4763] - Use {@link #where(Condition)} (typically + * with {@link DSL#trueCondition()}, + * {@link DSL#falseCondition()}, or {@link DSL#noCondition()} as + * the parameter) or {@link #where(Field)} instead. Due to + * ambiguity between calling this method using + * {@link Field#equals(Object)} argument, vs. calling the other + * method via a {@link Field#equal(Object)} argument, this + * method will be removed in the future. */ @Deprecated @Support