From 2b298c27c0d0b4ad04a604d8a18721b9cc2b0600 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 21 Jul 2021 15:46:33 +0200
Subject: [PATCH] [jOOQ/jOOQ#12238] Deprecate Internal.fieldsRow(TableField)

---
 .../main/java/org/jooq/codegen/JavaGenerator.java |  9 +++------
 jOOQ/src/main/java/org/jooq/impl/Internal.java    | 15 +++++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
index 704b7705dc..1c9d6b4482 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
@@ -1499,12 +1499,11 @@ public class JavaGenerator extends AbstractGenerator {
 
         if (scala)
             if (tableUdtOrEmbeddable instanceof EmbeddableDefinition)
-                out.println("%sclass %s extends %s[%s](%s.fieldsRow(%s.%s))[[before= with ][separator= with ][%s]] {",
+                out.println("%sclass %s extends %s[%s](%s.%s.getDataType.getRow)[[before= with ][separator= with ][%s]] {",
                     visibility(),
                     className,
                     baseClass,
                     className,
-                    Internal.class,
                     out.ref(getStrategy().getFullJavaIdentifier(((EmbeddableDefinition) tableUdtOrEmbeddable).getTable()), 2),
                     getStrategy().getJavaIdentifier(tableUdtOrEmbeddable),
                     interfaces
@@ -1520,12 +1519,11 @@ public class JavaGenerator extends AbstractGenerator {
                 );
         else if (kotlin)
             if (tableUdtOrEmbeddable instanceof EmbeddableDefinition)
-                out.println("%sopen class %s() : %s<%s>(%s.fieldsRow(%s.%s))[[before=, ][%s]] {",
+                out.println("%sopen class %s() : %s<%s>(%s.%s.dataType.row)[[before=, ][%s]] {",
                     visibility(),
                     className,
                     baseClass,
                     className,
-                    Internal.class,
                     out.ref(getStrategy().getFullJavaIdentifier(((EmbeddableDefinition) tableUdtOrEmbeddable).getTable()), 2),
                     getStrategy().getJavaIdentifier(tableUdtOrEmbeddable),
                     interfaces
@@ -1898,8 +1896,7 @@ public class JavaGenerator extends AbstractGenerator {
             out.println("%s%s() {", visibility(), className);
 
             if (tableUdtOrEmbeddable instanceof EmbeddableDefinition)
-                out.println("super(%s.fieldsRow(%s.%s));",
-                    Internal.class,
+                out.println("super(%s.%s.getDataType().getRow());",
                     out.ref(getStrategy().getFullJavaIdentifier(((EmbeddableDefinition) tableUdtOrEmbeddable).getTable()), 2),
                     getStrategy().getJavaIdentifier(tableUdtOrEmbeddable));
             else
diff --git a/jOOQ/src/main/java/org/jooq/impl/Internal.java b/jOOQ/src/main/java/org/jooq/impl/Internal.java
index 1a7a73f128..b82b6267a1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Internal.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Internal.java
@@ -316,7 +316,7 @@ public final class Internal {
      * @deprecated - 3.14.0 - [#9404] - Please re-generate your code.
      */
     @NotNull
-    @Deprecated
+    @Deprecated(since = "3.14", forRemoval = true)
     public static final Index createIndex(String name, Table<?> table, OrderField<?>[] sortFields, boolean unique) {
         return createIndex(DSL.name(name), table, sortFields, unique);
     }
@@ -327,8 +327,8 @@ public final class Internal {
      * @deprecated - 3.14.0 - [#9404] - Please re-generate your code.
      */
     @NotNull
-    @Deprecated
     @SafeVarargs
+    @Deprecated(since = "3.14", forRemoval = true)
     public static final <R extends Record> UniqueKey<R> createUniqueKey(Table<R> table, String name, TableField<R, ?>... fields) {
         return createUniqueKey(table, name, fields, true);
     }
@@ -339,7 +339,7 @@ public final class Internal {
      * @deprecated - 3.14.0 - [#9404] - Please re-generate your code.
      */
     @NotNull
-    @Deprecated
+    @Deprecated(since = "3.14", forRemoval = true)
     public static final <R extends Record> UniqueKey<R> createUniqueKey(Table<R> table, String name, TableField<R, ?>[] fields, boolean enforced) {
         return createUniqueKey(table, DSL.name(name), fields, enforced);
     }
@@ -350,8 +350,8 @@ public final class Internal {
      * @deprecated - 3.14.0 - [#9404] - Please re-generate your code.
      */
     @NotNull
-    @Deprecated
     @SafeVarargs
+    @Deprecated(since = "3.14", forRemoval = true)
     public static final <R extends Record, U extends Record> ForeignKey<R, U> createForeignKey(UniqueKey<U> key, Table<R> table, String name, TableField<R, ?>... fields) {
         return createForeignKey(key, table, name, fields, true);
     }
@@ -362,7 +362,7 @@ public final class Internal {
      * @deprecated - 3.14.0 - [#9404] - Please re-generate your code.
      */
     @NotNull
-    @Deprecated
+    @Deprecated(since = "3.14", forRemoval = true)
     public static final <R extends Record, U extends Record> ForeignKey<R, U> createForeignKey(UniqueKey<U> key, Table<R> table, String name, TableField<R, ?>[] fields, boolean enforced) {
         return createForeignKey(table, DSL.name(name), fields, key, key.getFieldsArray(), enforced);
     }
@@ -372,16 +372,19 @@ public final class Internal {
      *
      * @deprecated - [#11058] - 3.14.5 - Please re-generate your code.
      */
-    @Deprecated
     @NotNull
+    @Deprecated(since = "3.14", forRemoval = true)
     public static final <R extends Record, ER extends EmbeddableRecord<ER>> TableField<R, ?>[] fields(TableField<R, ER> embeddableField) {
         return ((EmbeddableTableField<R, ER>) embeddableField).fields;
     }
 
     /**
      * Get the fields row of an embeddable type.
+     *
+     * @deprecated - [#12238] - 3.16.0 - Please re-generate your code.
      */
     @NotNull
+    @Deprecated(since = "3.16", forRemoval = true)
     public static final <R extends Record, ER extends EmbeddableRecord<ER>> Row fieldsRow(TableField<R, ER> embeddableField) {
         return embeddableField.getDataType().getRow();
     }