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

[#6772] [#6955] Add a <jpaVersion/> code generator configuration

Browse Source
This commit is contained in:
lukaseder 2017-12-29 13:04:23 +01:00
parent bbd5e69396
commit 445e9d735f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ abstract class AbstractGenerator implements Generator {
boolean generateImmutableInterfaces = false;
boolean generateDaos = false;
boolean generateJPAAnnotations = false;
String generateJpaVersion = "";
String generateJPAVersion = "";
boolean generateValidationAnnotations = false;
boolean generateSpringAnnotations = false;
boolean generateQueues = true;
@ -397,13 +397,13 @@ abstract class AbstractGenerator implements Generator {
}
@Override
public String generateJpaVersion() {
return generateJpaVersion;
public String generateJPAVersion() {
return generateJPAVersion;
}
@Override
public void setGenerateJpaVersion(String generateJpaVersion) {
this.generateJpaVersion = generateJpaVersion;
public void setGenerateJPAVersion(String generateJPAVersion) {
this.generateJPAVersion = generateJPAVersion;
}
@Override

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

@ -262,12 +262,12 @@ public interface Generator {
/**
* The minimum JPA version that is supported by generated code (latest version if empty).
*/
String generateJpaVersion();
String generateJPAVersion();
/**
* The minimum JPA version that is supported by generated code (latest version if empty).
*/
void setGenerateJpaVersion(String generateJpaVersion);
void setGenerateJPAVersion(String generateJPAVersion);
/**
* Whether POJO's and records should be annotated with JSR-303 validation

4
jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
View File

@ -278,7 +278,7 @@ public class JavaGenerator extends AbstractGenerator {
+ ((!generateGeneratedAnnotation && (useSchemaVersionProvider || useCatalogVersionProvider)) ?
" (forced to true because of <schemaVersionProvider/> or <catalogVersionProvider/>)" : ""));
log.info(" JPA annotations", generateJPAAnnotations());
log.info(" JPA version", generateJpaVersion());
log.info(" JPA version", generateJPAVersion());
log.info(" validation annotations", generateValidationAnnotations());
log.info(" instance fields", generateInstanceFields());
log.info(" sequences", generateSequences());
@ -4445,7 +4445,7 @@ public class JavaGenerator extends AbstractGenerator {
out.print(scala ? ")" : "}");
}
if (StringUtils.isBlank(generateJpaVersion()) || "2.1".compareTo(generateJpaVersion()) <= 0) {
if (StringUtils.isBlank(generateJPAVersion()) || "2.1".compareTo(generateJPAVersion()) <= 0) {
StringBuilder sb2 = new StringBuilder();
String glue2 = "\n";