[#7747] Rename jooq-codegen.xsd Schema, Schemata, Catalog, Catalogs t…

…ypes to have a Type suffix

jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java

@@ -76,14 +76,14 @@
 import org.jooq.meta.Databases;
 import org.jooq.meta.Definition;
 import org.jooq.meta.SchemaVersionProvider;
-import org.jooq.meta.jaxb.Catalog;
+import org.jooq.meta.jaxb.CatalogMappingType;
 import org.jooq.meta.jaxb.Configuration;
 import org.jooq.meta.jaxb.Generate;
 import org.jooq.meta.jaxb.Jdbc;
 import org.jooq.meta.jaxb.Logging;
 import org.jooq.meta.jaxb.Matchers;
 import org.jooq.meta.jaxb.Property;
-import org.jooq.meta.jaxb.Schema;
+import org.jooq.meta.jaxb.SchemaMappingType;
 import org.jooq.meta.jaxb.Strategy;
 import org.jooq.meta.jaxb.Target;
 // ...
@@ -368,15 +368,15 @@ public void run(Configuration configuration) throws Exception {
             database = databaseClass.newInstance();
             database.setProperties(properties(d.getProperties()));
 
-            List<Catalog> catalogs = d.getCatalogs();
-            List<Schema> schemata = d.getSchemata();
+            List<CatalogMappingType> catalogs = d.getCatalogs();
+            List<SchemaMappingType> schemata = d.getSchemata();
 
             boolean catalogsEmpty = catalogs.isEmpty();
             boolean schemataEmpty = schemata.isEmpty();
 
             // For convenience, the catalog configuration can be set also directly in the <database/> element
             if (catalogsEmpty) {
-                Catalog catalog = new Catalog();
+                CatalogMappingType catalog = new CatalogMappingType();
                 catalog.setInputCatalog(trim(d.getInputCatalog()));
                 catalog.setOutputCatalog(trim(d.getOutputCatalog()));
                 catalog.setOutputCatalogToDefault(d.isOutputCatalogToDefault());
@@ -388,7 +388,7 @@ public void run(Configuration configuration) throws Exception {
                 // For convenience and backwards-compatibility, the schema configuration can be set also directly
                 // in the <database/> element
                 if (schemataEmpty) {
-                    Schema schema = new Schema();
+                    SchemaMappingType schema = new SchemaMappingType();
                     schema.setInputSchema(trim(d.getInputSchema()));
                     schema.setOutputSchema(trim(d.getOutputSchema()));
                     schema.setOutputSchemaToDefault(d.isOutputSchemaToDefault());
@@ -419,7 +419,7 @@ public void run(Configuration configuration) throws Exception {
                     log.warn("WARNING: Cannot combine configuration properties /configuration/generator/database/catalogs and /configuration/generator/database/schemata");
             }
 
-            for (Catalog catalog : catalogs) {
+            for (CatalogMappingType catalog : catalogs) {
                 if ("".equals(catalog.getOutputCatalog()))
                     log.warn("WARNING: Empty <outputCatalog/> should not be used to model default outputCatalogs. Use <outputCatalogToDefault>true</outputCatalogToDefault>, instead. See also: https://github.com/jOOQ/jOOQ/issues/3018");
 
@@ -434,7 +434,7 @@ else if (catalog.getOutputCatalog() == null)
 
 
 
-                for (Schema schema : catalog.getSchemata()) {
+                for (SchemaMappingType schema : catalog.getSchemata()) {
                     if (catalogsEmpty && schemataEmpty && StringUtils.isBlank(schema.getInputSchema())) {
                         if (!StringUtils.isBlank(j.getSchema()))
                             log.warn("WARNING: The configuration property jdbc.Schema is deprecated and will be removed in the future. Use /configuration/generator/database/inputSchema instead");

jOOQ-meta/src/main/java/META-INF/sun-jaxb.episode

@@ -137,27 +137,27 @@
 
         </bindings>
 
-        <bindings if-exists="true" scd="~tns:Catalogs">
+        <bindings if-exists="true" scd="~tns:CatalogMappingsType">
 
-            <class ref="org.jooq.meta.jaxb.Catalogs"/>
+            <class ref="org.jooq.meta.jaxb.CatalogMappingsType"/>
 
         </bindings>
 
-        <bindings if-exists="true" scd="~tns:Catalog">
+        <bindings if-exists="true" scd="~tns:CatalogMappingType">
 
-            <class ref="org.jooq.meta.jaxb.Catalog"/>
+            <class ref="org.jooq.meta.jaxb.CatalogMappingType"/>
 
         </bindings>
 
-        <bindings if-exists="true" scd="~tns:Schemata">
+        <bindings if-exists="true" scd="~tns:SchemaMappingsType">
 
-            <class ref="org.jooq.meta.jaxb.Schemata"/>
+            <class ref="org.jooq.meta.jaxb.SchemaMappingsType"/>
 
         </bindings>
 
-        <bindings if-exists="true" scd="~tns:Schema">
+        <bindings if-exists="true" scd="~tns:SchemaMappingType">
 
-            <class ref="org.jooq.meta.jaxb.Schema"/>
+            <class ref="org.jooq.meta.jaxb.SchemaMappingType"/>
 
         </bindings>
 

jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java

@@ -73,13 +73,13 @@
 import org.jooq.impl.DefaultExecuteListener;
 import org.jooq.impl.DefaultExecuteListenerProvider;
 import org.jooq.impl.SQLDataType;
-import org.jooq.meta.jaxb.Catalog;
+import org.jooq.meta.jaxb.CatalogMappingType;
 import org.jooq.meta.jaxb.CustomType;
 import org.jooq.meta.jaxb.EnumType;
 import org.jooq.meta.jaxb.ForcedType;
 import org.jooq.meta.jaxb.Nullability;
 import org.jooq.meta.jaxb.RegexFlag;
-import org.jooq.meta.jaxb.Schema;
+import org.jooq.meta.jaxb.SchemaMappingType;
 // ...
 import org.jooq.tools.JooqLogger;
 import org.jooq.tools.StopWatch;
@@ -129,8 +129,8 @@ public abstract class AbstractDatabase implements Database {
     private boolean                                                          supportsUnsignedTypes;
     private boolean                                                          ignoreProcedureReturnValues;
     private boolean                                                          dateAsTimestamp;
-    private List<Catalog>                                                    configuredCatalogs                   = new ArrayList<Catalog>();
-    private List<Schema>                                                     configuredSchemata                   = new ArrayList<Schema>();
+    private List<CatalogMappingType>                                         configuredCatalogs                   = new ArrayList<CatalogMappingType>();
+    private List<SchemaMappingType>                                          configuredSchemata                   = new ArrayList<SchemaMappingType>();
     private List<CustomType>                                                 configuredCustomTypes;
     private List<EnumType>                                                   configuredEnumTypes;
     private List<ForcedType>                                                 configuredForcedTypes;
@@ -504,7 +504,7 @@ public final List<String> getInputCatalogs() {
                 }
             }
             else {
-                for (Catalog catalog : configuredCatalogs) {
+                for (CatalogMappingType catalog : configuredCatalogs) {
 
 
 
@@ -535,7 +535,7 @@ else if (configuredCatalogs.size() == 1 && StringUtils.isBlank(configuredCatalog
             else if (configuredCatalogs.isEmpty()) {
                 inputSchemataPerCatalog.put("", inputSchemata);
 
-                for (Schema schema : configuredSchemata) {
+                for (SchemaMappingType schema : configuredSchemata) {
 
 
 
@@ -550,8 +550,8 @@ else if (configuredCatalogs.isEmpty()) {
                 }
             }
             else {
-                for (Catalog catalog : configuredCatalogs) {
-                    for (Schema schema : catalog.getSchemata()) {
+                for (CatalogMappingType catalog : configuredCatalogs) {
+                    for (SchemaMappingType schema : catalog.getSchemata()) {
                         String inputSchema;
 
 
@@ -628,7 +628,7 @@ public final List<String> getInputSchemata(String catalog) {
     @Override
     @Deprecated
     public String getOutputCatalog(String inputCatalog) {
-        for (Catalog catalog : configuredCatalogs)
+        for (CatalogMappingType catalog : configuredCatalogs)
             if (inputCatalog.equals(catalog.getInputCatalog()))
                 return catalog.getOutputCatalog();
 
@@ -638,7 +638,7 @@ public String getOutputCatalog(String inputCatalog) {
     @Override
     @Deprecated
     public String getOutputSchema(String inputSchema) {
-        for (Schema schema : configuredSchemata)
+        for (SchemaMappingType schema : configuredSchemata)
             if (inputSchema.equals(schema.getInputSchema()))
                 return schema.getOutputSchema();
 
@@ -647,22 +647,22 @@ public String getOutputSchema(String inputSchema) {
 
     @Override
     public String getOutputSchema(String inputCatalog, String inputSchema) {
-        for (Catalog catalog : configuredCatalogs)
+        for (CatalogMappingType catalog : configuredCatalogs)
             if (inputCatalog.equals(catalog.getInputCatalog()))
-                for (Schema schema : catalog.getSchemata())
+                for (SchemaMappingType schema : catalog.getSchemata())
                     if (inputSchema.equals(schema.getInputSchema()))
                         return schema.getOutputSchema();
 
         return inputSchema;
     }
 
     @Override
-    public final void setConfiguredCatalogs(List<Catalog> catalogs) {
+    public final void setConfiguredCatalogs(List<CatalogMappingType> catalogs) {
         this.configuredCatalogs = catalogs;
     }
 
     @Override
-    public final void setConfiguredSchemata(List<Schema> schemata) {
+    public final void setConfiguredSchemata(List<SchemaMappingType> schemata) {
         this.configuredSchemata = schemata;
     }
 

jOOQ-meta/src/main/java/org/jooq/meta/Database.java

@@ -47,12 +47,12 @@
 import org.jooq.Name;
 import org.jooq.SQLDialect;
 import org.jooq.Table;
-import org.jooq.meta.jaxb.Catalog;
+import org.jooq.meta.jaxb.CatalogMappingType;
 import org.jooq.meta.jaxb.CustomType;
 import org.jooq.meta.jaxb.EnumType;
 import org.jooq.meta.jaxb.ForcedType;
 import org.jooq.meta.jaxb.RegexFlag;
-import org.jooq.meta.jaxb.Schema;
+import org.jooq.meta.jaxb.SchemaMappingType;
 
 /**
  * A general database model.
@@ -338,12 +338,12 @@ public interface Database  extends AutoCloseable  {
     /**
      * The input and output catalogs.
      */
-    void setConfiguredCatalogs(List<Catalog> catalogs);
+    void setConfiguredCatalogs(List<CatalogMappingType> catalogs);
 
     /**
      * The input and output schemata.
      */
-    void setConfiguredSchemata(List<Schema> schemata);
+    void setConfiguredSchemata(List<SchemaMappingType> schemata);
 
     /**
      * Database objects matching any of these regular expressions will not be

jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdDatabase.java

@@ -82,7 +82,7 @@
 import org.jooq.meta.firebird.rdb.tables.Rdb$indexSegments;
 import org.jooq.meta.firebird.rdb.tables.Rdb$refConstraints;
 import org.jooq.meta.firebird.rdb.tables.Rdb$relationConstraints;
-import org.jooq.meta.jaxb.Schema;
+import org.jooq.meta.jaxb.SchemaMappingType;
 import org.jooq.util.firebird.FirebirdDataType;
 
 /**
@@ -93,11 +93,11 @@ public class FirebirdDatabase extends AbstractDatabase {
     public FirebirdDatabase() {
 
         // Firebird doesn't know schemata
-        Schema schema = new Schema();
+        SchemaMappingType schema = new SchemaMappingType();
         schema.setInputSchema("");
         schema.setOutputSchema("");
 
-        List<Schema> schemata = new ArrayList<Schema>();
+        List<SchemaMappingType> schemata = new ArrayList<SchemaMappingType>();
         schemata.add(schema);
 
         setConfiguredSchemata(schemata);

jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Catalog.java → jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CatalogMappingType.java

@@ -28,13 +28,13 @@
  *
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Catalog", propOrder = {
+@XmlType(name = "CatalogMappingType", propOrder = {
 
 })
 @SuppressWarnings({
     "all"
 })
-public class Catalog implements Serializable
+public class CatalogMappingType implements Serializable
 {
 
     private final static long serialVersionUID = 31200L;
@@ -47,7 +47,7 @@ public class Catalog implements Serializable
     protected Boolean outputCatalogToDefault = false;
     @XmlElementWrapper(name = "schemata")
     @XmlElement(name = "schema")
-    protected List<Schema> schemata;
+    protected List<SchemaMappingType> schemata;
 
     /**
      * See also {@link Database#getInputCatalog()}
@@ -121,49 +121,49 @@ public void setOutputCatalogToDefault(Boolean value) {
         this.outputCatalogToDefault = value;
     }
 
-    public List<Schema> getSchemata() {
+    public List<SchemaMappingType> getSchemata() {
         if (schemata == null) {
-            schemata = new ArrayList<Schema>();
+            schemata = new ArrayList<SchemaMappingType>();
         }
         return schemata;
     }
 
-    public void setSchemata(List<Schema> schemata) {
+    public void setSchemata(List<SchemaMappingType> schemata) {
         this.schemata = schemata;
     }
 
-    public Catalog withInputCatalog(String value) {
+    public CatalogMappingType withInputCatalog(String value) {
         setInputCatalog(value);
         return this;
     }
 
-    public Catalog withOutputCatalog(String value) {
+    public CatalogMappingType withOutputCatalog(String value) {
         setOutputCatalog(value);
         return this;
     }
 
-    public Catalog withOutputCatalogToDefault(Boolean value) {
+    public CatalogMappingType withOutputCatalogToDefault(Boolean value) {
         setOutputCatalogToDefault(value);
         return this;
     }
 
-    public Catalog withSchemata(Schema... values) {
+    public CatalogMappingType withSchemata(SchemaMappingType... values) {
         if (values!= null) {
-            for (Schema value: values) {
+            for (SchemaMappingType value: values) {
                 getSchemata().add(value);
             }
         }
         return this;
     }
 
-    public Catalog withSchemata(Collection<Schema> values) {
+    public CatalogMappingType withSchemata(Collection<SchemaMappingType> values) {
         if (values!= null) {
             getSchemata().addAll(values);
         }
         return this;
     }
 
-    public Catalog withSchemata(List<Schema> schemata) {
+    public CatalogMappingType withSchemata(List<SchemaMappingType> schemata) {
         setSchemata(schemata);
         return this;
     }
@@ -209,7 +209,7 @@ public boolean equals(Object that) {
         if (getClass()!= that.getClass()) {
             return false;
         }
-        Catalog other = ((Catalog) that);
+        CatalogMappingType other = ((CatalogMappingType) that);
         if (inputCatalog == null) {
             if (other.inputCatalog!= null) {
                 return false;