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

[#4429] Reverted incomplete implementation

Browse Source
This commit is contained in:
lukaseder 2015-07-29 15:43:23 +02:00
parent dd8bab2fcb
commit 01eba80994
5 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java
View File

@ -70,7 +70,6 @@ abstract class AbstractGenerator implements Generator {
boolean generateGlobalSequenceReferences = true;
boolean generateGlobalTableReferences = true;
boolean generateGlobalUDTReferences = true;
boolean generateJavaTimeTypes = true;
boolean fluentSetters = false;
String fullyQualifiedTypes = "";
@ -304,16 +303,6 @@ abstract class AbstractGenerator implements Generator {
this.fullyQualifiedTypes = fullyQualifiedTypes;
}
@Override
public boolean generateJavaTimeTypes() {
return generateJavaTimeTypes;
}
@Override
public void setGenerateJavaTimeTypes(boolean generateJavaTimeTypes) {
this.generateJavaTimeTypes = generateJavaTimeTypes;
}
// ----
@Override

12
jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
View File

@ -412,18 +412,6 @@ public class GenerationTool {
generator.setGeneratePojosEqualsAndHashCode(g.getGenerate().isPojosEqualsAndHashCode());
if (g.getGenerate().getFullyQualifiedTypes() != null)
generator.setFullyQualifiedTypes(g.getGenerate().getFullyQualifiedTypes());
if (g.getGenerate().isJavaTimeTypes() != null)
generator.setGenerateJavaTimeTypes(g.getGenerate().isJavaTimeTypes());
/* [java-8] */
if (true)
;
else
/* [/java-8] */
if (!Boolean.FALSE.equals(g.getGenerate().isJavaTimeTypes())) {
log.warn("INVALID CONFIG", "The java.time API cannot be used in the Java 6 distribution of jOOQ 3.7+");
generator.setGenerateJavaTimeTypes(false);
}
if (Boolean.TRUE.equals(g.getGenerate().isJpaAnnotations()))
log.warn("DEPRECATED", "The <jpaAnnotations/> flag is deprecated and used for backwards-compatibility only. It will be removed in the future.");

17
jOOQ-codegen/src/main/java/org/jooq/util/Generator.java
View File

@ -106,7 +106,6 @@ public interface Generator {
void setGenerateGeneratedAnnotation(boolean generateGeneratedAnnotation);
boolean useSchemaVersionProvider();
void setUseSchemaVersionProvider(boolean useSchemaVersionProvider);
/**
@ -265,22 +264,6 @@ public interface Generator {
*/
void setFullyQualifiedTypes(String fullyQualifiedTypes);
/**
* A flag indicating whether Java 8's java.time types should be used by the
* source code generator, rather than JDBC's java.sql types.
* <p>
* This flag is ignored in the commercial Java 6 distribution of jOOQ 3.7+
*/
boolean generateJavaTimeTypes();
/**
* A flag indicating whether Java 8's java.time types should be used by the
* source code generator, rather than JDBC's java.sql types.
* <p>
* This flag is ignored in the commercial Java 6 distribution of jOOQ 3.7+
*/
void setGenerateJavaTimeTypes(boolean generateJavaTimeTypes);
/**
* The target directory
*/

2
jOOQ-meta/pom.xml
View File

@ -47,7 +47,7 @@
<schemaDirectory>src/main/resources/xsd</schemaDirectory>
<bindingDirectory>src/main/resources/xjb/codegen</bindingDirectory>
<schemaIncludes>
<include>jooq-codegen-3.7.0.xsd</include>
<include>jooq-codegen-3.6.0.xsd</include>
</schemaIncludes>
<generatePackage>org.jooq.util.jaxb</generatePackage>
<args>

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

@ -11,7 +11,7 @@
<jaxb:globalBindings>
<!-- Force all classes implements Serializable -->
<xjc:serializable uid="370" />
<xjc:serializable uid="360" />
<!-- [#2401] Trim unnecessary whitespace from configuration -->
<xjc:javaType name="java.lang.String" xmlType="xs:string" adapter="org.jooq.util.jaxb.tools.TrimAdapter"/>
@ -19,7 +19,7 @@
<!-- Annotate the following classes with @SuppressWarnings -->
<jaxb:bindings schemaLocation="../../xsd/jooq-codegen-3.7.0.xsd" multiple="true" node="//xs:complexType">
<jaxb:bindings schemaLocation="../../xsd/jooq-codegen-3.6.0.xsd" multiple="true" node="//xs:complexType">
<annox:annotate>
<annox:annotate annox:class="java.lang.SuppressWarnings" value="all" />
</annox:annotate>