github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#8923] Add @Deprecated annotations to XSDs

Browse Source 
Updates the jooq-codegen and jooq-runtime XSDs to generate `@Deprecated`
annotations where applicable. Since this is the first change to these
two XSDs in 3.13, the files, namespaces, and all references are also
updated for the new release.
This commit is contained in:
Knut Wannheden 2019-08-29 16:52:02 +02:00
parent d27dbf4117
commit 2beb580df2
18 changed files with 211 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
<bindings xmlns:tns="http://www.jooq.org/xsd/jooq-codegen-3.12.0.xsd" if-exists="true" scd="x-schema::tns">
<bindings xmlns:tns="http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd" if-exists="true" scd="x-schema::tns">
<schemaBindings map="false">

8
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java
View File

@ -22,10 +22,10 @@ import org.jooq.util.jaxb.tools.XMLBuilder;
* &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;all&gt;
* &lt;element name="logging" type="{http://www.jooq.org/xsd/jooq-codegen-3.12.0.xsd}Logging" minOccurs="0"/&gt;
* &lt;element name="onError" type="{http://www.jooq.org/xsd/jooq-codegen-3.12.0.xsd}OnError" minOccurs="0"/&gt;
* &lt;element name="jdbc" type="{http://www.jooq.org/xsd/jooq-codegen-3.12.0.xsd}Jdbc" minOccurs="0"/&gt;
* &lt;element name="generator" type="{http://www.jooq.org/xsd/jooq-codegen-3.12.0.xsd}Generator"/&gt;
* &lt;element name="logging" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}Logging" minOccurs="0"/&gt;
* &lt;element name="onError" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}OnError" minOccurs="0"/&gt;
* &lt;element name="jdbc" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}Jdbc" minOccurs="0"/&gt;
* &lt;element name="generator" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}Generator"/&gt;
* &lt;/all&gt;
* &lt;/restriction&gt;
* &lt;/complexContent&gt;

35
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CustomType.java
View File

@ -13,8 +13,25 @@ import org.jooq.util.jaxb.tools.XMLBuilder;
/**
* @deprecated Use ForcedType only
* <p>Java class for CustomType complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="CustomType"&gt;
* &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;all&gt;
* &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
* &lt;element name="type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
* &lt;element name="converter" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
* &lt;element name="enumConverter" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/&gt;
* &lt;element name="binding" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
* &lt;/all&gt;
* &lt;/restriction&gt;
* &lt;/complexContent&gt;
* &lt;/complexType&gt;
* </pre>
*
*
*/
@ -22,6 +39,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder;
@XmlType(name = "CustomType", propOrder = {
})
@Deprecated
@SuppressWarnings({
"all"
})
@ -48,6 +66,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public String getName() {
return name;
}
@ -60,6 +79,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public void setName(String value) {
this.name = value;
}
@ -72,6 +92,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public String getType() {
return type;
}
@ -84,6 +105,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public void setType(String value) {
this.type = value;
}
@ -96,6 +118,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public String getConverter() {
return converter;
}
@ -108,6 +131,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public void setConverter(String value) {
this.converter = value;
}
@ -120,6 +144,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link Boolean }
*
*/
@Deprecated
public Boolean isEnumConverter() {
return enumConverter;
}
@ -132,6 +157,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link Boolean }
*
*/
@Deprecated
public void setEnumConverter(Boolean value) {
this.enumConverter = value;
}
@ -144,6 +170,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public String getBinding() {
return binding;
}
@ -156,6 +183,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public void setBinding(String value) {
this.binding = value;
}
@ -168,6 +196,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public CustomType withName(String value) {
setName(value);
return this;
@ -181,6 +210,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public CustomType withType(String value) {
setType(value);
return this;
@ -194,6 +224,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public CustomType withConverter(String value) {
setConverter(value);
return this;
@ -207,6 +238,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link Boolean }
*
*/
@Deprecated
public CustomType withEnumConverter(Boolean value) {
setEnumConverter(value);
return this;
@ -220,6 +252,7 @@ public class CustomType implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public CustomType withBinding(String value) {
setBinding(value);
return this;

9
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java
View File

@ -963,6 +963,7 @@ public class Database implements Serializable, XMLAppendable
* {@link Boolean }
*
*/
@Deprecated
public Boolean isIgnoreProcedureReturnValues() {
return ignoreProcedureReturnValues;
}
@ -975,6 +976,7 @@ public class Database implements Serializable, XMLAppendable
* {@link Boolean }
*
*/
@Deprecated
public void setIgnoreProcedureReturnValues(Boolean value) {
this.ignoreProcedureReturnValues = value;
}
@ -1438,6 +1440,7 @@ public class Database implements Serializable, XMLAppendable
this.embeddables = embeddables;
}
@Deprecated
public List<CustomType> getCustomTypes() {
if (customTypes == null) {
customTypes = new ArrayList<CustomType>();
@ -1445,10 +1448,12 @@ public class Database implements Serializable, XMLAppendable
return customTypes;
}
@Deprecated
public void setCustomTypes(List<CustomType> customTypes) {
this.customTypes = customTypes;
}
@Deprecated
public List<EnumType> getEnumTypes() {
if (enumTypes == null) {
enumTypes = new ArrayList<EnumType>();
@ -1456,6 +1461,7 @@ public class Database implements Serializable, XMLAppendable
return enumTypes;
}
@Deprecated
public void setEnumTypes(List<EnumType> enumTypes) {
this.enumTypes = enumTypes;
}
@ -1859,6 +1865,7 @@ public class Database implements Serializable, XMLAppendable
* {@link Boolean }
*
*/
@Deprecated
public Database withIgnoreProcedureReturnValues(Boolean value) {
setIgnoreProcedureReturnValues(value);
return this;
@ -2159,6 +2166,7 @@ public class Database implements Serializable, XMLAppendable
return this;
}
@Deprecated
public Database withCustomTypes(List<CustomType> customTypes) {
setCustomTypes(customTypes);
return this;
@ -2180,6 +2188,7 @@ public class Database implements Serializable, XMLAppendable
return this;
}
@Deprecated
public Database withEnumTypes(List<EnumType> enumTypes) {
setEnumTypes(enumTypes);
return this;

3
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java
View File

@ -297,6 +297,7 @@ public class Generate implements Serializable, XMLAppendable
* {@link Boolean }
*
*/
@Deprecated
public Boolean isInstanceFields() {
return instanceFields;
}
@ -309,6 +310,7 @@ public class Generate implements Serializable, XMLAppendable
* {@link Boolean }
*
*/
@Deprecated
public void setInstanceFields(Boolean value) {
this.instanceFields = value;
}
@ -1854,6 +1856,7 @@ public class Generate implements Serializable, XMLAppendable
* {@link Boolean }
*
*/
@Deprecated
public Generate withInstanceFields(Boolean value) {
setInstanceFields(value);
return this;

3
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java
View File

@ -107,6 +107,7 @@ public class Jdbc implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public String getSchema() {
return schema;
}
@ -119,6 +120,7 @@ public class Jdbc implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public void setSchema(String value) {
this.schema = value;
}
@ -264,6 +266,7 @@ public class Jdbc implements Serializable, XMLAppendable
* {@link String }
*
*/
@Deprecated
public Jdbc withSchema(String value) {
setSchema(value);
return this;

2
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java
View File

@ -23,7 +23,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder;
* &lt;complexContent&gt;
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
* &lt;all&gt;
* &lt;element name="transform" type="{http://www.jooq.org/xsd/jooq-codegen-3.12.0.xsd}MatcherTransformType" minOccurs="0"/&gt;
* &lt;element name="transform" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}MatcherTransformType" minOccurs="0"/&gt;
* &lt;element name="expression" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
* &lt;/all&gt;
* &lt;/restriction&gt;

2
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/package-info.java
View File

@ -1,2 +1,2 @@
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-codegen-3.12.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.jooq.meta.jaxb;

2
jOOQ-meta/src/main/resources/xjb/codegen/binding.xjb
View File

@ -19,7 +19,7 @@
<!-- Annotate the following classes with @SuppressWarnings -->
<jaxb:bindings schemaLocation="../../xsd/jooq-codegen-3.12.0.xsd" multiple="true" node="//xs:complexType">
<jaxb:bindings schemaLocation="../../xsd/jooq-codegen-3.13.0.xsd" multiple="true" node="//xs:complexType">
<annox:annotate>
<annox:annotate annox:class="java.lang.SuppressWarnings" value="all" />
</annox:annotate>

117
jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.12.0.xsd → jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.13.0.xsd
View File

@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:tns="http://www.jooq.org/xsd/jooq-codegen-3.12.0.xsd"
xmlns:tns="http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd"
xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
targetNamespace="http://www.jooq.org/xsd/jooq-codegen-3.12.0.xsd"
xmlns:annox="http://annox.dev.java.net"
targetNamespace="http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd"
elementFormDefault="qualified"
jxb:extensionBindingPrefixes="annox"
jxb:version="2.1">
<element name="configuration">
@ -59,7 +61,15 @@
</element>
<element name="schema" type="string" minOccurs="0" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[@deprecated Use database schema configuration elements instead.]]></jxb:javadoc></jxb:property></appinfo></annotation>
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[@deprecated Use database schema configuration elements instead.]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
<element name="user" type="string" minOccurs="0" maxOccurs="1">
@ -610,7 +620,10 @@ This flag will also replace synthetic primary keys, if it matches.]]></jxb:javad
</element>
<element name="ignoreProcedureReturnValues" type="boolean" default="false" minOccurs="0" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Ignore procedure return values in Transact-SQL generated code.
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[Ignore procedure return values in Transact-SQL generated code.
<p>
In jOOQ 3.6.0, #4106 was implemented to support Transact-SQL's
optional return values from stored procedures. This turns all procedures
@ -618,7 +631,12 @@ into Routine<Integer> (instead of Routine<Void>). For backwards-
compatibility reasons, users can suppress this change in jOOQ 3.x
<p>
@deprecated This feature is deprecated as of jOOQ 3.6.0 and will be removed again in
jOOQ 4.0.]]></jxb:javadoc></jxb:property></appinfo></annotation>
jOOQ 4.0.]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
<element name="unsignedTypes" type="boolean" default="true" minOccurs="0" maxOccurs="1">
@ -734,11 +752,27 @@ This comparator can be used to influence the order of any object that is produce
</element>
<element name="customTypes" type="tns:CustomTypes" minOccurs="0" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[@deprecated Use {@link #getForcedTypes()} only]]></jxb:javadoc></jxb:property></appinfo></annotation>
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[@deprecated Use {@link #getForcedTypes()} only]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
<element name="enumTypes" type="tns:EnumTypes" minOccurs="0" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[@deprecated]]></jxb:javadoc></jxb:property></appinfo></annotation>
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[@deprecated]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
<element name="forcedTypes" type="tns:ForcedTypes" minOccurs="0" maxOccurs="1">
@ -846,26 +880,73 @@ for Oracle.]]></jxb:javadoc></jxb:property></appinfo></annotation>
</complexType>
<complexType name="CustomType">
<annotation><appinfo><jxb:class><jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc></jxb:class></appinfo></annotation>
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="class">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
<all>
<element name="name" type="string" minOccurs="1" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc></jxb:property></appinfo></annotation>
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
<element name="type" type="string" minOccurs="0" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc></jxb:property></appinfo></annotation>
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
<element name="converter" type="string" minOccurs="0" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc></jxb:property></appinfo></annotation>
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
<element name="enumConverter" type="boolean" minOccurs="0" maxOccurs="1" fixed="true">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc></jxb:property></appinfo></annotation>
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
<element name="binding" type="string" minOccurs="0" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc></jxb:property></appinfo></annotation>
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[@deprecated Use ForcedType only]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
</all>
</complexType>
@ -1022,7 +1103,15 @@ jOOQ API, without adding custom data type bindings to them.]]></jxb:javadoc></jx
</element>
<element name="instanceFields" type="boolean" default="true" minOccurs="0" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[@deprecated]]></jxb:javadoc></jxb:property></appinfo></annotation>
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[@deprecated]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
<element name="generatedAnnotation" type="boolean" default="true" minOccurs="0" maxOccurs="1">

4
jOOQ/src/main/java/org/jooq/Constants.java
View File

@ -68,7 +68,7 @@ public final class Constants {
/**
* The current jooq-runtime XSD file name.
*/
public static final String XSD_RUNTIME = "jooq-runtime-3.12.0.xsd";
public static final String XSD_RUNTIME = "jooq-runtime-3.13.0.xsd";
/**
* The current jooq-runtime XML namespace.
@ -113,7 +113,7 @@ public final class Constants {
/**
* The current jooq-codegen XSD file name.
*/
public static final String XSD_CODEGEN = "jooq-codegen-3.12.0.xsd";
public static final String XSD_CODEGEN = "jooq-codegen-3.13.0.xsd";
/**
* The current jooq-codegen XML namespace.

4
jOOQ/src/main/java/org/jooq/conf/ObjectFactory.java
View File

@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
private final static QName _Settings_QNAME = new QName("http://www.jooq.org/xsd/jooq-runtime-3.12.0.xsd", "settings");
private final static QName _Settings_QNAME = new QName("http://www.jooq.org/xsd/jooq-runtime-3.13.0.xsd", "settings");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jooq.conf
@ -89,7 +89,7 @@ public class ObjectFactory {
* @return
* the new instance of {@link JAXBElement }{@code <}{@link Settings }{@code >}
*/
@XmlElementDecl(namespace = "http://www.jooq.org/xsd/jooq-runtime-3.12.0.xsd", name = "settings")
@XmlElementDecl(namespace = "http://www.jooq.org/xsd/jooq-runtime-3.13.0.xsd", name = "settings")
public JAXBElement<Settings> createSettings(Settings value) {
return new JAXBElement<Settings>(_Settings_QNAME, Settings.class, null, value);
}

1
jOOQ/src/main/java/org/jooq/conf/RenderKeywordStyle.java
View File

@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlType(name = "RenderKeywordStyle")
@XmlEnum
@Deprecated
public enum RenderKeywordStyle {
AS_IS,

1
jOOQ/src/main/java/org/jooq/conf/RenderNameStyle.java
View File

@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlType;
*/
@XmlType(name = "RenderNameStyle")
@XmlEnum
@Deprecated
public enum RenderNameStyle {
QUOTED,

6
jOOQ/src/main/java/org/jooq/conf/Settings.java
View File

@ -347,6 +347,7 @@ public class Settings
* {@link RenderNameStyle }
*
*/
@Deprecated
public RenderNameStyle getRenderNameStyle() {
return renderNameStyle;
}
@ -359,6 +360,7 @@ public class Settings
* {@link RenderNameStyle }
*
*/
@Deprecated
public void setRenderNameStyle(RenderNameStyle value) {
this.renderNameStyle = value;
}
@ -429,6 +431,7 @@ public class Settings
* {@link RenderKeywordStyle }
*
*/
@Deprecated
public RenderKeywordStyle getRenderKeywordStyle() {
return renderKeywordStyle;
}
@ -441,6 +444,7 @@ public class Settings
* {@link RenderKeywordStyle }
*
*/
@Deprecated
public void setRenderKeywordStyle(RenderKeywordStyle value) {
this.renderKeywordStyle = value;
}
@ -1970,6 +1974,7 @@ public class Settings
* {@link RenderNameStyle }
*
*/
@Deprecated
public Settings withRenderNameStyle(RenderNameStyle value) {
setRenderNameStyle(value);
return this;
@ -2009,6 +2014,7 @@ public class Settings
* {@link RenderKeywordStyle }
*
*/
@Deprecated
public Settings withRenderKeywordStyle(RenderKeywordStyle value) {
setRenderKeywordStyle(value);
return this;

2
jOOQ/src/main/java/org/jooq/conf/package-info.java
View File

@ -1,2 +1,2 @@
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-runtime-3.12.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-runtime-3.13.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.jooq.conf;

8
jOOQ/src/main/resources/xjb/runtime/binding.xjb
View File

@ -16,22 +16,22 @@
</jaxb:globalBindings>
<!-- [#2928] Regular expressions -->
<jaxb:bindings schemaLocation="../../xsd/jooq-runtime-3.12.0.xsd" multiple="true" node="//xs:element[@name='inputExpression']">
<jaxb:bindings schemaLocation="../../xsd/jooq-runtime-3.13.0.xsd" multiple="true" node="//xs:element[@name='inputExpression']">
<xjc:javaType name="java.util.regex.Pattern" adapter="org.jooq.conf.RegexAdapter"/>
</jaxb:bindings>
<!-- [#7153] Locales -->
<jaxb:bindings schemaLocation="../../xsd/jooq-runtime-3.12.0.xsd" multiple="true" node="//xs:element[@name='renderLocale']">
<jaxb:bindings schemaLocation="../../xsd/jooq-runtime-3.13.0.xsd" multiple="true" node="//xs:element[@name='renderLocale']">
<xjc:javaType name="java.util.Locale" adapter="org.jooq.conf.LocaleAdapter"/>
</jaxb:bindings>
<!-- [#7337] SQLDialects -->
<jaxb:bindings schemaLocation="../../xsd/jooq-runtime-3.12.0.xsd" multiple="true" node="//xs:element[@name='parseDialect']">
<jaxb:bindings schemaLocation="../../xsd/jooq-runtime-3.13.0.xsd" multiple="true" node="//xs:element[@name='parseDialect']">
<xjc:javaType name="org.jooq.SQLDialect" adapter="org.jooq.conf.SQLDialectAdapter"/>
</jaxb:bindings>
<!-- Annotate the following classes with @SuppressWarnings -->
<jaxb:bindings schemaLocation="../../xsd/jooq-runtime-3.12.0.xsd" multiple="true" node="//xs:complexType">
<jaxb:bindings schemaLocation="../../xsd/jooq-runtime-3.13.0.xsd" multiple="true" node="//xs:complexType">
<inheritance:extends>org.jooq.conf.SettingsBase</inheritance:extends>
<inheritance:implements>java.lang.Cloneable</inheritance:implements>
<annox:annotate>

40
jOOQ/src/main/resources/xsd/jooq-runtime-3.12.0.xsd → jOOQ/src/main/resources/xsd/jooq-runtime-3.13.0.xsd
View File

@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<schema
xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:jooq-runtime="http://www.jooq.org/xsd/jooq-runtime-3.12.0.xsd"
xmlns:jooq-runtime="http://www.jooq.org/xsd/jooq-runtime-3.13.0.xsd"
xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
targetNamespace="http://www.jooq.org/xsd/jooq-runtime-3.12.0.xsd"
xmlns:annox="http://annox.dev.java.net"
targetNamespace="http://www.jooq.org/xsd/jooq-runtime-3.13.0.xsd"
elementFormDefault="qualified"
jxb:extensionBindingPrefixes="annox"
jxb:version="2.1">
<element name="settings" type="jooq-runtime:Settings"/>
@ -50,12 +52,20 @@ This setting does not affect any plain SQL usage.]]></jxb:javadoc></jxb:property
</element>
<element name="renderNameStyle" type="jooq-runtime:RenderNameStyle" minOccurs="0" maxOccurs="1" default="QUOTED">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Whether rendered schema, table, column names, etc should be quoted
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[Whether rendered schema, table, column names, etc should be quoted
in rendered SQL, or transformed in any other way.
<p>
This is set to "QUOTED" by default for backwards-compatibility.
<p>
@deprecated - 3.12.0 - [#5909] - Use {@link RenderQuotedNames} and {@link RenderNameCase} instead.]]></jxb:javadoc></jxb:property></appinfo></annotation>
@deprecated - 3.12.0 - [#5909] - Use {@link RenderQuotedNames} and {@link RenderNameCase} instead.]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
<element name="renderNamedParamPrefix" type="string" minOccurs="0" maxOccurs="1" default=":">
@ -75,9 +85,17 @@ providing a name to parameters, resulting in <code>:1</code> or <code>@1</code>
</element>
<element name="renderKeywordStyle" type="jooq-runtime:RenderKeywordStyle" minOccurs="0" maxOccurs="1" default="AS_IS">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Whether the case of {@link org.jooq.Keyword} references should be modified in any way.
<annotation>
<appinfo>
<jxb:property>
<jxb:javadoc><![CDATA[Whether the case of {@link org.jooq.Keyword} references should be modified in any way.
<p>
@deprecated - 3.12.0 - [#5909] - Use {@link RenderQuotedNames} and {@link RenderNameCase} instead.]]></jxb:javadoc></jxb:property></appinfo></annotation>
@deprecated - 3.12.0 - [#5909] - Use {@link RenderQuotedNames} and {@link RenderNameCase} instead.]]></jxb:javadoc>
</jxb:property>
<annox:annotate target="getter">@java.lang.Deprecated</annox:annotate>
<annox:annotate target="setter">@java.lang.Deprecated</annox:annotate>
</appinfo>
</annotation>
</element>
<element name="renderLocale" type="string" minOccurs="0" maxOccurs="1">
@ -550,6 +568,11 @@ Either &lt;input/&gt; or &lt;inputExpression/&gt; must be provided]]></jxb:javad
</simpleType>
<simpleType name="RenderNameStyle">
<annotation>
<appinfo>
<annox:annotateEnum>@java.lang.Deprecated</annox:annotateEnum>
</appinfo>
</annotation>
<restriction base="string">
<!-- Render object names quoted, as defined in the database. Use this
@ -644,6 +667,11 @@ Either &lt;input/&gt; or &lt;inputExpression/&gt; must be provided]]></jxb:javad
</simpleType>
<simpleType name="RenderKeywordStyle">
<annotation>
<appinfo>
<annox:annotateEnum>@java.lang.Deprecated</annox:annotateEnum>
</appinfo>
</annotation>
<restriction base="string">
<!-- Keywords are rendered "as is", i.e. mostly in lower case. For instance: