[#1095] Move generator.generate.unsigned-types to generator.database namespace

This commit is contained in:
Lukas Eder 2012-02-04 22:02:10 +00:00
parent 77f866cfb9
commit 855eeb641d
18 changed files with 146 additions and 212 deletions

View File

@ -49,6 +49,7 @@ public class Database {
private String inputSchema;
private String outputSchema;
private String dateAsTimestamp = "false";
private String unsignedTypes = "true";
private List<EnumType> enumTypes;
private List<ForcedType> forcedTypes;
@ -76,6 +77,10 @@ public class Database {
return dateAsTimestamp;
}
String getUnsignedTypes() {
return unsignedTypes;
}
List<EnumType> getEnumTypes() {
return enumTypes;
}

View File

@ -43,7 +43,6 @@ public class Generate {
private String relations = "false";
private String deprecated = "true";
private String instanceFields = "true";
private String unsignedTypes = "true";
private String generatedAnnotation = "true";
String getRelations() {
@ -58,10 +57,6 @@ public class Generate {
return instanceFields;
}
String getUnsignedTypes() {
return unsignedTypes;
}
String getGeneratedAnnotation() {
return generatedAnnotation;
}

View File

@ -96,6 +96,7 @@ public class Plugin extends AbstractMojo {
props.put("generator.database.input-schema", defaultString(generator.getDatabase().getInputSchema()));
props.put("generator.database.output-schema", defaultString(generator.getDatabase().getOutputSchema()));
props.put("generator.database.date-as-timestamp", defaultString(generator.getDatabase().getDateAsTimestamp()));
props.put("generator.generate.unsigned-types", defaultString(generator.getDatabase().getUnsignedTypes()));
if (generator.getDatabase().getEnumTypes() != null) {
for (EnumType type : generator.getDatabase().getEnumTypes()) {

View File

@ -184,6 +184,7 @@ public class GenerationTool {
database.setIncludes(properties.containsKey("generator.database.includes") ? properties.getProperty("generator.database.includes") : null);
database.setExcludes(properties.containsKey("generator.database.excludes") ? properties.getProperty("generator.database.excludes") : null);
database.setDateAsTimestamp("true".equalsIgnoreCase(properties.getProperty("generator.database.date-as-timestamp")));
database.setUnsignedTypes(!"false".equalsIgnoreCase(properties.getProperty("generator.generate.unsigned-types")));
database.setSchemata(schemata);
// Avoid creating these empty elements when migrating
@ -204,7 +205,6 @@ public class GenerationTool {
generate.setRelations("true".equalsIgnoreCase(properties.getProperty("generator.generate.relations")));
generate.setDeprecated(!"false".equalsIgnoreCase(properties.getProperty("generator.generate.deprecated")));
generate.setInstanceFields(!"false".equalsIgnoreCase(properties.getProperty("generator.generate.instance-fields")));
generate.setUnsignedTypes(!"false".equalsIgnoreCase(properties.getProperty("generator.generate.unsigned-types")));
generate.setGeneratedAnnotation(!"false".equalsIgnoreCase(properties.getProperty("generator.generate.generated-annotation")));
org.jooq.util.jaxb.Generator generator = new org.jooq.util.jaxb.Generator();
@ -308,7 +308,7 @@ public class GenerationTool {
database.setConfiguredMasterDataTables(g.getDatabase().getMasterDataTables().getMasterDataTable());
database.setConfiguredEnumTypes(g.getDatabase().getEnumTypes().getEnumType());
database.setConfiguredForcedTypes(g.getDatabase().getForcedTypes().getForcedType());
database.setSupportsUnsignedTypes(g.getGenerate().isUnsignedTypes());
database.setSupportsUnsignedTypes(g.getDatabase().isUnsignedTypes());
generator.setTargetPackage(g.getTarget().getPackageName());
generator.setTargetDirectory(g.getTarget().getDirectory());

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@ -17,11 +17,6 @@ import javax.xml.bind.annotation.XmlType;
/**
*
* Some configuration for the database abstraction
* (jooq-meta)
*
*
* <p>Java class for Database complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
@ -35,6 +30,7 @@ import javax.xml.bind.annotation.XmlType;
* &lt;element name="includes" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
* &lt;element name="excludes" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
* &lt;element name="dateAsTimestamp" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
* &lt;element name="unsignedTypes" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
* &lt;element name="schemata" type="{http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd}Schemata" minOccurs="0"/>
* &lt;element name="masterDataTables" minOccurs="0">
* &lt;complexType>
@ -91,6 +87,8 @@ public class Database {
protected String excludes;
@XmlElement(defaultValue = "false")
protected Boolean dateAsTimestamp;
@XmlElement(defaultValue = "true")
protected Boolean unsignedTypes;
protected Schemata schemata;
protected Database.MasterDataTables masterDataTables;
protected Database.EnumTypes enumTypes;
@ -192,6 +190,30 @@ public class Database {
this.dateAsTimestamp = value;
}
/**
* Gets the value of the unsignedTypes property.
*
* @return
* possible object is
* {@link Boolean }
*
*/
public Boolean isUnsignedTypes() {
return unsignedTypes;
}
/**
* Sets the value of the unsignedTypes property.
*
* @param value
* allowed object is
* {@link Boolean }
*
*/
public void setUnsignedTypes(Boolean value) {
this.unsignedTypes = value;
}
/**
* Gets the value of the schemata property.
*

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@ -15,10 +15,6 @@ import javax.xml.bind.annotation.XmlType;
/**
*
* Configuration for custom enum types
*
*
* <p>Java class for EnumType complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@ -15,10 +15,6 @@ import javax.xml.bind.annotation.XmlType;
/**
*
* Configuration for forced types
*
*
* <p>Java class for ForcedType complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@ -15,11 +15,6 @@ import javax.xml.bind.annotation.XmlType;
/**
*
* Some configuration for the source code generator
* (jooq-codegen)
*
*
* <p>Java class for Generate complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
@ -32,7 +27,6 @@ import javax.xml.bind.annotation.XmlType;
* &lt;element name="relations" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
* &lt;element name="deprecated" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
* &lt;element name="instanceFields" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
* &lt;element name="unsignedTypes" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
* &lt;element name="generatedAnnotation" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
* &lt;/all>
* &lt;/restriction>
@ -55,8 +49,6 @@ public class Generate {
@XmlElement(defaultValue = "true")
protected Boolean instanceFields;
@XmlElement(defaultValue = "true")
protected Boolean unsignedTypes;
@XmlElement(defaultValue = "true")
protected Boolean generatedAnnotation;
/**
@ -131,30 +123,6 @@ public class Generate {
this.instanceFields = value;
}
/**
* Gets the value of the unsignedTypes property.
*
* @return
* possible object is
* {@link Boolean }
*
*/
public Boolean isUnsignedTypes() {
return unsignedTypes;
}
/**
* Sets the value of the unsignedTypes property.
*
* @param value
* allowed object is
* {@link Boolean }
*
*/
public void setUnsignedTypes(Boolean value) {
this.unsignedTypes = value;
}
/**
* Gets the value of the generatedAnnotation property.
*

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@ -15,10 +15,6 @@ import javax.xml.bind.annotation.XmlType;
/**
*
* The source code generator's global configuration
*
*
* <p>Java class for Generator complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@ -15,8 +15,6 @@ import javax.xml.bind.annotation.XmlType;
/**
* The database connection configuration
*
* <p>Java class for Jdbc complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@ -15,10 +15,6 @@ import javax.xml.bind.annotation.XmlType;
/**
*
* Configuration for a master data table
*
*
* <p>Java class for MasterDataTable complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@ -36,30 +36,6 @@ public class ObjectFactory {
public ObjectFactory() {
}
/**
* Create an instance of {@link Generator }
*
*/
public Generator createGenerator() {
return new Generator();
}
/**
* Create an instance of {@link Strategy }
*
*/
public Strategy createStrategy() {
return new Strategy();
}
/**
* Create an instance of {@link ForcedType }
*
*/
public ForcedType createForcedType() {
return new ForcedType();
}
/**
* Create an instance of {@link Jdbc }
*
@ -69,35 +45,11 @@ public class ObjectFactory {
}
/**
* Create an instance of {@link MasterDataTable }
* Create an instance of {@link Database.ForcedTypes }
*
*/
public MasterDataTable createMasterDataTable() {
return new MasterDataTable();
}
/**
* Create an instance of {@link Generate }
*
*/
public Generate createGenerate() {
return new Generate();
}
/**
* Create an instance of {@link Schemata }
*
*/
public Schemata createSchemata() {
return new Schemata();
}
/**
* Create an instance of {@link Database.EnumTypes }
*
*/
public Database.EnumTypes createDatabaseEnumTypes() {
return new Database.EnumTypes();
public Database.ForcedTypes createDatabaseForcedTypes() {
return new Database.ForcedTypes();
}
/**
@ -108,6 +60,22 @@ public class ObjectFactory {
return new Schemata.Schema();
}
/**
* Create an instance of {@link Schemata }
*
*/
public Schemata createSchemata() {
return new Schemata();
}
/**
* Create an instance of {@link Generator }
*
*/
public Generator createGenerator() {
return new Generator();
}
/**
* Create an instance of {@link Configuration }
*
@ -116,6 +84,38 @@ public class ObjectFactory {
return new Configuration();
}
/**
* Create an instance of {@link Target }
*
*/
public Target createTarget() {
return new Target();
}
/**
* Create an instance of {@link MasterDataTable }
*
*/
public MasterDataTable createMasterDataTable() {
return new MasterDataTable();
}
/**
* Create an instance of {@link Database.EnumTypes }
*
*/
public Database.EnumTypes createDatabaseEnumTypes() {
return new Database.EnumTypes();
}
/**
* Create an instance of {@link ForcedType }
*
*/
public ForcedType createForcedType() {
return new ForcedType();
}
/**
* Create an instance of {@link EnumType }
*
@ -124,14 +124,6 @@ public class ObjectFactory {
return new EnumType();
}
/**
* Create an instance of {@link Database.ForcedTypes }
*
*/
public Database.ForcedTypes createDatabaseForcedTypes() {
return new Database.ForcedTypes();
}
/**
* Create an instance of {@link Database.MasterDataTables }
*
@ -149,11 +141,19 @@ public class ObjectFactory {
}
/**
* Create an instance of {@link Target }
* Create an instance of {@link Generate }
*
*/
public Target createTarget() {
return new Target();
public Generate createGenerate() {
return new Generate();
}
/**
* Create an instance of {@link Strategy }
*
*/
public Strategy createStrategy() {
return new Strategy();
}
}

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@ -17,11 +17,6 @@ import javax.xml.bind.annotation.XmlType;
/**
*
* Some configuration for the schema abstraction
* (jooq-meta)
*
*
* <p>Java class for Schemata complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@ -15,11 +15,6 @@ import javax.xml.bind.annotation.XmlType;
/**
*
* Some configuration for the generator strategy,
* providing naming schemes for generated artefacts
*
*
* <p>Java class for Strategy complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@ -15,10 +15,6 @@ import javax.xml.bind.annotation.XmlType;
/**
*
* Configuration for the target artefacts
*
*
* <p>Java class for Target complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.

View File

@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.02.01 at 09:32:08 PM MEZ
// Generated on: 2012.02.04 at 10:53:56 PM MEZ
//
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-codegen-2.0.4.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)

View File

@ -5,16 +5,19 @@
elementFormDefault="qualified">
<element name="configuration">
<annotation>
<documentation>
The XML version of the jOOQ configuration. More info
can be found here: http://www.jooq.org/manual/META/Configuration/
</documentation>
</annotation>
<complexType>
<all>
<!--
The JDBC configuration element contains information about how
to set up the database connection used for source code generation
-->
<element name="jdbc" type="tns:Jdbc" minOccurs="1"
maxOccurs="1" />
<!--
The GENERATOR configuration element contains information about
source code generation itself
-->
<element name="generator" type="tns:Generator" minOccurs="1"
maxOccurs="1" />
</all>
@ -22,46 +25,53 @@
</element>
<complexType name="Jdbc">
<annotation>
<documentation>The database connection configuration</documentation>
</annotation>
<all>
<!-- The JDBC driver -->
<element name="driver" type="string" minOccurs="1" maxOccurs="1" />
<!-- The JDBC connection URL -->
<element name="url" type="string" minOccurs="1" maxOccurs="1" />
<!-- Deprecated. Use SCHEMATA element instead -->
<element name="schema" type="string" minOccurs="0" maxOccurs="1" />
<!-- The JDBC connection user -->
<element name="user" type="string" minOccurs="0" maxOccurs="1" />
<!-- The JDBC connection password -->
<element name="password" type="string" minOccurs="0"
maxOccurs="1" />
</all>
</complexType>
<complexType name="Generator">
<annotation>
<documentation>
The source code generator's global configuration
</documentation>
</annotation>
<all>
<!--
The class used to generate source code. You may override this with
your custom source code generator
-->
<element name="name" type="string" default="org.jooq.util.DefaultGenerator"
minOccurs="0" maxOccurs="1" />
<!-- The naming strategy used for class and field names -->
<element name="strategy" type="tns:Strategy" minOccurs="0"
maxOccurs="1" />
maxOccurs="1" />
<!-- The jooq-meta configuration -->
<element name="database" type="tns:Database" minOccurs="1"
maxOccurs="1" />
<!-- The jooq-codegen configuration -->
<element name="generate" type="tns:Generate" minOccurs="0"
maxOccurs="1" />
<!-- Some information about generation output -->
<element name="target" type="tns:Target" minOccurs="0"
maxOccurs="1" />
</all>
</complexType>
<complexType name="Strategy">
<annotation>
<documentation>
Some configuration for the generator strategy,
providing naming schemes for generated artefacts
</documentation>
</annotation>
<all>
<element name="name" type="string" minOccurs="0" maxOccurs="1"
default="org.jooq.util.DefaultGeneratorStrategy" />
@ -69,20 +79,19 @@
</complexType>
<complexType name="Database">
<annotation>
<documentation>
Some configuration for the database abstraction
(jooq-meta)
</documentation>
</annotation>
<all>
<!-- The database dialect from jooq-meta -->
<element name="name" type="string" minOccurs="1" maxOccurs="1" />
<!-- A comma-separated list of regular expressions -->
<element name="includes" type="string" default=".*"
minOccurs="0" maxOccurs="1" />
<element name="excludes" type="string" default="" minOccurs="0"
maxOccurs="1" />
<element name="dateAsTimestamp" type="boolean" default="false"
minOccurs="0" maxOccurs="1" />
<element name="unsignedTypes" type="boolean" default="true"
minOccurs="0" maxOccurs="1" />
<element name="schemata" type="tns:Schemata" minOccurs="0" maxOccurs="1"/>
<element name="masterDataTables" minOccurs="0" maxOccurs="1">
<complexType>
@ -112,12 +121,6 @@
</complexType>
<complexType name="Schemata">
<annotation>
<documentation>
Some configuration for the schema abstraction
(jooq-meta)
</documentation>
</annotation>
<sequence>
<element name="schema" minOccurs="1" maxOccurs="unbounded">
<complexType>
@ -133,11 +136,6 @@
</complexType>
<complexType name="MasterDataTable">
<annotation>
<documentation>
Configuration for a master data table
</documentation>
</annotation>
<all>
<element name="name" type="string" minOccurs="1" maxOccurs="1" />
<element name="literal" type="string" minOccurs="0"
@ -148,11 +146,6 @@
</complexType>
<complexType name="EnumType">
<annotation>
<documentation>
Configuration for custom enum types
</documentation>
</annotation>
<all>
<element name="name" type="string" minOccurs="1" maxOccurs="1" />
<element name="literals" type="string" minOccurs="1"
@ -161,11 +154,6 @@
</complexType>
<complexType name="ForcedType">
<annotation>
<documentation>
Configuration for forced types
</documentation>
</annotation>
<all>
<element name="name" type="string" minOccurs="1" maxOccurs="1" />
<element name="expressions" type="string" minOccurs="1"
@ -174,12 +162,6 @@
</complexType>
<complexType name="Generate">
<annotation>
<documentation>
Some configuration for the source code generator
(jooq-codegen)
</documentation>
</annotation>
<all>
<element name="relations" type="boolean" default="false"
minOccurs="0" maxOccurs="1" />
@ -187,19 +169,12 @@
minOccurs="0" maxOccurs="1" />
<element name="instanceFields" type="boolean" default="true"
minOccurs="0" maxOccurs="1" />
<element name="unsignedTypes" type="boolean" default="true"
minOccurs="0" maxOccurs="1" />
<element name="generatedAnnotation" type="boolean" default="true"
minOccurs="0" maxOccurs="1" />
</all>
</complexType>
<complexType name="Target">
<annotation>
<documentation>
Configuration for the target artefacts
</documentation>
</annotation>
<all>
<element name="packageName" type="string" default="org.jooq.generated"
minOccurs="0" maxOccurs="1" />