From 9d63c463da7f63eac04093b51d8edef17f3ee91c Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Fri, 30 Dec 2016 11:17:16 +0100
Subject: [PATCH] [#5750] Deprecate and undocument the <customTypes/> element

---
 .../src/main/java/org/jooq/util/AbstractDatabase.java    | 6 ++++++
 jOOQ-meta/src/main/java/org/jooq/util/Database.java      | 9 +++++++++
 jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd | 5 +++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
index c092475620..85ab805164 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
@@ -848,11 +848,16 @@ public abstract class AbstractDatabase implements Database {
     }
 
     @Override
+    @Deprecated
     public final void setConfiguredCustomTypes(List<CustomType> configuredCustomTypes) {
+        if (!configuredCustomTypes.isEmpty())
+            log.warn("DEPRECATION", "The <customTypes/> configuration element has been deprecated in jOOQ 3.10. Use <forcedTypes/> only, instead.");
+
         this.configuredCustomTypes = configuredCustomTypes;
     }
 
     @Override
+    @Deprecated
     public final List<CustomType> getConfiguredCustomTypes() {
         if (configuredCustomTypes == null) {
             configuredCustomTypes = new ArrayList<CustomType>();
@@ -862,6 +867,7 @@ public abstract class AbstractDatabase implements Database {
     }
 
     @Override
+    @Deprecated
     public final CustomType getConfiguredCustomType(String typeName) {
 
         // The user type name that is passed here can be null.
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/Database.java b/jOOQ-meta/src/main/java/org/jooq/util/Database.java
index e3eec9ebe1..eb548f625c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/Database.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/Database.java
@@ -557,18 +557,27 @@ public interface Database {
     /**
      * Database objects matching any of these field names will be generated as
      * custom types.
+     *
+     * @deprecated - 3.10.0 - [#5750] - Use {@link #getConfiguredForcedTypes()} only.
      */
+    @Deprecated
     void setConfiguredCustomTypes(List<CustomType> types);
 
     /**
      * Database objects matching any of these field names will be generated as
      * custom types.
+     *
+     * @deprecated - 3.10.0 - [#5750] - Use {@link #getConfiguredForcedTypes()} only.
      */
+    @Deprecated
     List<CustomType> getConfiguredCustomTypes();
 
     /**
      * Get a specific configured custom type by its name.
+     *
+     * @deprecated - 3.10.0 - [#5750] - Use {@link #getConfiguredForcedTypes()} only.
      */
+    @Deprecated
     CustomType getConfiguredCustomType(String name);
 
     /**
diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd
index a2a2a9ca95..de74ad7d3d 100644
--- a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd
+++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.10.0.xsd
@@ -584,7 +584,7 @@
 
       <!--
         A custom version number that, if available, will be used to assess whether the above
-        <inputSchema/> from a given catalog will need to be regenerated.
+        <inputCatalog/> from a given catalog will need to be regenerated.
 
         There are three operation modes for this element:
 
@@ -601,7 +601,8 @@
 
       <!--
         A configuration element to configure custom types introduced to jOOQ
-        using converters
+        using converters.
+        This is DEPRECATED functionality. Use forcedTypes only!
         -->
       <element name="customTypes" type="tns:CustomTypes" minOccurs="0" maxOccurs="1"/>