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

[jOOQ/jOOQ#10149] Modularise more modules

Browse Source 
- jOOQ-codegen
- jOOQ-meta
- jOOQ-postgres-extensions
This commit is contained in:
Lukas Eder 2021-10-15 09:55:21 +02:00
parent 1037e72e1a
commit 8c15e0c97f
5 changed files with 84 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jOOQ-codegen/src/main/java/module-info.java Normal file
View File

@ -0,0 +1,14 @@
/**
* The jOOQ codegen module.
*/
module org.jooq.codegen {
// Other jOOQ modules
requires transitive org.jooq.meta;
// JAXB is used optionally for loading a variety of XML content, including
// - Settings (org.jooq.conf)
// - InformationSchema (org.jooq.util.xml.jaxb)
requires static java.xml.bind;
}

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

@ -56,7 +56,6 @@ import static org.jooq.impl.DSL.name;
import static org.jooq.meta.AbstractTypedElementDefinition.getDataType;
import static org.jooq.tools.StringUtils.isBlank;
import java.beans.ConstructorProperties;
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
@ -2075,7 +2074,7 @@ public class JavaGenerator extends AbstractGenerator {
}
else {
if (generateConstructorPropertiesAnnotationOnRecords())
out.println("@%s({ [[%s]] })", ConstructorProperties.class, properties);
out.println("@%s({ [[%s]] })", out.ref("java.beans.ConstructorProperties"), properties);
if (pojoArgument)
out.println("%s%s(%s value) {", visibility(), className, out.ref(pojoNameFull));
@ -4664,7 +4663,7 @@ public class JavaGenerator extends AbstractGenerator {
out.println();
if (generateConstructorPropertiesAnnotationOnPojos())
out.println("@%s({ [[%s]] })", ConstructorProperties.class, properties);
out.println("@%s({ [[%s]] })", out.ref("java.beans.ConstructorProperties"), properties);
out.print("%s%s(", visibility(), className);

52
jOOQ-meta/src/main/java/module-info.java Normal file
View File

@ -0,0 +1,52 @@
/**
* The jOOQ meta module.
*/
module org.jooq.meta {
// Other jOOQ modules
requires transitive org.jooq;
// JAXB is used optionally for loading a variety of XML content, including
// - Settings (org.jooq.conf)
// - InformationSchema (org.jooq.util.xml.jaxb)
requires static java.xml.bind;
exports org.jooq.meta;
exports org.jooq.meta.cubrid;
exports org.jooq.meta.derby;
exports org.jooq.meta.firebird;
exports org.jooq.meta.h2;
exports org.jooq.meta.hsqldb;
exports org.jooq.meta.ignite;
exports org.jooq.meta.jaxb;
exports org.jooq.meta.jdbc;
exports org.jooq.meta.mariadb;
exports org.jooq.meta.mysql;
exports org.jooq.meta.postgres;
exports org.jooq.meta.sqlite;
exports org.jooq.meta.xml;
exports org.jooq.meta.yugabyte;
}

15
jOOQ-postgres-extensions/src/main/java/module-info.java Normal file
View File

@ -0,0 +1,15 @@
/**
* The jOOQ postgres extensions module.
*/
module org.jooq.codegen {
// Other jOOQ modules
requires transitive org.jooq;
// Nullability annotations for better Kotlin interop
requires static org.jetbrains.annotations;
// Vendor specific JDBC drivers
requires static org.postgresql.jdbc;
}

2
jOOQ/src/main/java/module-info.java
View File

@ -38,7 +38,7 @@ module org.jooq {
requires transitive org.reactivestreams;
requires transitive r2dbc.spi;
// [#11738] optional vendor specific JDBC drivers