diff --git a/jOOQ-examples/jOOQ-academy/pom.xml b/jOOQ-examples/jOOQ-academy/pom.xml index f67387dda6..f7eec1a5cd 100644 --- a/jOOQ-examples/jOOQ-academy/pom.xml +++ b/jOOQ-examples/jOOQ-academy/pom.xml @@ -83,12 +83,12 @@ 256m UTF-8 - + 11 - 1.8 - 1.8 + 11 + 11 true lines,vars,source diff --git a/jOOQ-examples/jOOQ-checker-framework-example/pom.xml b/jOOQ-examples/jOOQ-checker-framework-example/pom.xml index 61ccff8cf6..297b36be7a 100644 --- a/jOOQ-examples/jOOQ-checker-framework-example/pom.xml +++ b/jOOQ-examples/jOOQ-checker-framework-example/pom.xml @@ -63,8 +63,8 @@ maven-compiler-plugin 3.8.0 - 1.8 - 1.8 + 11 + 11 true org.jooq.checker.SQLDialectChecker @@ -89,8 +89,8 @@ javac-with-errorprone true false - 1.8 - 1.8 + 11 + 11 org.jooq diff --git a/jOOQ-examples/jOOQ-javaee-example/pom.xml b/jOOQ-examples/jOOQ-javaee-example/pom.xml index 28076f903c..2fef3226b5 100644 --- a/jOOQ-examples/jOOQ-javaee-example/pom.xml +++ b/jOOQ-examples/jOOQ-javaee-example/pom.xml @@ -126,12 +126,12 @@ maven-compiler-plugin - + 11 - 1.8 - 1.8 + 11 + 11 diff --git a/jOOQ-examples/jOOQ-javafx-example/pom.xml b/jOOQ-examples/jOOQ-javafx-example/pom.xml index d69af39dfa..cf9b759944 100644 --- a/jOOQ-examples/jOOQ-javafx-example/pom.xml +++ b/jOOQ-examples/jOOQ-javafx-example/pom.xml @@ -87,12 +87,12 @@ 256m UTF-8 - + 11 - 1.8 - 1.8 + 11 + 11 true lines,vars,source diff --git a/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml b/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml index 73d097562c..a6f794f30c 100644 --- a/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml +++ b/jOOQ-examples/jOOQ-jpa-example-entities/pom.xml @@ -41,12 +41,12 @@ maven-compiler-plugin - + 11 - 1.8 - 1.8 + 11 + 11 diff --git a/jOOQ-examples/jOOQ-jpa-example/pom.xml b/jOOQ-examples/jOOQ-jpa-example/pom.xml index ca2a4d0479..217afb8d00 100644 --- a/jOOQ-examples/jOOQ-jpa-example/pom.xml +++ b/jOOQ-examples/jOOQ-jpa-example/pom.xml @@ -96,12 +96,12 @@ 256m UTF-8 - + 11 - 1.8 - 1.8 + 11 + 11 true lines,vars,source diff --git a/jOOQ-examples/jOOQ-kotlin-example/pom.xml b/jOOQ-examples/jOOQ-kotlin-example/pom.xml index 0206f6333f..09b31194c7 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/pom.xml +++ b/jOOQ-examples/jOOQ-kotlin-example/pom.xml @@ -185,12 +185,12 @@ maven-compiler-plugin - + 11 - 1.8 - 1.8 + 11 + 11 diff --git a/jOOQ-examples/jOOQ-oracle-example/pom.xml b/jOOQ-examples/jOOQ-oracle-example/pom.xml index a465722831..e8f445024f 100644 --- a/jOOQ-examples/jOOQ-oracle-example/pom.xml +++ b/jOOQ-examples/jOOQ-oracle-example/pom.xml @@ -65,12 +65,12 @@ 256m UTF-8 - + 11 - 1.8 - 1.8 + 11 + 11 true lines,vars,source diff --git a/jOOQ-examples/jOOQ-spark-chart-example/pom.xml b/jOOQ-examples/jOOQ-spark-chart-example/pom.xml index dad82237cc..ea490daee8 100644 --- a/jOOQ-examples/jOOQ-spark-chart-example/pom.xml +++ b/jOOQ-examples/jOOQ-spark-chart-example/pom.xml @@ -41,12 +41,12 @@ maven-compiler-plugin - + 11 - 1.8 - 1.8 + 11 + 11 diff --git a/jOOQ-examples/jOOQ-spark-example/pom.xml b/jOOQ-examples/jOOQ-spark-example/pom.xml index 86d072572b..b34305abe5 100644 --- a/jOOQ-examples/jOOQ-spark-example/pom.xml +++ b/jOOQ-examples/jOOQ-spark-example/pom.xml @@ -92,12 +92,12 @@ 256m UTF-8 - + 11 - 1.8 - 1.8 + 11 + 11 true lines,vars,source diff --git a/jOOQ-examples/jOOQ-spring-example/pom.xml b/jOOQ-examples/jOOQ-spring-example/pom.xml index 3dfdf9036b..874d8b9437 100644 --- a/jOOQ-examples/jOOQ-spring-example/pom.xml +++ b/jOOQ-examples/jOOQ-spring-example/pom.xml @@ -97,12 +97,12 @@ 256m UTF-8 - + 11 - 1.8 - 1.8 + 11 + 11 true lines,vars,source diff --git a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml index f903b5029a..8b872cc0d6 100644 --- a/jOOQ-examples/jOOQ-spring-guice-example/pom.xml +++ b/jOOQ-examples/jOOQ-spring-guice-example/pom.xml @@ -85,12 +85,12 @@ 256m UTF-8 - + 11 - 1.8 - 1.8 + 11 + 11 true lines,vars,source diff --git a/jOOQ-xtend/pom.xml b/jOOQ-xtend/pom.xml index c9ad0875e2..84a5a47c3b 100644 --- a/jOOQ-xtend/pom.xml +++ b/jOOQ-xtend/pom.xml @@ -46,12 +46,12 @@ UTF-8 - + 11 - 1.8 - 1.8 + 11 + 11 diff --git a/jOOQ/src/main/java/module-info.java b/jOOQ/src/main/java/module-info.java new file mode 100644 index 0000000000..4ba12d59b0 --- /dev/null +++ b/jOOQ/src/main/java/module-info.java @@ -0,0 +1,93 @@ +/** + * The jOOQ runtime module. + */ +module org.jooq { + + // jOOQ heavily depends on JDBC and cannot work without it + requires transitive java.sql; + + // JAXB is used optionally for loading a variety of XML content, including + // - Settings (org.jooq.conf) + // - InformationSchema (org.jooq.util.xml.jaxb) + requires static java.xml.bind; + + // The DefaultRecordMapper makes use of JavaBeans utilities, including: + // - Support for ConstructorProperties + requires static java.desktop; + + // Various utilities can make use of JPA annotations, when present, including: + // - The DefaultRecordMapper + // - The JPADatabase in the code generator + // - The EntityManagerConnectionProvider + requires static java.persistence; + + // The runtime Java compiler is used to generate enum types on the fly. + // This dependency may be removed in the future. + requires static java.compiler; + + // Optional logging APIs - slf4j will be preferred if found + requires static org.slf4j; + requires static java.logging; + + // Nullability annotations for better Kotlin interop + requires static org.jetbrains.annotations; + + requires transitive org.reactivestreams; + requires transitive r2dbc.spi; + + + + + + + + requires static org.postgresql.jdbc; + + exports org.jooq; + exports org.jooq.conf; + exports org.jooq.exception; + exports org.jooq.impl; + exports org.jooq.migrations.xml.jaxb; + exports org.jooq.tools; + exports org.jooq.tools.csv; + exports org.jooq.tools.jdbc; + exports org.jooq.tools.json; + exports org.jooq.tools.reflect; + exports org.jooq.types; + exports org.jooq.util.jaxb.tools; + exports org.jooq.util.xml.jaxb; + + + + + + + + + + + + + + + + + + + + + + + + + exports org.jooq.util.cubrid; + exports org.jooq.util.derby; + exports org.jooq.util.firebird; + exports org.jooq.util.h2; + exports org.jooq.util.hsqldb; + exports org.jooq.util.ignite; + exports org.jooq.util.mariadb; + exports org.jooq.util.mysql; + exports org.jooq.util.postgres; + exports org.jooq.util.sqlite; +} diff --git a/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java index b2373203de..c11b7cccd8 100644 --- a/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface AlterDatabaseFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java index d9df87b3a1..698cc0ba1e 100644 --- a/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface AlterDomainFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java index e45f63ba85..d5e211f7e3 100644 --- a/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface AlterIndexFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java index 23c6d8cdcd..9205cc2fcd 100644 --- a/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface AlterSchemaFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java index 78d01b8c31..1d61b57b25 100644 --- a/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface AlterSequenceFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/AlterTableFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterTableFinalStep.java index baa017e71e..52e96d6814 100644 --- a/jOOQ/src/main/java/org/jooq/AlterTableFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterTableFinalStep.java @@ -63,7 +63,7 @@ package org.jooq; * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface AlterTableFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java index 644caa5143..22965d6f55 100644 --- a/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface AlterTypeFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java index 178a79e242..0f2b6e33d7 100644 --- a/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface AlterViewFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/Clause.java b/jOOQ/src/main/java/org/jooq/Clause.java index f53564c9bf..a0137cb4df 100644 --- a/jOOQ/src/main/java/org/jooq/Clause.java +++ b/jOOQ/src/main/java/org/jooq/Clause.java @@ -51,7 +51,7 @@ package org.jooq; * kept in one way or another: https://github.com/jOOQ/jOOQ/issues/7258 */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.11") public enum Clause { // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java b/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java index 764a0b28a1..578a16953c 100644 --- a/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface CommentOnFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/Comparator.java b/jOOQ/src/main/java/org/jooq/Comparator.java index 6ca11eaac4..a9bf925672 100644 --- a/jOOQ/src/main/java/org/jooq/Comparator.java +++ b/jOOQ/src/main/java/org/jooq/Comparator.java @@ -209,7 +209,7 @@ public enum Comparator { * * @deprecated - 3.14.0 - [#9911] - This method is no longer supported. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final boolean supportsNulls() { return supportsNulls; } @@ -219,7 +219,7 @@ public enum Comparator { * * @deprecated - 3.14.0 - [#9911] - This method is no longer supported. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public boolean supportsQuantifier() { return supportsQuantifier; } @@ -229,7 +229,7 @@ public enum Comparator { * * @deprecated - 3.14.0 - [#9911] - This method is no longer supported. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public boolean supportsSubselect() { return supportsSubselect; } diff --git a/jOOQ/src/main/java/org/jooq/ConditionProvider.java b/jOOQ/src/main/java/org/jooq/ConditionProvider.java index 2bb2ed8633..ebe1b69ce4 100644 --- a/jOOQ/src/main/java/org/jooq/ConditionProvider.java +++ b/jOOQ/src/main/java/org/jooq/ConditionProvider.java @@ -48,7 +48,7 @@ import java.util.Collection; * soon. Its methods will be pushed down into extending interfaces. * Do not reference this type directly. */ -@Deprecated +@Deprecated(forRemoval = true, since = "2.6") public interface ConditionProvider { /** diff --git a/jOOQ/src/main/java/org/jooq/Configuration.java b/jOOQ/src/main/java/org/jooq/Configuration.java index 3ded614eea..0e815cade8 100644 --- a/jOOQ/src/main/java/org/jooq/Configuration.java +++ b/jOOQ/src/main/java/org/jooq/Configuration.java @@ -561,7 +561,7 @@ public interface Configuration extends Serializable { * @deprecated - 2.0.5 - Use {@link #settings()} instead */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "2.0") SchemaMapping schemaMapping(); /** diff --git a/jOOQ/src/main/java/org/jooq/ConstraintFinalStep.java b/jOOQ/src/main/java/org/jooq/ConstraintFinalStep.java index 3b5aa8b813..ae2ed9af83 100644 --- a/jOOQ/src/main/java/org/jooq/ConstraintFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/ConstraintFinalStep.java @@ -62,7 +62,7 @@ package org.jooq; * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface ConstraintFinalStep extends Constraint { } diff --git a/jOOQ/src/main/java/org/jooq/Context.java b/jOOQ/src/main/java/org/jooq/Context.java index 532513647d..fa68ae3de9 100644 --- a/jOOQ/src/main/java/org/jooq/Context.java +++ b/jOOQ/src/main/java/org/jooq/Context.java @@ -414,7 +414,7 @@ public interface Context> extends Scope { * @deprecated - 3.10.0 - [#4990] - Use {@link DSL#keyword(String)} instead. */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") C keyword(String keyword); /** @@ -593,7 +593,7 @@ public interface Context> extends Scope { * @deprecated - [#10317] - 3.14.0 - Do not reuse this method. It will be * removed without replacement. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull C formatIndentLockStart(); @@ -621,7 +621,7 @@ public interface Context> extends Scope { * @deprecated - [#10317] - 3.14.0 - Do not reuse this method. It will be * removed without replacement. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull C formatIndentLockEnd(); @@ -647,7 +647,7 @@ public interface Context> extends Scope { * {@link DSL#unquotedName(String)} instead. */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") C literal(String literal); /** diff --git a/jOOQ/src/main/java/org/jooq/Converters.java b/jOOQ/src/main/java/org/jooq/Converters.java index a97d99308b..da6df6fa29 100644 --- a/jOOQ/src/main/java/org/jooq/Converters.java +++ b/jOOQ/src/main/java/org/jooq/Converters.java @@ -77,7 +77,7 @@ public class Converters extends AbstractConverter { * @deprecated - [#10689] - 3.14.0 - This converter does not work. Do not * use this method, use {@link #identity(Class)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull public static Converter of() { return new Converters(); @@ -89,7 +89,7 @@ public class Converters extends AbstractConverter { * @deprecated - [#10689] - 3.14.0 - This method does not provide any useful * functionality and will be removed in the future. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull public static Converter of(Converter converter) { return new Converters(converter); diff --git a/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java index 9ec3058d13..c565643b41 100644 --- a/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface CreateDatabaseFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java index a676166ebd..7c08acc671 100644 --- a/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface CreateDomainFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java index edf53f761a..fc56cb5ba3 100644 --- a/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface CreateIndexFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java index ddb8fc8bb6..4238ca994a 100644 --- a/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface CreateSchemaFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java index cfa05e9624..1706f824da 100644 --- a/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface CreateSequenceFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java index 29c375c795..e16b1586d9 100644 --- a/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java @@ -62,7 +62,7 @@ package org.jooq; * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface CreateTableFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/CreateTypeFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateTypeFinalStep.java index ac1f6eac91..f8f3c30ecb 100644 --- a/jOOQ/src/main/java/org/jooq/CreateTypeFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateTypeFinalStep.java @@ -62,7 +62,7 @@ package org.jooq; * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface CreateTypeFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/CreateViewFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateViewFinalStep.java index 85580a9a96..13ede2a906 100644 --- a/jOOQ/src/main/java/org/jooq/CreateViewFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/CreateViewFinalStep.java @@ -62,7 +62,7 @@ package org.jooq; * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface CreateViewFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/Cursor.java b/jOOQ/src/main/java/org/jooq/Cursor.java index 2a2246187a..c31608c68f 100644 --- a/jOOQ/src/main/java/org/jooq/Cursor.java +++ b/jOOQ/src/main/java/org/jooq/Cursor.java @@ -115,7 +115,7 @@ public interface Cursor extends Fields, Iterable, Formattab * @deprecated - 3.10 - [#6363] - Use {@link #fetchNext(int)} instead. */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") Result fetch(int number) throws DataAccessException; /** @@ -150,7 +150,7 @@ public interface Cursor extends Fields, Iterable, Formattab * @deprecated - 3.15.0 - [#11902] - Use {@link Iterable#forEach(Consumer)} * based methods, instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull > H fetchInto(H handler) throws DataAccessException; @@ -207,7 +207,7 @@ public interface Cursor extends Fields, Iterable, Formattab * @deprecated - 3.10 - [#6363] - Use {@link #fetchNext()} instead. */ @Nullable - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") R fetchOne() throws DataAccessException; /** @@ -216,21 +216,21 @@ public interface Cursor extends Fields, Iterable, Formattab * based methods, instead. */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") > H fetchOneInto(H handler) throws DataAccessException; /** * @deprecated - 3.10 - [#6363] - Use {@link #fetchNext(RecordMapper)} instead. */ @Nullable - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") E fetchOne(RecordMapper mapper) throws DataAccessException; /** * @deprecated - 3.10 - [#6363] - Use {@link #fetchNextInto(Table)} instead. */ @Nullable - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") Z fetchOneInto(Table table) throws DataAccessException, MappingException; /** @@ -266,7 +266,7 @@ public interface Cursor extends Fields, Iterable, Formattab * @deprecated - 3.15.0 - [#11902] - Use {@link Iterable#forEach(Consumer)} * based methods, instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull > H fetchNextInto(H handler) throws DataAccessException; @@ -274,7 +274,7 @@ public interface Cursor extends Fields, Iterable, Formattab * @deprecated - 3.10 - [#6363] - Use {@link #fetchNextInto(Class)} instead. */ @Nullable - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") E fetchOneInto(Class type) throws DataAccessException, MappingException; /** @@ -333,28 +333,28 @@ public interface Cursor extends Fields, Iterable, Formattab * @deprecated - 3.10 - [#6363] - Use {@link #fetchNextOptional()} instead. */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") Optional fetchOptional() throws DataAccessException; /** * @deprecated - 3.10 - [#6363] - Use {@link #fetchNextOptionalInto(Class)} instead. */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") Optional fetchOptionalInto(Class type) throws DataAccessException, MappingException; /** * @deprecated - 3.10 - [#6363] - Use {@link #fetchNextOptional(RecordMapper)} instead. */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") Optional fetchOptional(RecordMapper mapper) throws DataAccessException; /** * @deprecated - 3.10 - [#6363] - Use {@link #fetchNextOptionalInto(Table)} instead. */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") Optional fetchOptionalInto(Table table) throws DataAccessException, MappingException; /** diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index c5b5ae08f2..75e49c623a 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -708,7 +708,7 @@ public interface DSLContext extends Scope { * @deprecated - [#6280] - 3.10 - Do not reuse this method. It will be * completely internal with jOOQ 4.0 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") @Internal @NotNull RenderContext renderContext(); @@ -820,7 +820,7 @@ public interface DSLContext extends Scope { * @deprecated - [#6280] - 3.10 - Do not reuse this method. It will be * completely internal with jOOQ 4.0 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") @Internal @NotNull BindContext bindContext(PreparedStatement stmt); @@ -4163,7 +4163,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE }) WithAsStep with(String alias, Function, ? extends String> fieldNameFunction); @@ -4190,7 +4190,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE }) WithAsStep with(String alias, BiFunction, ? super Integer, ? extends String> fieldNameFunction); @@ -5122,7 +5122,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) WithAsStep withRecursive(String alias, Function, ? extends String> fieldNameFunction); @@ -5150,7 +5150,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) WithAsStep withRecursive(String alias, BiFunction, ? super Integer, ? extends String> fieldNameFunction); @@ -8246,7 +8246,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep1 mergeInto(Table table, Field field1); @@ -8258,7 +8258,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep2 mergeInto(Table table, Field field1, Field field2); @@ -8270,7 +8270,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep3 mergeInto(Table table, Field field1, Field field2, Field field3); @@ -8282,7 +8282,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep4 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4); @@ -8294,7 +8294,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep5 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5); @@ -8306,7 +8306,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep6 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6); @@ -8318,7 +8318,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep7 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7); @@ -8330,7 +8330,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep8 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8); @@ -8342,7 +8342,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep9 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9); @@ -8354,7 +8354,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep10 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10); @@ -8366,7 +8366,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep11 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11); @@ -8378,7 +8378,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep12 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12); @@ -8390,7 +8390,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep13 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13); @@ -8402,7 +8402,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep14 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14); @@ -8414,7 +8414,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep15 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15); @@ -8426,7 +8426,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep16 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16); @@ -8438,7 +8438,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep17 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17); @@ -8450,7 +8450,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep18 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18); @@ -8462,7 +8462,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep19 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19); @@ -8474,7 +8474,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep20 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20); @@ -8486,7 +8486,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep21 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21); @@ -8498,7 +8498,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStep22 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); @@ -8538,7 +8538,7 @@ public interface DSLContext extends Scope { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStepN mergeInto(Table table, Field... fields); @@ -8549,7 +8549,7 @@ public interface DSLContext extends Scope { * @see #mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStepN mergeInto(Table table, Collection> fields); @@ -11053,7 +11053,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createView(String view, Function, ? extends String> fieldNameFunction); @@ -11072,7 +11072,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createView(String view, BiFunction, ? super Integer, ? extends String> fieldNameFunction); @@ -11091,7 +11091,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createView(Name view, Function, ? extends Name> fieldNameFunction); @@ -11110,7 +11110,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createView(Name view, BiFunction, ? super Integer, ? extends Name> fieldNameFunction); @@ -11129,7 +11129,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createView(Table view, Function, ? extends Field> fieldNameFunction); @@ -11148,7 +11148,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createView(Table view, BiFunction, ? super Integer, ? extends Field> fieldNameFunction); @@ -11194,7 +11194,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES }) CreateViewAsStep createOrReplaceView(String view, Function, ? extends String> fieldNameFunction); @@ -11213,7 +11213,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES }) CreateViewAsStep createOrReplaceView(String view, BiFunction, ? super Integer, ? extends String> fieldNameFunction); @@ -11232,7 +11232,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES }) CreateViewAsStep createOrReplaceView(Name view, Function, ? extends Name> fieldNameFunction); @@ -11251,7 +11251,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES }) CreateViewAsStep createOrReplaceView(Name view, BiFunction, ? super Integer, ? extends Name> fieldNameFunction); @@ -11270,7 +11270,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES }) CreateViewAsStep createOrReplaceView(Table view, Function, ? extends Field> fieldNameFunction); @@ -11289,7 +11289,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES }) CreateViewAsStep createOrReplaceView(Table view, BiFunction, ? super Integer, ? extends Field> fieldNameFunction); @@ -11335,7 +11335,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createViewIfNotExists(String view, Function, ? extends String> fieldNameFunction); @@ -11354,7 +11354,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createViewIfNotExists(String view, BiFunction, ? super Integer, ? extends String> fieldNameFunction); @@ -11373,7 +11373,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createViewIfNotExists(Name view, Function, ? extends Name> fieldNameFunction); @@ -11392,7 +11392,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createViewIfNotExists(Name view, BiFunction, ? super Integer, ? extends Name> fieldNameFunction); @@ -11411,7 +11411,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createViewIfNotExists(Table view, Function, ? extends Field> fieldNameFunction); @@ -11430,7 +11430,7 @@ public interface DSLContext extends Scope { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) CreateViewAsStep createViewIfNotExists(Table view, BiFunction, ? super Integer, ? extends Field> fieldNameFunction); diff --git a/jOOQ/src/main/java/org/jooq/DataType.java b/jOOQ/src/main/java/org/jooq/DataType.java index 36e3ae6e7e..706a4e9825 100644 --- a/jOOQ/src/main/java/org/jooq/DataType.java +++ b/jOOQ/src/main/java/org/jooq/DataType.java @@ -569,7 +569,7 @@ public interface DataType extends Named { * @deprecated - [#3852] - 3.8.0 - Use {@link #defaultValue(Field)} instead. */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.8") DataType defaulted(boolean defaulted); /** diff --git a/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java b/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java index 500089b2ca..9652ecf92a 100644 --- a/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java @@ -71,7 +71,7 @@ package org.jooq; * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface DeleteFinalStep extends Delete { } diff --git a/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java b/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java index f601267f22..fd7c7a048a 100644 --- a/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface DropDatabaseFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java b/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java index 99f569cb8d..3a8efcda8e 100644 --- a/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface DropDomainFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java b/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java index 2e035de27a..968544074f 100644 --- a/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface DropIndexFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java b/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java index aec44cd099..6f5652bd7b 100644 --- a/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface DropSchemaFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java b/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java index 3004d8b3ad..b729a11bb6 100644 --- a/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface DropSequenceFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java b/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java index 9db0860c09..b40f7ef3e0 100644 --- a/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface DropTableFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/DropTypeFinalStep.java b/jOOQ/src/main/java/org/jooq/DropTypeFinalStep.java index 8d4c933846..89a9cb1170 100644 --- a/jOOQ/src/main/java/org/jooq/DropTypeFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/DropTypeFinalStep.java @@ -62,7 +62,7 @@ package org.jooq; * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface DropTypeFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java b/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java index 1864fdc95e..e006b807d5 100644 --- a/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface DropViewFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java index 821ed70d82..69e06fb7a5 100644 --- a/jOOQ/src/main/java/org/jooq/Field.java +++ b/jOOQ/src/main/java/org/jooq/Field.java @@ -211,7 +211,7 @@ extends * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support Field as(Function, ? extends String> aliasFunction); @@ -3146,7 +3146,7 @@ extends * @see DSL#sign(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#sign(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field sign(); @@ -3155,7 +3155,7 @@ extends * @see DSL#abs(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#abs(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field abs(); @@ -3164,7 +3164,7 @@ extends * @see DSL#round(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#round(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field round(); @@ -3173,7 +3173,7 @@ extends * @see DSL#round(Field, int) * @deprecated - 3.11 - [#7538] - Use {@link DSL#round(Field, int)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field round(int decimals); @@ -3182,7 +3182,7 @@ extends * @see DSL#floor(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#floor(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field floor(); @@ -3191,7 +3191,7 @@ extends * @see DSL#ceil(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#ceil(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field ceil(); @@ -3200,7 +3200,7 @@ extends * @see DSL#sqrt(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#sqrt(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field sqrt(); @@ -3209,7 +3209,7 @@ extends * @see DSL#exp(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#exp(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field exp(); @@ -3218,7 +3218,7 @@ extends * @see DSL#ln(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#ln(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field ln(); @@ -3227,7 +3227,7 @@ extends * @see DSL#log(Field, int) * @deprecated - 3.11 - [#7538] - Use {@link DSL#log(Field, int)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field log(int base); @@ -3236,7 +3236,7 @@ extends * @see DSL#acos(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#acos(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field acos(); @@ -3245,7 +3245,7 @@ extends * @see DSL#asin(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#asin(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field asin(); @@ -3254,7 +3254,7 @@ extends * @see DSL#atan(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#atan(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field atan(); @@ -3263,7 +3263,7 @@ extends * @see DSL#atan2(Field, Number) * @deprecated - 3.11 - [#7538] - Use {@link DSL#atan2(Field, Number)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field atan2(Number y); @@ -3272,7 +3272,7 @@ extends * @see DSL#atan2(Field, Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#atan2(Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field atan2(Field y); @@ -3281,7 +3281,7 @@ extends * @see DSL#cos(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#cos(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field cos(); @@ -3290,7 +3290,7 @@ extends * @see DSL#sin(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#sin(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field sin(); @@ -3299,7 +3299,7 @@ extends * @see DSL#tan(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#tan(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field tan(); @@ -3308,7 +3308,7 @@ extends * @see DSL#cot(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#cot(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field cot(); @@ -3317,7 +3317,7 @@ extends * @see DSL#sinh(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#sinh(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field sinh(); @@ -3326,7 +3326,7 @@ extends * @see DSL#cosh(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#cosh(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field cosh(); @@ -3335,7 +3335,7 @@ extends * @see DSL#tanh(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#tanh(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field tanh(); @@ -3344,7 +3344,7 @@ extends * @see DSL#coth(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#coth(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field coth(); @@ -3353,7 +3353,7 @@ extends * @see DSL#deg(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#deg(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field deg(); @@ -3362,7 +3362,7 @@ extends * @see DSL#rad(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#rad(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field rad(); @@ -3371,7 +3371,7 @@ extends * @see DSL#count(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#count(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field count(); @@ -3380,7 +3380,7 @@ extends * @see DSL#countDistinct(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#countDistinct(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field countDistinct(); @@ -3389,7 +3389,7 @@ extends * @see DSL#max(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#max(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field max(); @@ -3398,7 +3398,7 @@ extends * @see DSL#min(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#min(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field min(); @@ -3407,7 +3407,7 @@ extends * @see DSL#sum(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#sum(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field sum(); @@ -3416,7 +3416,7 @@ extends * @see DSL#avg(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#avg(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field avg(); @@ -3425,7 +3425,7 @@ extends * @see DSL#median(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#median(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, HSQLDB }) Field median(); @@ -3434,7 +3434,7 @@ extends * @see DSL#stddevPop(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#stddevPop(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field stddevPop(); @@ -3443,7 +3443,7 @@ extends * @see DSL#stddevSamp(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#stddevSamp(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field stddevSamp(); @@ -3452,7 +3452,7 @@ extends * @see DSL#varPop(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#varPop(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field varPop(); @@ -3461,7 +3461,7 @@ extends * @see DSL#varSamp(Field) * @deprecated - 3.11 - [#7538] - Use {@link DSL#varSamp(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field varSamp(); @@ -3471,7 +3471,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#count(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, FIREBIRD, POSTGRES }) WindowPartitionByStep countOver(); @@ -3481,7 +3481,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#max(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, FIREBIRD, POSTGRES }) WindowPartitionByStep maxOver(); @@ -3491,7 +3491,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#min(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, FIREBIRD, POSTGRES }) WindowPartitionByStep minOver(); @@ -3501,7 +3501,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#sum(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, FIREBIRD, POSTGRES }) WindowPartitionByStep sumOver(); @@ -3511,7 +3511,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#avg(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, FIREBIRD, POSTGRES }) WindowPartitionByStep avgOver(); @@ -3521,7 +3521,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#firstValue(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, FIREBIRD, POSTGRES }) WindowIgnoreNullsStep firstValue(); @@ -3531,7 +3531,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#lastValue(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, FIREBIRD, POSTGRES }) WindowIgnoreNullsStep lastValue(); @@ -3541,7 +3541,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#lead(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ FIREBIRD, POSTGRES }) WindowIgnoreNullsStep lead(); @@ -3551,7 +3551,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#lead(Field, int)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ FIREBIRD, POSTGRES }) WindowIgnoreNullsStep lead(int offset); @@ -3561,7 +3561,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#lead(Field, int, Object)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ FIREBIRD, POSTGRES }) WindowIgnoreNullsStep lead(int offset, T defaultValue); @@ -3571,7 +3571,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#lead(Field, int, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ FIREBIRD, POSTGRES }) WindowIgnoreNullsStep lead(int offset, Field defaultValue); @@ -3581,7 +3581,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#lag(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ FIREBIRD, POSTGRES }) WindowIgnoreNullsStep lag(); @@ -3591,7 +3591,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#lag(Field, int)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ FIREBIRD, POSTGRES }) WindowIgnoreNullsStep lag(int offset); @@ -3601,7 +3601,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#lag(Field, int, Object)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ FIREBIRD, POSTGRES }) WindowIgnoreNullsStep lag(int offset, T defaultValue); @@ -3611,7 +3611,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#lag(Field, int, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ FIREBIRD, POSTGRES }) WindowIgnoreNullsStep lag(int offset, Field defaultValue); @@ -3621,7 +3621,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#stddevPop(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, POSTGRES }) WindowPartitionByStep stddevPopOver(); @@ -3631,7 +3631,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#stddevSamp(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, POSTGRES }) WindowPartitionByStep stddevSampOver(); @@ -3641,7 +3641,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#varPop(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, POSTGRES }) WindowPartitionByStep varPopOver(); @@ -3651,7 +3651,7 @@ extends * @see AggregateFunction#over() * @deprecated - 3.11 - [#7538] - Use {@link DSL#varSamp(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support({ CUBRID, POSTGRES }) WindowPartitionByStep varSampOver(); @@ -3664,7 +3664,7 @@ extends * @see DSL#upper(Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#upper(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field upper(); @@ -3677,7 +3677,7 @@ extends * @see DSL#lower(Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#lower(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field lower(); @@ -3690,7 +3690,7 @@ extends * @see DSL#trim(Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#trim(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field trim(); @@ -3703,7 +3703,7 @@ extends * @see DSL#rtrim(Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#rtrim(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field rtrim(); @@ -3716,7 +3716,7 @@ extends * @see DSL#ltrim(Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#ltrim(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field ltrim(); @@ -3729,7 +3729,7 @@ extends * @see DSL#rpad(Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#rpad(Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field rpad(Field length); @@ -3742,7 +3742,7 @@ extends * @see DSL#rpad(Field, int) * @deprecated - 3.13 - [#9407] - Use {@link DSL#rpad(Field, int)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field rpad(int length); @@ -3755,7 +3755,7 @@ extends * @see DSL#rpad(Field, Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#rpad(Field, Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field rpad(Field length, Field character); @@ -3768,7 +3768,7 @@ extends * @see DSL#rpad(Field, int, char) * @deprecated - 3.13 - [#9407] - Use {@link DSL#rpad(Field, int, char)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field rpad(int length, char character); @@ -3781,7 +3781,7 @@ extends * @see DSL#lpad(Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#lpad(Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field lpad(Field length); @@ -3794,7 +3794,7 @@ extends * @see DSL#lpad(Field, int) * @deprecated - 3.13 - [#9407] - Use {@link DSL#lpad(Field, int)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field lpad(int length); @@ -3807,7 +3807,7 @@ extends * @see DSL#lpad(Field, Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#lpad(Field, Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field lpad(Field length, Field character); @@ -3820,7 +3820,7 @@ extends * @see DSL#lpad(Field, int, char) * @deprecated - 3.13 - [#9407] - Use {@link DSL#lpad(Field, int, char)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field lpad(int length, char character); @@ -3833,7 +3833,7 @@ extends * @see DSL#repeat(Field, int) * @deprecated - 3.13 - [#9407] - Use {@link DSL#repeat(Field, int)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field repeat(Number count); @@ -3846,7 +3846,7 @@ extends * @see DSL#repeat(Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#repeat(Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field repeat(Field count); @@ -3859,7 +3859,7 @@ extends * @see DSL#replace(Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#replace(Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) Field replace(Field search); @@ -3872,7 +3872,7 @@ extends * @see DSL#replace(Field, String) * @deprecated - 3.13 - [#9407] - Use {@link DSL#replace(Field, String)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) Field replace(String search); @@ -3885,7 +3885,7 @@ extends * @see DSL#replace(Field, Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#replace(Field, Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) Field replace(Field search, Field replace); @@ -3898,7 +3898,7 @@ extends * @see DSL#replace(Field, String, String) * @deprecated - 3.13 - [#9407] - Use {@link DSL#replace(Field, String, String)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) Field replace(String search, String replace); @@ -3911,7 +3911,7 @@ extends * @see DSL#position(Field, String) * @deprecated - 3.13 - [#9407] - Use {@link DSL#position(Field, String)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field position(String search); @@ -3924,7 +3924,7 @@ extends * @see DSL#position(Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#position(Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field position(Field search); @@ -3937,7 +3937,7 @@ extends * @see DSL#ascii(Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#ascii(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Field ascii(); @@ -4008,7 +4008,7 @@ extends * @see DSL#substring(Field, int) * @deprecated - 3.13 - [#9407] - Use {@link DSL#substring(Field, int)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field substring(int startingPosition); @@ -4021,7 +4021,7 @@ extends * @see DSL#substring(Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#substring(Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field substring(Field startingPosition); @@ -4034,7 +4034,7 @@ extends * @see DSL#substring(Field, int, int) * @deprecated - 3.13 - [#9407] - Use {@link DSL#substring(Field, int, int)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field substring(int startingPosition, int length); @@ -4047,7 +4047,7 @@ extends * @see DSL#substring(Field, Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#substring(Field, Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field substring(Field startingPosition, Field length); @@ -4060,7 +4060,7 @@ extends * @see DSL#length(Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#length(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field length(); @@ -4073,7 +4073,7 @@ extends * @see DSL#charLength(Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#charLength(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field charLength(); @@ -4086,7 +4086,7 @@ extends * @see DSL#bitLength(Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#bitLength(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field bitLength(); @@ -4099,7 +4099,7 @@ extends * @see DSL#octetLength(Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#octetLength(Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field octetLength(); @@ -4108,7 +4108,7 @@ extends * @see DSL#extract(Field, DatePart) * @deprecated - 3.11 - [#7538] - Use {@link DSL#extract(Field, DatePart)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field extract(DatePart datePart); @@ -4117,7 +4117,7 @@ extends * @see DSL#greatest(Field, Field...) * @deprecated - 3.11 - [#7538] - Use {@link DSL#greatest(Field, Field...)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field greatest(T... others); @@ -4126,7 +4126,7 @@ extends * @see DSL#greatest(Field, Field...) * @deprecated - 3.11 - [#7538] - Use {@link DSL#greatest(Field, Field...)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field greatest(Field... others); @@ -4135,7 +4135,7 @@ extends * @see DSL#least(Field, Field...) * @deprecated - 3.11 - [#7538] - Use {@link DSL#least(Field, Field...)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field least(T... others); @@ -4144,7 +4144,7 @@ extends * @see DSL#least(Field, Field...) * @deprecated - 3.11 - [#7538] - Use {@link DSL#least(Field, Field...)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support Field least(Field... others); @@ -4157,7 +4157,7 @@ extends * @see DSL#nvl(Field, Object) * @deprecated - 3.13 - [#9407] - Use {@link DSL#nvl(Field, Object)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field nvl(T defaultValue); @@ -4170,7 +4170,7 @@ extends * @see DSL#nvl(Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#nvl(Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field nvl(Field defaultValue); @@ -4183,7 +4183,7 @@ extends * @see DSL#nvl2(Field, Object, Object) * @deprecated - 3.13 - [#9407] - Use {@link DSL#nvl2(Field, Object, Object)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field nvl2(Z valueIfNotNull, Z valueIfNull); @@ -4196,7 +4196,7 @@ extends * @see DSL#nvl2(Field, Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#nvl2(Field, Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field nvl2(Field valueIfNotNull, Field valueIfNull); @@ -4209,7 +4209,7 @@ extends * @see DSL#nullif(Field, Object) * @deprecated - 3.13 - [#9407] - Use {@link DSL#nullif(Field, Object)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field nullif(T other); @@ -4222,7 +4222,7 @@ extends * @see DSL#nullif(Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#nullif(Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field nullif(Field other); @@ -4235,7 +4235,7 @@ extends * @see DSL#decode(Object, Object, Object) * @deprecated - 3.13 - [#9407] - Use {@link DSL#decode(Object, Object, Object)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field decode(T search, Z result); @@ -4248,7 +4248,7 @@ extends * @see DSL#decode(Object, Object, Object, Object...) * @deprecated - 3.13 - [#9407] - Use {@link DSL#decode(Object, Object, Object, Object...)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field decode(T search, Z result, Object... more); @@ -4261,7 +4261,7 @@ extends * @see DSL#decode(Field, Field, Field) * @deprecated - 3.13 - [#9407] - Use {@link DSL#decode(Field, Field, Field)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field decode(Field search, Field result); @@ -4274,7 +4274,7 @@ extends * @see DSL#decode(Field, Field, Field, Field...) * @deprecated - 3.13 - [#9407] - Use {@link DSL#decode(Field, Field, Field, Field...)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field decode(Field search, Field result, Field... more); @@ -4287,7 +4287,7 @@ extends * @see DSL#coalesce(Object, Object...) * @deprecated - 3.13 - [#9407] - Use {@link DSL#coalesce(Object, Object...)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field coalesce(T option, T... options); @@ -4300,7 +4300,7 @@ extends * @see DSL#coalesce(Field, Field...) * @deprecated - 3.13 - [#9407] - Use {@link DSL#coalesce(Field, Field...)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") @NotNull @Support Field coalesce(Field option, Field... options); diff --git a/jOOQ/src/main/java/org/jooq/FieldLike.java b/jOOQ/src/main/java/org/jooq/FieldLike.java index f6d7661511..f8d3f3055b 100644 --- a/jOOQ/src/main/java/org/jooq/FieldLike.java +++ b/jOOQ/src/main/java/org/jooq/FieldLike.java @@ -108,7 +108,7 @@ public interface FieldLike { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support Field asField(Function, ? extends String> aliasFunction); diff --git a/jOOQ/src/main/java/org/jooq/GrantFinalStep.java b/jOOQ/src/main/java/org/jooq/GrantFinalStep.java index 779e900666..2f87af1aff 100644 --- a/jOOQ/src/main/java/org/jooq/GrantFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/GrantFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface GrantFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/InsertFinalStep.java b/jOOQ/src/main/java/org/jooq/InsertFinalStep.java index 6d9e1d6961..dc59ccd306 100644 --- a/jOOQ/src/main/java/org/jooq/InsertFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertFinalStep.java @@ -74,7 +74,7 @@ package org.jooq; * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface InsertFinalStep extends Insert { } diff --git a/jOOQ/src/main/java/org/jooq/LoaderCSVStep.java b/jOOQ/src/main/java/org/jooq/LoaderCSVStep.java index 234ee1eaf0..16ff8b446e 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderCSVStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderCSVStep.java @@ -119,7 +119,7 @@ public interface LoaderCSVStep { * @deprecated - 3.14.0 - [#10010] - Use {@link #fieldsCorresponding()} * instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support LoaderCSVOptionsStep fieldsFromSource(); diff --git a/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java b/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java index b60aced95a..498d07a615 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderJSONStep.java @@ -103,7 +103,7 @@ public interface LoaderJSONStep { * @deprecated - 3.14.0 - [#10010] - Use {@link #fieldsCorresponding()} * instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support LoaderCSVOptionsStep fieldsFromSource(); diff --git a/jOOQ/src/main/java/org/jooq/LoaderListenerStep.java b/jOOQ/src/main/java/org/jooq/LoaderListenerStep.java index 494d57c687..2776dcc7e4 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderListenerStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderListenerStep.java @@ -74,7 +74,7 @@ public interface LoaderListenerStep extends LoaderLoadStep * @deprecated - 3.14.0 - [#4941] - Use {@link #onRowEnd(LoaderRowListener)} * instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support LoaderLoadStep onRow(LoaderRowListener listener); diff --git a/jOOQ/src/main/java/org/jooq/LoaderRowsStep.java b/jOOQ/src/main/java/org/jooq/LoaderRowsStep.java index 2249473c47..a7a012c690 100644 --- a/jOOQ/src/main/java/org/jooq/LoaderRowsStep.java +++ b/jOOQ/src/main/java/org/jooq/LoaderRowsStep.java @@ -119,7 +119,7 @@ public interface LoaderRowsStep { * @deprecated - 3.14.0 - [#10010] - Use {@link #fieldsCorresponding()} * instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support LoaderCSVOptionsStep fieldsFromSource(); diff --git a/jOOQ/src/main/java/org/jooq/MergeFinalStep.java b/jOOQ/src/main/java/org/jooq/MergeFinalStep.java index 16c6f679e1..e08e662a3a 100644 --- a/jOOQ/src/main/java/org/jooq/MergeFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/MergeFinalStep.java @@ -77,7 +77,7 @@ package org.jooq; * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface MergeFinalStep extends Merge { } diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java index 2b6f4518b9..0e061c85fe 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep1.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep1 extends MergeValuesStep1 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep1 extends MergeValuesStep1 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep1 extends MergeValuesStep1 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java index 6464a4c1a5..43188dd0f2 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep10.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep10 extends MergeValuesStep10 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep10 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep10 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java index cb260145ba..438c95a7c4 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep11.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep11 extends MergeValuesStep11 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep11 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep11 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java index d69ef9a98a..71060f6de8 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep12.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep12 extends MergeValuesStep12 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep12 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep12 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java index cbbfad9c82..81d8d06d81 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep13.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep13 extends MergeValuesStep13 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep13 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep13 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java index db8fdc012c..6dbf0a7ac3 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep14.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep14 extends MergeValuesStep14 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep14 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep14 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java index de8261f237..fcee43c9f3 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep15.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep15 extends MergeValuesStep15 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep15 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep15 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java index f27c2ad6eb..ed8e2673c6 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep16.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep16 extends MergeValuesStep16 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep16 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep16 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java index dc6f07c9c2..dd6a28e508 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep17.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep17 extends MergeValuesStep17 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep17 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep17 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java index 413d1ffa15..a66c73675a 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep18.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep18 extends MergeValuesStep18 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep18 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep18 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java index ea50705c89..67086c4f6d 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep19.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep19 extends MergeValuesStep19 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep19 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep19 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java index 61abd2862a..954f8f601d 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep2.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep2 extends MergeValuesStep2 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep2 extends MergeValuesStep * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep2 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep2 extends MergeValuesStep * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep2 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java index b2e3a092fa..bc461558c5 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep20.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep20 extends MergeValuesStep20 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep20 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep20 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java index 3468c48603..3fa37c0f97 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep21.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep21 extends MergeValuesStep21 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep21 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep21 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java index 10e2d3c45b..6d0e37b597 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep22.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep22 extends MergeValuesStep22 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep22 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep22 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java index c1e7c6c19a..dc219712e8 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep3.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep3 extends MergeValuesStep3 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep3 extends MergeValues * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep3 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep3 extends MergeValues * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep3 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java index 6953c50833..9d112210e3 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep4.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep4 extends MergeValuesStep4 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep4 extends MergeVa * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep4 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep4 extends MergeVa * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep4 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java index c4ba107a43..f8600d705b 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep5.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep5 extends MergeValuesStep5 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep5 extends Mer * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep5 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep5 extends Mer * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep5 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java index c41098dace..77ba629142 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep6.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep6 extends MergeValuesStep6 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep6 extends * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep6 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep6 extends * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep6 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java index f6040bede3..cb90c50c35 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep7.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep7 extends MergeValuesStep7 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep7 ext * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep7 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep7 ext * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep7 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java index bdf2815732..b380c9cc03 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep8.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep8 extends MergeValuesStep8 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep8 * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep8 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep8 * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) MergeValuesStep8 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java b/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java index 2454782cf7..66adeb46ce 100644 --- a/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java +++ b/jOOQ/src/main/java/org/jooq/MergeKeyStep9.java @@ -58,7 +58,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeKeyStep9 extends MergeValuesStep9 { /** @@ -69,7 +69,7 @@ public interface MergeKeyStep9 key(Field... keys); @@ -82,7 +82,7 @@ public interface MergeKeyStep9 key(Collection> keys); diff --git a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java index 30631adb65..a04721fc53 100644 --- a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java +++ b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java @@ -157,7 +157,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStepN columns(Field... fields); @@ -168,7 +168,7 @@ public interface MergeUsingStep extends MergeKeyStepN { * @see #columns(Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) MergeKeyStepN columns(Collection> fields); @@ -184,7 +184,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep1 columns(Field field1); /** @@ -196,7 +196,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep2 columns(Field field1, Field field2); /** @@ -208,7 +208,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep3 columns(Field field1, Field field2, Field field3); /** @@ -220,7 +220,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep4 columns(Field field1, Field field2, Field field3, Field field4); /** @@ -232,7 +232,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep5 columns(Field field1, Field field2, Field field3, Field field4, Field field5); /** @@ -244,7 +244,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep6 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6); /** @@ -256,7 +256,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep7 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7); /** @@ -268,7 +268,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep8 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8); /** @@ -280,7 +280,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep9 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9); /** @@ -292,7 +292,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep10 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10); /** @@ -304,7 +304,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep11 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11); /** @@ -316,7 +316,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep12 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12); /** @@ -328,7 +328,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep13 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13); /** @@ -340,7 +340,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep14 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14); /** @@ -352,7 +352,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep15 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15); /** @@ -364,7 +364,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep16 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16); /** @@ -376,7 +376,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep17 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17); /** @@ -388,7 +388,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep18 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18); /** @@ -400,7 +400,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep19 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19); /** @@ -412,7 +412,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep20 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20); /** @@ -424,7 +424,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep21 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21); /** @@ -436,7 +436,7 @@ public interface MergeUsingStep extends MergeKeyStepN { */ @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") MergeKeyStep22 columns(Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java index 4706f86a51..702a7be6fc 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep1 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep1 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(T1 value1); @@ -75,7 +75,7 @@ public interface MergeValuesStep1 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Field value1); @@ -85,7 +85,7 @@ public interface MergeValuesStep1 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep1 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, FIREBIRD, H2, HSQLDB }) Merge select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java index 0ff1dd0fb2..206b4a19d7 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep10 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep10 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10); @@ -75,7 +75,7 @@ public interface MergeValuesStep10 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10); @@ -85,7 +85,7 @@ public interface MergeValuesStep10 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep10 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java index 07019b9577..f6c1cce3b5 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep11 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep11 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11); @@ -75,7 +75,7 @@ public interface MergeValuesStep11 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11); @@ -85,7 +85,7 @@ public interface MergeValuesStep11 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep11 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java index 3d6667da29..7480faafcb 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep12 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep12 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12); @@ -75,7 +75,7 @@ public interface MergeValuesStep12 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12); @@ -85,7 +85,7 @@ public interface MergeValuesStep12 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep12 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java index e8616047df..1dfcbcaa34 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep13 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep13 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13); @@ -75,7 +75,7 @@ public interface MergeValuesStep13 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13); @@ -85,7 +85,7 @@ public interface MergeValuesStep13 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep13 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java index 1ee7def265..f741dc6a3b 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep14 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep14 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14); @@ -75,7 +75,7 @@ public interface MergeValuesStep14 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14); @@ -85,7 +85,7 @@ public interface MergeValuesStep14 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep14 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java index f71897db6a..290ff56ca1 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep15 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep15 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15); @@ -75,7 +75,7 @@ public interface MergeValuesStep15 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15); @@ -85,7 +85,7 @@ public interface MergeValuesStep15 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep15 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java index 4e3b5ff213..93001e79a9 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep16 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep16 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16); @@ -75,7 +75,7 @@ public interface MergeValuesStep16 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16); @@ -85,7 +85,7 @@ public interface MergeValuesStep16 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep16 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java index 45d52ace68..0474832689 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep17 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep17 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17); @@ -75,7 +75,7 @@ public interface MergeValuesStep17 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17); @@ -85,7 +85,7 @@ public interface MergeValuesStep17 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep17 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java index 70356a3ee6..95177a2894 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep18 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep18 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17, T18 value18); @@ -75,7 +75,7 @@ public interface MergeValuesStep18 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17, Field value18); @@ -85,7 +85,7 @@ public interface MergeValuesStep18 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep18 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java index d15422945a..79ca8a51f9 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep19 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep19 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17, T18 value18, T19 value19); @@ -75,7 +75,7 @@ public interface MergeValuesStep19 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17, Field value18, Field value19); @@ -85,7 +85,7 @@ public interface MergeValuesStep19 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep19 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java index 3c971dc7d7..0177cbd130 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep2 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep2 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(T1 value1, T2 value2); @@ -75,7 +75,7 @@ public interface MergeValuesStep2 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Field value1, Field value2); @@ -85,7 +85,7 @@ public interface MergeValuesStep2 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep2 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, FIREBIRD, H2, HSQLDB }) Merge select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java index 595496d2e0..593b2a43e0 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep20 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep20 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17, T18 value18, T19 value19, T20 value20); @@ -75,7 +75,7 @@ public interface MergeValuesStep20 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17, Field value18, Field value19, Field value20); @@ -85,7 +85,7 @@ public interface MergeValuesStep20 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep20 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java index 6a47c6f7bb..70ce904780 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep21 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep21 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17, T18 value18, T19 value19, T20 value20, T21 value21); @@ -75,7 +75,7 @@ public interface MergeValuesStep21 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17, Field value18, Field value19, Field value20, Field value21); @@ -85,7 +85,7 @@ public interface MergeValuesStep21 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep21 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java index 7769eb7731..2b47a11946 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep22 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep22 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9, T10 value10, T11 value11, T12 value12, T13 value13, T14 value14, T15 value15, T16 value16, T17 value17, T18 value18, T19 value19, T20 value20, T21 value21, T22 value22); @@ -75,7 +75,7 @@ public interface MergeValuesStep22 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9, Field value10, Field value11, Field value12, Field value13, Field value14, Field value15, Field value16, Field value17, Field value18, Field value19, Field value20, Field value21, Field value22); @@ -85,7 +85,7 @@ public interface MergeValuesStep22 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep22 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java index 1eee4fd135..2bcac125b5 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep3 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep3 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(T1 value1, T2 value2, T3 value3); @@ -75,7 +75,7 @@ public interface MergeValuesStep3 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Field value1, Field value2, Field value3); @@ -85,7 +85,7 @@ public interface MergeValuesStep3 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep3 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, FIREBIRD, H2, HSQLDB }) Merge select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java index 8178cbfbb7..45c413f079 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep4 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep4 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4); @@ -75,7 +75,7 @@ public interface MergeValuesStep4 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Field value1, Field value2, Field value3, Field value4); @@ -85,7 +85,7 @@ public interface MergeValuesStep4 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep4 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, FIREBIRD, H2, HSQLDB }) Merge select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java index 84ac83d261..62001a859a 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep5 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep5 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5); @@ -75,7 +75,7 @@ public interface MergeValuesStep5 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5); @@ -85,7 +85,7 @@ public interface MergeValuesStep5 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep5 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, FIREBIRD, H2, HSQLDB }) Merge select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java index 143a202278..5ce7a3bdf3 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep6 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep6 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6); @@ -75,7 +75,7 @@ public interface MergeValuesStep6 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6); @@ -85,7 +85,7 @@ public interface MergeValuesStep6 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep6 { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, FIREBIRD, H2, HSQLDB }) Merge select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java index a0cd439180..612955c165 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep7 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep7 * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7); @@ -75,7 +75,7 @@ public interface MergeValuesStep7 * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7); @@ -85,7 +85,7 @@ public interface MergeValuesStep7 * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) Merge values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep7 * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ CUBRID, FIREBIRD, H2, HSQLDB }) Merge select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java index 55e4ff5c6c..6537e32450 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep8 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep8 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8); @@ -75,7 +75,7 @@ public interface MergeValuesStep8 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8); @@ -85,7 +85,7 @@ public interface MergeValuesStep8 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep8 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java index 96ad873368..c88462b4b8 100644 --- a/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java +++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java @@ -57,7 +57,7 @@ import org.jetbrains.annotations.NotNull; * @author Lukas Eder * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link DSLContext#mergeInto(Table)} */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.14") public interface MergeValuesStep9 { /** @@ -65,7 +65,7 @@ public interface MergeValuesStep9 values(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6, T7 value7, T8 value8, T9 value9); @@ -75,7 +75,7 @@ public interface MergeValuesStep9 values(Field value1, Field value2, Field value3, Field value4, Field value5, Field value6, Field value7, Field value8, Field value9); @@ -85,7 +85,7 @@ public interface MergeValuesStep9 values(Collection values); @@ -101,7 +101,7 @@ public interface MergeValuesStep9 select(Select> select); diff --git a/jOOQ/src/main/java/org/jooq/Name.java b/jOOQ/src/main/java/org/jooq/Name.java index c053e6d33d..51568899a3 100644 --- a/jOOQ/src/main/java/org/jooq/Name.java +++ b/jOOQ/src/main/java/org/jooq/Name.java @@ -336,7 +336,7 @@ public interface Name extends QueryPart, Comparable { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE }) DerivedColumnList fields(Function, ? extends String> fieldNameFunction); @@ -359,7 +359,7 @@ public interface Name extends QueryPart, Comparable { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE }) DerivedColumnList fields(BiFunction, ? super Integer, ? extends String> fieldNameFunction); diff --git a/jOOQ/src/main/java/org/jooq/Param.java b/jOOQ/src/main/java/org/jooq/Param.java index 0541396a43..2474470a78 100644 --- a/jOOQ/src/main/java/org/jooq/Param.java +++ b/jOOQ/src/main/java/org/jooq/Param.java @@ -122,7 +122,7 @@ public interface Param extends ParamOrVariable { * immutable. Modifying {@link Param} values is strongly * discouraged. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.8") void setValue(T value); /** @@ -135,7 +135,7 @@ public interface Param extends ParamOrVariable { * immutable. Modifying {@link Param} values is strongly * discouraged. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.8") void setConverted(Object value) throws DataTypeException; /** @@ -145,7 +145,7 @@ public interface Param extends ParamOrVariable { * immutable. Modifying {@link Param} values is strongly * discouraged. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.8") void setInline(boolean inline); /** diff --git a/jOOQ/src/main/java/org/jooq/Publisher.java b/jOOQ/src/main/java/org/jooq/Publisher.java index b3e8de53c3..25946e3f48 100644 --- a/jOOQ/src/main/java/org/jooq/Publisher.java +++ b/jOOQ/src/main/java/org/jooq/Publisher.java @@ -37,7 +37,7 @@ */ package org.jooq; -// ... +import java.util.concurrent.Flow; import java.util.function.Consumer; import org.reactivestreams.FlowAdapters; @@ -52,14 +52,14 @@ import org.reactivestreams.Subscription; * @author Lukas Eder */ @FunctionalInterface -public interface Publisher extends org.reactivestreams.Publisher { - - - - +public interface Publisher extends org.reactivestreams.Publisher, Flow.Publisher { + @Override + default void subscribe(Flow.Subscriber subscriber) { + subscribe(FlowAdapters.toSubscriber(subscriber)); + } } diff --git a/jOOQ/src/main/java/org/jooq/Queries.java b/jOOQ/src/main/java/org/jooq/Queries.java index 06952554b6..500a30c71d 100644 --- a/jOOQ/src/main/java/org/jooq/Queries.java +++ b/jOOQ/src/main/java/org/jooq/Queries.java @@ -82,7 +82,7 @@ public interface Queries extends AttachableQueryPart, Iterable { * @deprecated - 3.10 - [#6143] - Use {@link #queryStream()} instead. */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") Stream stream(); /** diff --git a/jOOQ/src/main/java/org/jooq/RecordHandler.java b/jOOQ/src/main/java/org/jooq/RecordHandler.java index 6c5630dd87..8ccfa86ef6 100644 --- a/jOOQ/src/main/java/org/jooq/RecordHandler.java +++ b/jOOQ/src/main/java/org/jooq/RecordHandler.java @@ -47,7 +47,7 @@ import java.util.function.Consumer; * @deprecated - 3.15.0 - [#11902] - Use {@link Iterable#forEach(Consumer)} * based methods, instead. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") @FunctionalInterface public interface RecordHandler extends Consumer { diff --git a/jOOQ/src/main/java/org/jooq/Result.java b/jOOQ/src/main/java/org/jooq/Result.java index 3f1a4b3631..7ecfa2de20 100644 --- a/jOOQ/src/main/java/org/jooq/Result.java +++ b/jOOQ/src/main/java/org/jooq/Result.java @@ -2186,7 +2186,7 @@ public interface Result extends Fields, List, Attachable, F * @deprecated - 3.6.0 - [#3879] - Use {@link #intoArrays()} instead. */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") Object[][] intoArray(); /** @@ -2820,7 +2820,7 @@ public interface Result extends Fields, List, Attachable, F * @deprecated - 3.15.0 - [#11902] - Use {@link Iterable#forEach(Consumer)} * based methods, instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull > H into(H handler); @@ -3122,7 +3122,7 @@ public interface Result extends Fields, List, Attachable, F * and will be removed in 4.0 */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") Result intern(Field... fields); /** @@ -3148,7 +3148,7 @@ public interface Result extends Fields, List, Attachable, F * and will be removed in 4.0 */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") Result intern(int... fieldIndexes); /** @@ -3165,7 +3165,7 @@ public interface Result extends Fields, List, Attachable, F * and will be removed in 4.0 */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") Result intern(String... fieldNames); /** @@ -3182,7 +3182,7 @@ public interface Result extends Fields, List, Attachable, F * and will be removed in 4.0 */ @NotNull - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") Result intern(Name... fieldNames); // ------------------------------------------------------------------------ diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java index bbe86db98f..ce5d91a1ab 100644 --- a/jOOQ/src/main/java/org/jooq/ResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java @@ -4862,7 +4862,7 @@ public interface ResultQuery extends Fields, Query, Iterable> H fetchInto(H handler) throws DataAccessException; @@ -5051,7 +5051,7 @@ public interface ResultQuery extends Fields, Query, Iterable intern(Field... fields); /** @@ -5070,7 +5070,7 @@ public interface ResultQuery extends Fields, Query, Iterable intern(int... fieldIndexes); /** @@ -5089,7 +5089,7 @@ public interface ResultQuery extends Fields, Query, Iterable intern(String... fieldNames); /** @@ -5108,7 +5108,7 @@ public interface ResultQuery extends Fields, Query, Iterable intern(Name... fieldNames); /** diff --git a/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java b/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java index 87d4f79109..c1acbeeb7a 100644 --- a/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface RevokeFinalStep extends DDLQuery { } diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java index 39df07b5ea..5ad7c298c9 100644 --- a/jOOQ/src/main/java/org/jooq/SQLDialect.java +++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java @@ -106,7 +106,7 @@ public enum SQLDialect { * with jOOQ or without jOOQ and will be removed in the near * future. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.13") CUBRID("CUBRID", false, true), /** @@ -1084,7 +1084,7 @@ public enum SQLDialect { * * @deprecated - [#9882] - 3.14.0 - Use {@link #supportedBy(SQLDialect...)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final boolean supports(Collection other) { if (other.contains(family)) return true; diff --git a/jOOQ/src/main/java/org/jooq/SchemaMapping.java b/jOOQ/src/main/java/org/jooq/SchemaMapping.java index 467eab8d84..786f881944 100644 --- a/jOOQ/src/main/java/org/jooq/SchemaMapping.java +++ b/jOOQ/src/main/java/org/jooq/SchemaMapping.java @@ -85,7 +85,7 @@ import org.jetbrains.annotations.Nullable; * @since 1.5.2, 1.6.0 * @deprecated - 2.0.5 - Use runtime configuration {@link Settings} instead */ -@Deprecated +@Deprecated(forRemoval = true, since = "2.0") public class SchemaMapping implements Serializable { private static final JooqLogger log = JooqLogger.getLogger(SchemaMapping.class); diff --git a/jOOQ/src/main/java/org/jooq/SelectQuery.java b/jOOQ/src/main/java/org/jooq/SelectQuery.java index c4c1ae8cd9..43d79ccbfe 100644 --- a/jOOQ/src/main/java/org/jooq/SelectQuery.java +++ b/jOOQ/src/main/java/org/jooq/SelectQuery.java @@ -973,7 +973,7 @@ public interface SelectQuery extends Select, ConditionProvi * * @deprecated [#5218] - 3.14.0 - Use {@link #setForLockModeOf(Field...)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Support({ DERBY, FIREBIRD, H2, HSQLDB }) void setForUpdateOf(Field... fields); @@ -986,7 +986,7 @@ public interface SelectQuery extends Select, ConditionProvi * * @deprecated [#5218] - 3.14.0 - Use {@link #setForLockModeOf(Collection)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Support({ DERBY, FIREBIRD, H2, HSQLDB }) void setForUpdateOf(Collection> fields); @@ -1018,7 +1018,7 @@ public interface SelectQuery extends Select, ConditionProvi * * @deprecated [#5218] - 3.14.0 - Use {@link #setForLockModeOf(Table...)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Support({ DERBY, FIREBIRD, H2, HSQLDB, MYSQL, POSTGRES }) void setForUpdateOf(Table... tables); @@ -1040,7 +1040,7 @@ public interface SelectQuery extends Select, ConditionProvi * * @deprecated [#5218] - 3.14.0 - Use {@link #setForLockModeWait(int)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Support({ MARIADB }) void setForUpdateWait(int seconds); @@ -1059,7 +1059,7 @@ public interface SelectQuery extends Select, ConditionProvi * * @deprecated [#5218] - 3.14.0 - Use {@link #setForLockModeNoWait()} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Support({ MARIADB, MYSQL, POSTGRES }) void setForUpdateNoWait(); @@ -1078,7 +1078,7 @@ public interface SelectQuery extends Select, ConditionProvi * * @deprecated [#5218] - 3.14.0 - Use {@link #setForLockModeSkipLocked()} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Support({ MYSQL, POSTGRES }) void setForUpdateSkipLocked(); diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java index 5dc60fc592..72e50d3c75 100644 --- a/jOOQ/src/main/java/org/jooq/Table.java +++ b/jOOQ/src/main/java/org/jooq/Table.java @@ -463,7 +463,7 @@ public interface Table extends TableLike, RecordQualifier as(String alias, Function, ? extends String> aliasFunction); @@ -488,7 +488,7 @@ public interface Table extends TableLike, RecordQualifier as(String alias, BiFunction, ? super Integer, ? extends String> aliasFunction); @@ -590,7 +590,7 @@ public interface Table extends TableLike, RecordQualifier as(Name alias, Function, ? extends Name> aliasFunction); @@ -615,7 +615,7 @@ public interface Table extends TableLike, RecordQualifier as(Name alias, BiFunction, ? super Integer, ? extends Name> aliasFunction); @@ -662,7 +662,7 @@ public interface Table extends TableLike, RecordQualifier as(Table otherTable, Function, ? extends Field> aliasFunction); @@ -687,7 +687,7 @@ public interface Table extends TableLike, RecordQualifier as(Table otherTable, BiFunction, ? super Integer, ? extends Field> aliasFunction); diff --git a/jOOQ/src/main/java/org/jooq/TableLike.java b/jOOQ/src/main/java/org/jooq/TableLike.java index ff4b7bae5f..f6d7f31b86 100644 --- a/jOOQ/src/main/java/org/jooq/TableLike.java +++ b/jOOQ/src/main/java/org/jooq/TableLike.java @@ -126,7 +126,7 @@ public interface TableLike extends Fields, QueryPart { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support Table asTable(String alias, Function, ? extends String> aliasFunction); @@ -141,7 +141,7 @@ public interface TableLike extends Fields, QueryPart { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support Table asTable(String alias, BiFunction, ? super Integer, ? extends String> aliasFunction); diff --git a/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java b/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java index a3adec2be3..a7bf0f939c 100644 --- a/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java @@ -67,6 +67,6 @@ import org.jetbrains.annotations.*; * */ @SuppressWarnings({ "unused" }) -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface TruncateFinalStep extends Truncate { } diff --git a/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java b/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java index 9f19f9561d..3894f02c93 100644 --- a/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java @@ -73,7 +73,7 @@ package org.jooq; * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface UpdateFinalStep extends Update { } diff --git a/jOOQ/src/main/java/org/jooq/WindowFinalStep.java b/jOOQ/src/main/java/org/jooq/WindowFinalStep.java index 3e8861751f..9ee6291563 100644 --- a/jOOQ/src/main/java/org/jooq/WindowFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowFinalStep.java @@ -59,7 +59,7 @@ package org.jooq; * @param The function return type * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface WindowFinalStep extends Field { } diff --git a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java index 92d662c62c..2f568159ab 100644 --- a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java @@ -105,7 +105,7 @@ public interface WindowPartitionByStep extends WindowOrderByStep { * supported, use {@link #partitionBy(Field...)} instead, or * omit the clause entirely. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") @NotNull @Support({ CUBRID, FIREBIRD, H2, MARIADB, MYSQL, POSTGRES, SQLITE }) WindowOrderByStep partitionByOne(); diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationFinalStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationFinalStep.java index b70730deac..d590011c76 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationFinalStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationFinalStep.java @@ -70,7 +70,7 @@ package org.jooq; * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly * @author Lukas Eder */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public interface WindowSpecificationFinalStep extends WindowSpecification { } diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java index 805aa7743a..4e77a68f4d 100644 --- a/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java +++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java @@ -119,7 +119,7 @@ public interface WindowSpecificationPartitionByStep extends WindowSpecificationO * supported, use {@link #partitionBy(Field...)} instead, or * omit the clause entirely. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") @NotNull @Support({ CUBRID, FIREBIRD, H2, MARIADB, MYSQL, POSTGRES, SQLITE }) WindowSpecificationOrderByStep partitionByOne(); diff --git a/jOOQ/src/main/java/org/jooq/WithStep.java b/jOOQ/src/main/java/org/jooq/WithStep.java index 50db3221c1..214365c6ed 100644 --- a/jOOQ/src/main/java/org/jooq/WithStep.java +++ b/jOOQ/src/main/java/org/jooq/WithStep.java @@ -144,7 +144,7 @@ public interface WithStep extends QueryPart { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE }) WithAsStep with(String alias, Function, ? extends String> fieldNameFunction); @@ -162,7 +162,7 @@ public interface WithStep extends QueryPart { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE }) WithAsStep with(String alias, BiFunction, ? super Integer, ? extends String> fieldNameFunction); @@ -2809,7 +2809,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep1 mergeInto(Table table, Field field1); @@ -2835,7 +2835,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep2 mergeInto(Table table, Field field1, Field field2); @@ -2861,7 +2861,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep3 mergeInto(Table table, Field field1, Field field2, Field field3); @@ -2887,7 +2887,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep4 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4); @@ -2913,7 +2913,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep5 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5); @@ -2939,7 +2939,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep6 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6); @@ -2965,7 +2965,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep7 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7); @@ -2991,7 +2991,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep8 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8); @@ -3017,7 +3017,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep9 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9); @@ -3043,7 +3043,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep10 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10); @@ -3069,7 +3069,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep11 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11); @@ -3095,7 +3095,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep12 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12); @@ -3121,7 +3121,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep13 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13); @@ -3147,7 +3147,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep14 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14); @@ -3173,7 +3173,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep15 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15); @@ -3199,7 +3199,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep16 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16); @@ -3225,7 +3225,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep17 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17); @@ -3251,7 +3251,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep18 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18); @@ -3277,7 +3277,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep19 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19); @@ -3303,7 +3303,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep20 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20); @@ -3329,7 +3329,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep21 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21); @@ -3355,7 +3355,7 @@ public interface WithStep extends QueryPart { * * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @CheckReturnValue @Support({ H2 }) MergeKeyStep22 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22); diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingDMLQuery.java index 025d96b721..2028ad823d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingDMLQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDelegatingDMLQuery.java @@ -37,7 +37,7 @@ */ package org.jooq.impl; -// ... +import java.util.concurrent.Flow; import org.jooq.Record; import org.jooq.RowCountQuery; @@ -55,10 +55,10 @@ abstract class AbstractDelegatingDMLQuery subscriber) { + getDelegate().subscribe(subscriber); + } diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index a9d567139d..bdf20682c3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -1024,7 +1024,7 @@ public class DSL { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, POSTGRES, SQLITE }) public static WithAsStep with(String alias, Function, ? extends String> fieldNameFunction) { @@ -2077,7 +2077,7 @@ public class DSL { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) public static WithAsStep withRecursive(String alias, Function, ? extends String> fieldNameFunction) { @@ -5962,7 +5962,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep1 mergeInto(Table table, Field field1) { @@ -5976,7 +5976,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep2 mergeInto(Table table, Field field1, Field field2) { @@ -5990,7 +5990,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep3 mergeInto(Table table, Field field1, Field field2, Field field3) { @@ -6004,7 +6004,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep4 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4) { @@ -6018,7 +6018,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep5 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5) { @@ -6032,7 +6032,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep6 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6) { @@ -6046,7 +6046,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep7 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7) { @@ -6060,7 +6060,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep8 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8) { @@ -6074,7 +6074,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep9 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9) { @@ -6088,7 +6088,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep10 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10) { @@ -6102,7 +6102,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep11 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11) { @@ -6116,7 +6116,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep12 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12) { @@ -6130,7 +6130,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep13 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13) { @@ -6144,7 +6144,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep14 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14) { @@ -6158,7 +6158,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep15 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15) { @@ -6172,7 +6172,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep16 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16) { @@ -6186,7 +6186,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep17 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17) { @@ -6200,7 +6200,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep18 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18) { @@ -6214,7 +6214,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep19 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19) { @@ -6228,7 +6228,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep20 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20) { @@ -6242,7 +6242,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep21 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21) { @@ -6256,7 +6256,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStep22 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22) { @@ -6292,7 +6292,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Field...) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStepN mergeInto(Table table, Field... fields) { @@ -6309,7 +6309,7 @@ public class DSL { * @see DSLContext#mergeInto(Table, Collection) * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static MergeKeyStepN mergeInto(Table table, Collection> fields) { @@ -10170,7 +10170,7 @@ public class DSL { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) public static CreateViewAsStep createView(String view, Function, ? extends String> fieldNameFunction) { @@ -10191,7 +10191,7 @@ public class DSL { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) public static CreateViewAsStep createView(Name view, Function, ? extends Name> fieldNameFunction) { @@ -10212,7 +10212,7 @@ public class DSL { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) public static CreateViewAsStep createView(Table view, Function, ? extends Field> fieldNameFunction) { @@ -10266,7 +10266,7 @@ public class DSL { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES }) public static CreateViewAsStep createOrReplaceView(String view, Function, ? extends String> fieldNameFunction) { @@ -10287,7 +10287,7 @@ public class DSL { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES }) public static CreateViewAsStep createOrReplaceView(Name view, Function, ? extends Name> fieldNameFunction) { @@ -10308,7 +10308,7 @@ public class DSL { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES }) public static CreateViewAsStep createOrReplaceView(Table view, Function, ? extends Field> fieldNameFunction) { @@ -10362,7 +10362,7 @@ public class DSL { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) public static CreateViewAsStep createViewIfNotExists(String view, Function, ? extends String> fieldNameFunction) { @@ -10383,7 +10383,7 @@ public class DSL { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) public static CreateViewAsStep createViewIfNotExists(Name view, Function, ? extends Name> fieldNameFunction) { @@ -10404,7 +10404,7 @@ public class DSL { * that would not be possible otherwise - yet they add * complexity in jOOQ's internals. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @NotNull @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) public static CreateViewAsStep createViewIfNotExists(Table view, Function, ? extends Field> fieldNameFunction) { @@ -11793,7 +11793,7 @@ public class DSL { * @return A schema referenced by name * @deprecated - [#3843] - 3.6.0 - use {@link #schema(Name)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") @NotNull @Support public static Schema schemaByName(String name) { @@ -11894,7 +11894,7 @@ public class DSL { * @return A sequence referenced by sequenceName * @deprecated - [#3843] - 3.6.0 - use {@link #sequence(Name)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES }) public static Sequence sequenceByName(String... qualifiedName) { @@ -11920,7 +11920,7 @@ public class DSL { * @return A sequence referenced by sequenceName * @deprecated - [#3843] - 3.6.0 - use {@link #sequence(Name, Class)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES }) public static Sequence sequenceByName(Class type, String... qualifiedName) { @@ -11946,7 +11946,7 @@ public class DSL { * @return A sequence referenced by sequenceName * @deprecated - [#3843] - 3.6.0 - use {@link #sequence(Name, DataType)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, POSTGRES }) public static Sequence sequenceByName(DataType type, String... qualifiedName) { @@ -12033,7 +12033,7 @@ public class DSL { * @return A table referenced by tableName * @deprecated - [#3843] - 3.6.0 - use {@link #table(Name)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") @NotNull @Support public static Table tableByName(String... qualifiedName) { @@ -12111,7 +12111,7 @@ public class DSL { * @return A field referenced by fieldName * @deprecated - [#3843] - 3.6.0 - use {@link #field(Name)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") @NotNull @Support public static Field fieldByName(String... qualifiedName) { @@ -12146,7 +12146,7 @@ public class DSL { * @return A field referenced by fieldName * @deprecated - [#3843] - 3.6.0 - use {@link #field(Name, Class)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") @NotNull @Support public static Field fieldByName(Class type, String... qualifiedName) { @@ -12181,7 +12181,7 @@ public class DSL { * @return A field referenced by fieldName * @deprecated - [#3843] - 3.6.0 - use {@link #field(Name, DataType)} instead */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") @NotNull @Support public static Field fieldByName(DataType type, String... qualifiedName) { @@ -13134,7 +13134,7 @@ public class DSL { * @deprecated - 3.6.0 - [#3854] - Use {@link #sql(String)} instead * @see SQL */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") @NotNull @Support @PlainSQL @@ -13163,7 +13163,7 @@ public class DSL { * @see SQL * @see DSL#sql(String, QueryPart...) */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") @NotNull @Support @PlainSQL @@ -13190,7 +13190,7 @@ public class DSL { * @see SQL * @see DSL#sql(String, Object...) */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.6") @NotNull @Support @PlainSQL @@ -13637,7 +13637,7 @@ public class DSL { * @see SQL * @deprecated - 3.10 - [#6162] - Use {@link #sequence(Name)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) @PlainSQL @@ -13659,7 +13659,7 @@ public class DSL { * @see SQL * @deprecated - 3.10 - [#6162] - Use {@link #sequence(Name, Class)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) @PlainSQL @@ -13682,7 +13682,7 @@ public class DSL { * @deprecated - 3.10 - [#6162] - Use {@link #sequence(Name, DataType)} * instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.10") @NotNull @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, POSTGRES }) @PlainSQL @@ -14820,7 +14820,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field rowField(RowN row) { return new RowField<>(row); } @@ -14830,7 +14830,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row1 row) { return new RowField<>(row); } @@ -14840,7 +14840,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row2 row) { return new RowField<>(row); } @@ -14850,7 +14850,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row3 row) { return new RowField<>(row); } @@ -14860,7 +14860,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row4 row) { return new RowField<>(row); } @@ -14870,7 +14870,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row5 row) { return new RowField<>(row); } @@ -14880,7 +14880,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row6 row) { return new RowField<>(row); } @@ -14890,7 +14890,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row7 row) { return new RowField<>(row); } @@ -14900,7 +14900,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row8 row) { return new RowField<>(row); } @@ -14910,7 +14910,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row9 row) { return new RowField<>(row); } @@ -14920,7 +14920,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row10 row) { return new RowField<>(row); } @@ -14930,7 +14930,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row11 row) { return new RowField<>(row); } @@ -14940,7 +14940,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row12 row) { return new RowField<>(row); } @@ -14950,7 +14950,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row13 row) { return new RowField<>(row); } @@ -14960,7 +14960,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row14 row) { return new RowField<>(row); } @@ -14970,7 +14970,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row15 row) { return new RowField<>(row); } @@ -14980,7 +14980,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row16 row) { return new RowField<>(row); } @@ -14990,7 +14990,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row17 row) { return new RowField<>(row); } @@ -15000,7 +15000,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row18 row) { return new RowField<>(row); } @@ -15010,7 +15010,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row19 row) { return new RowField<>(row); } @@ -15020,7 +15020,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row20 row) { return new RowField<>(row); } @@ -15030,7 +15030,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row21 row) { return new RowField<>(row); } @@ -15040,7 +15040,7 @@ public class DSL { */ @NotNull @Support - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") public static Field> rowField(Row22 row) { return new RowField<>(row); } @@ -24104,7 +24104,7 @@ public class DSL { * @deprecated - [#7956] - 3.12.0 - Use {@link #groupConcat(Field)} and * {@link GroupConcatSeparatorStep#separator(String)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.12") @NotNull @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE }) public static AggregateFunction groupConcat(Field field, String separator) { @@ -28635,7 +28635,7 @@ public class DSL { * @deprecated - [#11092] - 3.15.0 - This method will be removed without * public replacement. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") protected static Field nullSafe(Field field) { return Tools.nullSafe(field); } @@ -28644,7 +28644,7 @@ public class DSL { * @deprecated - [#11092] - 3.15.0 - This method will be removed without * public replacement. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") protected static Field nullSafe(Field field, DataType type) { return Tools.nullSafe(field, type); } @@ -28653,7 +28653,7 @@ public class DSL { * @deprecated - [#11092] - 3.15.0 - This method will be removed without * public replacement. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") protected static Field[] nullSafe(Field... fields) { return Tools.nullSafe(fields); } @@ -28662,7 +28662,7 @@ public class DSL { * @deprecated - [#11092] - 3.15.0 - This method will be removed without * public replacement. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") protected static Field[] nullSafe(Field[] fields, DataType type) { return Tools.nullSafe(fields, type); } @@ -28671,7 +28671,7 @@ public class DSL { * @deprecated - [#11092] - 3.15.0 - This method will be removed without * public replacement. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") protected static List> nullSafeList(Field... fields) { return Tools.nullSafeList(fields); } @@ -28680,7 +28680,7 @@ public class DSL { * @deprecated - [#11092] - 3.15.0 - This method will be removed without * public replacement. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") protected static List> nullSafeList(Field[] fields, DataType type) { return Tools.nullSafeList(fields, type); } @@ -28689,7 +28689,7 @@ public class DSL { * @deprecated - [#11092] - 3.15.0 - This method will be removed without * public replacement. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") protected static DataType nullSafeDataType(Field field) { return Tools.nullSafeDataType(field); } @@ -28763,7 +28763,7 @@ public class DSL { * @deprecated - 3.11.0 - [#7483] - The (indirect) use of the internal * static data type registry is not recommended. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.11") @NotNull @Support public static DataType getDataType(Class type) { diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java index 95e824f85f..556bfa8e6b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java @@ -431,7 +431,7 @@ public class DefaultBinding implements Binding { /** * @deprecated - 3.11 - [#6631] - Use {@link #binding(Converter)} instead. */ - @Deprecated + @Deprecated(forRemoval = true) public DefaultBinding(Converter converter) { this.delegate = binding(converter); } diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index 10bc31fc67..ab4dac098e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -2521,7 +2521,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep1 mergeInto(Table table, Field field1) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1)); @@ -2530,7 +2530,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep2 mergeInto(Table table, Field field1, Field field2) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2)); @@ -2539,7 +2539,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep3 mergeInto(Table table, Field field1, Field field2, Field field3) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3)); @@ -2548,7 +2548,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep4 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4)); @@ -2557,7 +2557,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep5 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5)); @@ -2566,7 +2566,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep6 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6)); @@ -2575,7 +2575,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep7 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7)); @@ -2584,7 +2584,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep8 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8)); @@ -2593,7 +2593,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep9 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9)); @@ -2602,7 +2602,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep10 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10)); @@ -2611,7 +2611,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep11 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11)); @@ -2620,7 +2620,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep12 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12)); @@ -2629,7 +2629,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep13 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13)); @@ -2638,7 +2638,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep14 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14)); @@ -2647,7 +2647,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep15 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15)); @@ -2656,7 +2656,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep16 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16)); @@ -2665,7 +2665,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep17 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17)); @@ -2674,7 +2674,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep18 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18)); @@ -2683,7 +2683,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep19 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19)); @@ -2692,7 +2692,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep20 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20)); @@ -2701,7 +2701,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep21 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21)); @@ -2710,7 +2710,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri /** * @deprecated - [#10045] - 3.14.0 - Use the standard SQL MERGE API instead, via {@link #mergeInto(Table)} */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") @Override public MergeKeyStep22 mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22) { return new MergeImpl(configuration(), null, table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22)); diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImplN.java b/jOOQ/src/main/java/org/jooq/impl/RecordImplN.java index 170e22f78f..6761e81d5c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RecordImplN.java +++ b/jOOQ/src/main/java/org/jooq/impl/RecordImplN.java @@ -61,7 +61,7 @@ final class RecordImplN extends AbstractRecord implements InternalRecord { * @deprecated - 3.14.0 - [#8495] - Prevent the array copy and call * {@link #RecordImplN(Field...)} instead. */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") RecordImplN(Collection> fields) { super(fields); } diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java index 05ea5a6658..51500d8efa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java @@ -49,7 +49,7 @@ import java.sql.SQLException; import java.util.Arrays; import java.util.Collection; import java.util.List; -// ... +import java.util.concurrent.Flow; import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Stream; @@ -2814,10 +2814,10 @@ implements - - - - + @Override + public final void subscribe(Flow.Subscriber subscriber) { + getDelegate().subscribe(subscriber); + } diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java index a2b2b17ef8..4d6b123427 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java @@ -1013,133 +1013,133 @@ implements @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1) { return mergeInto(table, Arrays.asList(field1)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2) { return mergeInto(table, Arrays.asList(field1, field2)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3) { return mergeInto(table, Arrays.asList(field1, field2, field3)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21)); } @Override - @Deprecated + @Deprecated(forRemoval = true, since = "3.14") public final MergeImpl mergeInto(Table table, Field field1, Field field2, Field field3, Field field4, Field field5, Field field6, Field field7, Field field8, Field field9, Field field10, Field field11, Field field12, Field field13, Field field14, Field field15, Field field16, Field field17, Field field18, Field field19, Field field20, Field field21, Field field22) { return mergeInto(table, Arrays.asList(field1, field2, field3, field4, field5, field6, field7, field8, field9, field10, field11, field12, field13, field14, field15, field16, field17, field18, field19, field20, field21, field22)); } diff --git a/jOOQ/src/main/java/org/jooq/tools/Convert.java b/jOOQ/src/main/java/org/jooq/tools/Convert.java index 70db87e345..87b2be5999 100644 --- a/jOOQ/src/main/java/org/jooq/tools/Convert.java +++ b/jOOQ/src/main/java/org/jooq/tools/Convert.java @@ -129,7 +129,7 @@ import org.jooq.util.xml.jaxb.InformationSchema; * generated code, or via {@link Field#convert(Converter)}, or * {@link DataType#asConvertedDataType(Converter)}. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public final class Convert { private static final JooqLogger log = JooqLogger.getLogger(Convert.class); diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultConnection.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultConnection.java index 3ecc8d499c..86a4787da8 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultConnection.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultConnection.java @@ -50,7 +50,7 @@ import java.sql.SQLException; import java.sql.SQLWarning; import java.sql.SQLXML; import java.sql.Savepoint; -// ... +import java.sql.ShardingKey; import java.sql.Statement; import java.sql.Struct; import java.util.Map; @@ -355,39 +355,39 @@ public class DefaultConnection extends JDBC41Connection implements Connection { + // ------------------------------------------------------------------------ + // JDBC 4.3 + // ------------------------------------------------------------------------ + @Override + public void beginRequest() throws SQLException { + getDelegate().beginRequest(); + } + @Override + public void endRequest() throws SQLException { + getDelegate().endRequest(); + } + @Override + public boolean setShardingKeyIfValid(ShardingKey shardingKey, ShardingKey superShardingKey, int timeout) throws SQLException { + return getDelegate().setShardingKeyIfValid(shardingKey, superShardingKey, timeout); + } + @Override + public boolean setShardingKeyIfValid(ShardingKey shardingKey, int timeout) throws SQLException { + return getDelegate().setShardingKeyIfValid(shardingKey, timeout); + } + @Override + public void setShardingKey(ShardingKey shardingKey, ShardingKey superShardingKey) throws SQLException { + getDelegate().setShardingKey(shardingKey, superShardingKey); + } - - - - - - - - - - - - - - - - - - - - - - - - - - - + @Override + public void setShardingKey(ShardingKey shardingKey) throws SQLException { + getDelegate().setShardingKey(shardingKey); + } } diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultStatement.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultStatement.java index c679f60615..50ced0a0d7 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultStatement.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/DefaultStatement.java @@ -371,29 +371,29 @@ public class DefaultStatement extends JDBC41Statement implements Statement { + // ------------------------------------------------------------------------ + // JDBC 4.3 + // ------------------------------------------------------------------------ + @Override + public String enquoteLiteral(String val) throws SQLException { + return getDelegate().enquoteLiteral(val); + } + @Override + public String enquoteIdentifier(String identifier, boolean alwaysQuote) throws SQLException { + return getDelegate().enquoteIdentifier(identifier, alwaysQuote); + } + @Override + public boolean isSimpleIdentifier(String identifier) throws SQLException { + return getDelegate().isSimpleIdentifier(identifier); + } - - - - - - - - - - - - - - - - - - - + @Override + public String enquoteNCharLiteral(String val) throws SQLException { + return getDelegate().enquoteNCharLiteral(val); + } diff --git a/jOOQ/src/main/java/org/jooq/tools/reflect/Compile.java b/jOOQ/src/main/java/org/jooq/tools/reflect/Compile.java index c02eb20416..0b5021df8c 100644 --- a/jOOQ/src/main/java/org/jooq/tools/reflect/Compile.java +++ b/jOOQ/src/main/java/org/jooq/tools/reflect/Compile.java @@ -15,7 +15,7 @@ package org.jooq.tools.reflect; -// ... +import static java.lang.StackWalker.Option.RETAIN_CLASS_REFERENCE; import java.io.ByteArrayOutputStream; import java.io.File; @@ -108,51 +108,51 @@ class Compile { // This works if we have private-access to the interfaces in the class hierarchy - + if (Reflect.CACHED_LOOKUP_CONSTRUCTOR != null) { result = fileManager.loadAndReturnMainClass(className, (name, bytes) -> Reflect.on(cl).call("defineClass", name, bytes, 0, bytes.length).get()); + } + // Lookup.defineClass() has only been introduced in Java 9. It is + // required to get private-access to interfaces in the class hierarchy + else { + // This method is called by client code from two levels up the current stack frame + // We need a private-access lookup from the class in that stack frame in order to get + // private-access to any local interfaces at that location. + Class caller = StackWalker + .getInstance(RETAIN_CLASS_REFERENCE) + .walk(s -> s + .skip(2) + .findFirst() + .get() + .getDeclaringClass()); + // If the compiled class is in the same package as the caller class, then + // we can use the private-access Lookup of the caller class + if (className.startsWith(caller.getPackageName() + ".") && + // [#74] This heuristic is necessary to prevent classes in subpackages of the caller to be loaded + // this way, as subpackages cannot access private content in super packages. + // The heuristic will work only with classes that follow standard naming conventions. + // A better implementation is difficult at this point. + Character.isUpperCase(className.charAt(caller.getPackageName().length() + 1))) { + Lookup privateLookup = MethodHandles.privateLookupIn(caller, lookup); + result = fileManager.loadAndReturnMainClass(className, + (name, bytes) -> privateLookup.defineClass(bytes)); + } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + // Otherwise, use an arbitrary class loader. This approach doesn't allow for + // loading private-access interfaces in the compiled class's type hierarchy + else { + ByteArrayClassLoader c = new ByteArrayClassLoader(fileManager.classes()); + result = fileManager.loadAndReturnMainClass(className, + (name, bytes) -> c.loadClass(name)); + } + } return result; @@ -167,25 +167,25 @@ class Compile { } + static final class ByteArrayClassLoader extends ClassLoader { + private final Map classes; + ByteArrayClassLoader(Map classes) { + super(ByteArrayClassLoader.class.getClassLoader()); + this.classes = classes; + } + @Override + protected Class findClass(String name) throws ClassNotFoundException { + byte[] bytes = classes.get(name); - - - - - - - - - - - - - - - + if (bytes == null) + return super.findClass(name); + else + return defineClass(name, bytes, 0, bytes.length); + } + } static final class JavaFileObject extends SimpleJavaFileObject { diff --git a/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java b/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java index f465c87cdb..a67778b697 100644 --- a/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java +++ b/jOOQ/src/main/java/org/jooq/tools/reflect/Reflect.java @@ -292,9 +292,9 @@ public class Reflect { Constructor result; - - - + if (true) + result = null; + else try { try { @@ -782,9 +782,9 @@ public class Reflect { if (CACHED_LOOKUP_CONSTRUCTOR == null) { - - - + proxyLookup = MethodHandles + .privateLookupIn(proxyType, MethodHandles.lookup()) + .in(proxyType); // Java 9 version for Java 8 distribution (jOOQ Open Source Edition) diff --git a/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDSL.java b/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDSL.java index 49aed765f4..90980d819b 100644 --- a/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDSL.java +++ b/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDSL.java @@ -48,7 +48,7 @@ import org.jooq.impl.DSL; * @deprecated - 3.13.0 - [#9403] - This dialect is hardly used by anyone with * jOOQ or without jOOQ and will be removed in the near future. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.13") public class CUBRIDDSL extends DSL { /** diff --git a/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDataType.java b/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDataType.java index 8d425c2b10..dc18684f4f 100644 --- a/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDataType.java @@ -67,7 +67,7 @@ import org.jooq.types.UShort; *

* Use the corresponding {@link SQLDataType} instead. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.11") public class CUBRIDDataType { private static final SQLDialect FAMILY = SQLDialect.CUBRID; diff --git a/jOOQ/src/main/java/org/jooq/util/derby/DerbyDSL.java b/jOOQ/src/main/java/org/jooq/util/derby/DerbyDSL.java index e77a2cbff7..1089dc2846 100644 --- a/jOOQ/src/main/java/org/jooq/util/derby/DerbyDSL.java +++ b/jOOQ/src/main/java/org/jooq/util/derby/DerbyDSL.java @@ -47,7 +47,7 @@ import org.jooq.impl.DSL; * @deprecated - 3.15.0 - [#10796] - This class will be removed, soon, no more * vendor specific DSL API will be added. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public class DerbyDSL extends DSL { /** diff --git a/jOOQ/src/main/java/org/jooq/util/derby/DerbyDataType.java b/jOOQ/src/main/java/org/jooq/util/derby/DerbyDataType.java index a3547b1058..a8a687b93e 100644 --- a/jOOQ/src/main/java/org/jooq/util/derby/DerbyDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/derby/DerbyDataType.java @@ -70,7 +70,7 @@ import org.jooq.types.UShort; *

* Use the corresponding {@link SQLDataType} instead. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.11") public class DerbyDataType { private static final SQLDialect FAMILY = SQLDialect.DERBY; diff --git a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDSL.java b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDSL.java index e62f318d8b..b4fadda928 100644 --- a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDSL.java +++ b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDSL.java @@ -47,7 +47,7 @@ import org.jooq.impl.DSL; * @deprecated - 3.15.0 - [#10796] - This class will be removed, soon, no more * vendor specific DSL API will be added. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public class FirebirdDSL extends DSL { /** diff --git a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java index 73f5526dcf..1e6f089d34 100644 --- a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDataType.java @@ -72,7 +72,7 @@ import org.jooq.types.YearToSecond; *

* Use the corresponding {@link SQLDataType} instead. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.11") public class FirebirdDataType { private static final SQLDialect FAMILY = SQLDialect.FIREBIRD; diff --git a/jOOQ/src/main/java/org/jooq/util/h2/H2DSL.java b/jOOQ/src/main/java/org/jooq/util/h2/H2DSL.java index 95f1dfd926..b1535a865d 100644 --- a/jOOQ/src/main/java/org/jooq/util/h2/H2DSL.java +++ b/jOOQ/src/main/java/org/jooq/util/h2/H2DSL.java @@ -47,7 +47,7 @@ import org.jooq.impl.DSL; * @deprecated - 3.15.0 - [#10796] - This class will be removed, soon, no more * vendor specific DSL API will be added. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public class H2DSL extends DSL { /** diff --git a/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java b/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java index 3c22509109..64551bc331 100644 --- a/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java +++ b/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java @@ -75,7 +75,7 @@ import org.jooq.types.YearToMonth; *

* Use the corresponding {@link SQLDataType} instead. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.11") public class H2DataType { private static final SQLDialect FAMILY = SQLDialect.H2; diff --git a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDSL.java b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDSL.java index 0c88e1b8be..3734b369e9 100644 --- a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDSL.java +++ b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDSL.java @@ -47,7 +47,7 @@ import org.jooq.impl.DSL; * @deprecated - 3.15.0 - [#10796] - This class will be removed, soon, no more * vendor specific DSL API will be added. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public class HSQLDBDSL extends DSL { /** diff --git a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDataType.java b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDataType.java index b1535b4eb1..958409cd99 100644 --- a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDataType.java @@ -79,7 +79,7 @@ import org.jooq.types.YearToSecond; *

* Use the corresponding {@link SQLDataType} instead. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.11") public class HSQLDBDataType { private static final SQLDialect FAMILY = SQLDialect.HSQLDB; diff --git a/jOOQ/src/main/java/org/jooq/util/ignite/IgniteDataType.java b/jOOQ/src/main/java/org/jooq/util/ignite/IgniteDataType.java index 3323ed21ca..775239a454 100644 --- a/jOOQ/src/main/java/org/jooq/util/ignite/IgniteDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/ignite/IgniteDataType.java @@ -74,7 +74,7 @@ import org.jooq.types.YearToMonth; *

* Use the corresponding {@link SQLDataType} instead. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.11") public class IgniteDataType { private static final SQLDialect FAMILY = SQLDialect.IGNITE; diff --git a/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDataType.java b/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDataType.java index b24f9e7840..f0f26d274f 100644 --- a/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDataType.java @@ -71,7 +71,7 @@ import org.jooq.types.UShort; *

* Use the corresponding {@link SQLDataType} instead. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.11") public class MariaDBDataType { private static final SQLDialect FAMILY = SQLDialect.MARIADB; diff --git a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDSL.java b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDSL.java index efff67ca8c..1df1b5068a 100644 --- a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDSL.java +++ b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDSL.java @@ -74,7 +74,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field decode(String cryptString, String keyString) { @@ -88,7 +88,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field decode(byte[] cryptString, byte[] keyString) { @@ -102,7 +102,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field decode(Field cryptString, Field keyString) { @@ -114,7 +114,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field encode(String string, String keyString) { @@ -126,7 +126,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field encode(byte[] string, byte[] keyString) { @@ -138,7 +138,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field encode(Field string, Field keyString) { @@ -204,7 +204,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desDecrypt(String cryptString) { @@ -216,7 +216,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desDecrypt(byte[] cryptString) { @@ -228,7 +228,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desDecrypt(Field cryptString) { @@ -240,7 +240,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desDecrypt(String cryptString, String keyString) { @@ -252,7 +252,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desDecrypt(byte[] cryptString, byte[] keyString) { @@ -264,7 +264,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desDecrypt(Field cryptString, Field keyString) { @@ -276,7 +276,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desEncrypt(String string) { @@ -288,7 +288,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desEncrypt(byte[] string) { @@ -300,7 +300,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desEncrypt(Field string) { @@ -312,7 +312,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desEncrypt(String string, String keyString) { @@ -324,7 +324,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desEncrypt(byte[] string, byte[] keyString) { @@ -336,7 +336,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field desEncrypt(Field string, Field keyString) { @@ -483,7 +483,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field password(String string) { @@ -495,7 +495,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field password(byte[] string) { @@ -507,7 +507,7 @@ public class MySQLDSL extends DSL { * * @deprecated - 3.15.0 - [#8611] - This function has been removed from MySQL 8 */ - @Deprecated + @Deprecated(forRemoval = true, since = "3.15") @NotNull @Support({ MYSQL }) public static Field password(Field string) { diff --git a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java index c0d382c300..64b18d4793 100644 --- a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDataType.java @@ -71,7 +71,7 @@ import org.jooq.types.UShort; *

* Use the corresponding {@link SQLDataType} instead. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.11") public class MySQLDataType { private static final SQLDialect FAMILY = SQLDialect.MYSQL; diff --git a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java index 8014460b75..9aa751dd72 100644 --- a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDataType.java @@ -78,7 +78,7 @@ import org.jooq.types.YearToSecond; *

* Use the corresponding {@link SQLDataType} instead. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.11") public class PostgresDataType { private static final SQLDialect FAMILY = SQLDialect.POSTGRES; diff --git a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDSL.java b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDSL.java index 1eab1e7e21..311fd765a1 100644 --- a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDSL.java +++ b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDSL.java @@ -48,7 +48,7 @@ import org.jooq.impl.DSL; * @deprecated - 3.15.0 - [#10796] - This class will be removed, soon, no more * vendor specific DSL API will be added. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.15") public class SQLiteDSL extends DSL { /** diff --git a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDataType.java b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDataType.java index 0a081144f1..e6cc39fca3 100644 --- a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDataType.java +++ b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDataType.java @@ -69,7 +69,7 @@ import org.jooq.types.UShort; *

* Use the corresponding {@link SQLDataType} instead. */ -@Deprecated +@Deprecated(forRemoval = true, since = "3.11") public class SQLiteDataType { private static final SQLDialect FAMILY = SQLDialect.SQLITE; diff --git a/pom.xml b/pom.xml index 5aeb46a6eb..d4b1dd748f 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 42.2.19 - 9.2.1.jre8 + 9.2.1.jre11 21.1.0.0 @@ -490,12 +490,12 @@ 256m UTF-8 - + 11 - 1.8 - 1.8 + 11 + 11 true lines,vars,source