Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

It's Module Time #2453

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions cache/caffeine-cache/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module org.jdbi.v3.caffeine {

exports org.jdbi.v3.cache.caffeine;

requires transitive org.jdbi.v3.core;
requires transitive com.github.benmanes.caffeine;
}
6 changes: 6 additions & 0 deletions cache/noop-cache/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module org.jdbi.v3.cache.noop {

exports org.jdbi.v3.cache.noop;

requires transitive org.jdbi.v3.core;
}
7 changes: 7 additions & 0 deletions commons-text/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module org.jdbi.v3.commonstext {

exports org.jdbi.v3.commonstext;
exports org.jdbi.v3.commonstext.internal;
requires transitive org.apache.commons.text;
requires transitive org.jdbi.v3.core;
}
53 changes: 53 additions & 0 deletions core/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import org.jdbi.v3.core.spi.JdbiPlugin;

module org.jdbi.v3.core {

exports org.jdbi.v3.core;
exports org.jdbi.v3.core.annotation;
exports org.jdbi.v3.core.annotation.internal;
exports org.jdbi.v3.core.argument;
exports org.jdbi.v3.core.argument.internal;
exports org.jdbi.v3.core.argument.internal.strategies;
exports org.jdbi.v3.core.array;
exports org.jdbi.v3.core.async;
exports org.jdbi.v3.core.cache;
exports org.jdbi.v3.core.cache.internal;
exports org.jdbi.v3.core.codec;
exports org.jdbi.v3.core.collector;
exports org.jdbi.v3.core.config;
exports org.jdbi.v3.core.config.internal;
exports org.jdbi.v3.core.enums;
exports org.jdbi.v3.core.enums.internal;
exports org.jdbi.v3.core.extension;
exports org.jdbi.v3.core.extension.annotation;
exports org.jdbi.v3.core.generic;
exports org.jdbi.v3.core.h2;
exports org.jdbi.v3.core.interceptor;
exports org.jdbi.v3.core.internal;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we be exporting .internal packages?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just opened everything, you can change if you want

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless there's a reason to keep it, let's not export internal packages. All the rest I think are fine to export.

exports org.jdbi.v3.core.internal.exceptions;
exports org.jdbi.v3.core.locator;
exports org.jdbi.v3.core.locator.internal;
exports org.jdbi.v3.core.mapper;
exports org.jdbi.v3.core.mapper.freebuilder;
exports org.jdbi.v3.core.mapper.immutables;
exports org.jdbi.v3.core.mapper.reflect;
exports org.jdbi.v3.core.mapper.reflect.internal;
exports org.jdbi.v3.core.qualifier;
exports org.jdbi.v3.core.result;
exports org.jdbi.v3.core.result.internal;
exports org.jdbi.v3.core.spi;
exports org.jdbi.v3.core.statement;
exports org.jdbi.v3.core.statement.internal;
exports org.jdbi.v3.core.transaction;
exports org.jdbi.v3.meta;

requires transitive java.sql;
requires transitive com.google.errorprone.annotations;
requires transitive org.slf4j;
requires transitive com.github.spotbugs.annotations;
requires transitive io.leangen.geantyref;
requires transitive org.antlr.antlr4.runtime;
requires transitive java.desktop;

uses JdbiPlugin;
}
9 changes: 9 additions & 0 deletions freemarker/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module org.jdbi.v3.freemarker {

exports org.jdbi.v3.freemarker;
exports org.jdbi.v3.freemarker.internal;

requires transitive org.jdbi.v3.core;
requires transitive freemarker;
requires transitive org.jdbi.v3.sqlobject;
}
12 changes: 12 additions & 0 deletions generator/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module org.jdbi.v3.generator {

exports org.jdbi.v3.generator;
requires transitive java.compiler;
requires transitive com.squareup.javapoet;
requires transitive org.jdbi.v3.core;
requires transitive org.jdbi.v3.sqlobject;

provides javax.annotation.processing.Processor with org.jdbi.v3.generator.GenerateSqlObjectProcessor;


}
8 changes: 8 additions & 0 deletions gson2/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module org.jdbi.v3.gson2 {

exports org.jdbi.v3.gson2;
requires jdbi3.json;

requires transitive org.jdbi.v3.core;
requires transitive com.google.gson;
}
8 changes: 8 additions & 0 deletions guava/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module org.jdbi.v3.guava {

exports org.jdbi.v3.guava;
exports org.jdbi.v3.guava.codec;

requires transitive org.jdbi.v3.core;
requires transitive com.google.common;
}
11 changes: 11 additions & 0 deletions guice/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module org.jdbi.v3.guice {

exports org.jdbi.v3.guice;
exports org.jdbi.v3.guice.internal;

requires transitive org.jdbi.v3.core;
requires transitive com.google.guice;
requires transitive jakarta.inject;
requires transitive org.jdbi.v3.guava;
requires static javax.inject;
}
8 changes: 8 additions & 0 deletions jackson2/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module org.jdbi.v3.jackson2 {

exports org.jdbi.v3.jackson2;

requires transitive org.jdbi.v3.core;
requires transitive org.jdbi.v3.json;
requires transitive com.fasterxml.jackson.databind;
}
7 changes: 7 additions & 0 deletions jodatime2/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module org.jdbi.v3.jodatime2 {

exports org.jdbi.v3.jodatime2;

requires transitive org.jdbi.v3.core;
requires transitive org.joda.time;
}
9 changes: 9 additions & 0 deletions jpa/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module org.jdbi.v3.jpa {

exports org.jdbi.v3.jpa;
exports org.jdbi.v3.jpa.internal;

requires transitive org.jdbi.v3.core;
requires transitive org.jdbi.v3.sqlobject;
requires transitive persistence.api;
}
9 changes: 9 additions & 0 deletions json/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module org.jdbi.v3.json {

exports org.jdbi.v3.json;
exports org.jdbi.v3.json.internal;

requires transitive org.jdbi.v3.core;
requires transitive org.jdbi.v3.sqlobject;
requires transitive persistence.api;
}
9 changes: 9 additions & 0 deletions kotlin-sqlobject/src/main/kotlin/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module org.jdbi.v3.sqlobject.kotlin {

exports org.jdbi.v3.sqlobject.kotlin;
exports org.jdbi.v3.sqlobject.kotlin.internal;

requires transitive org.jdbi.v3.sqlobject;
requires transitive org.jdbi.v3.core;
requires transitive kotlin.reflect;
}
8 changes: 8 additions & 0 deletions kotlin/src/main/kotlin/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module org.jdbi.v3.kotlin {

exports org.jdbi.v3.core.kotlin;
exports org.jdbi.v3.core.kotlin.internal;

requires transitive org.jdbi.v3.core;
requires transitive kotlin.reflect;
}
9 changes: 9 additions & 0 deletions moshi/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module org.jdbi.v3.moshi {

exports org.jdbi.v3.moshi;

requires transitive org.jdbi.v3.core;
requires transitive org.jdbi.v3.json;
requires transitive com.squareup.moshi;
requires static okio;
}
7 changes: 7 additions & 0 deletions postgis/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module org.jdbi.v3.postgis {

exports org.jdbi.v3.postgis;

requires transitive org.jdbi.v3.core;
requires transitive org.locationtech.jts;
}
9 changes: 9 additions & 0 deletions postgres/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module org.jdbi.v3.postgres {

exports org.jdbi.v3.postgres;
exports org.jdbi.v3.postgres.internal;

requires transitive org.jdbi.v3.core;
requires transitive org.postgresql.jdbc;
requires transitive org.jdbi.v3.json;
}
7 changes: 7 additions & 0 deletions spring5/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module org.jdbi.v3.spring5 {

exports org.jdbi.v3.spring5;

requires transitive org.jdbi.v3.core;
requires transitive spring.beans;
}
6 changes: 6 additions & 0 deletions sqlite/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module org.jdbi.v3.sqlite {

exports org.jdbi.v3.sqlite3;

requires transitive org.jdbi.v3.core;
}
17 changes: 17 additions & 0 deletions sqlobject/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module org.jdbi.v3.sqlobject {

exports org.jdbi.v3.sqlobject;
exports org.jdbi.v3.sqlobject.config;
exports org.jdbi.v3.sqlobject.config.internal;
exports org.jdbi.v3.sqlobject.customizer;
exports org.jdbi.v3.sqlobject.customizer.internal;
exports org.jdbi.v3.sqlobject.internal;
exports org.jdbi.v3.sqlobject.locator;
exports org.jdbi.v3.sqlobject.locator.internal;
exports org.jdbi.v3.sqlobject.statement;
exports org.jdbi.v3.sqlobject.statement.internal;
exports org.jdbi.v3.sqlobject.transaction;
exports org.jdbi.v3.sqlobject.transaction.internal;

requires transitive org.jdbi.v3.core;
}
8 changes: 8 additions & 0 deletions stringtemplate4/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module org.jdbi.v3.stringtemplate4 {

exports org.jdbi.v3.stringtemplate4;

requires transitive org.jdbi.v3.core;
requires transitive ST4;
requires transitive org.jdbi.v3.sqlobject;
}
10 changes: 10 additions & 0 deletions testcontainers/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module org.jdbi.v3.testcontainers {

exports org.jdbi.v3.testing.junit5.tc;

requires transitive org.jdbi.v3.core;
requires transitive com.zaxxer.hikari;
requires transitive org.junit.jupiter.api;
requires transitive jdbc;
requires transitive org.jdbi.v3.testing;
}
16 changes: 16 additions & 0 deletions testing/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module org.jdbi.v3.testing {

exports org.jdbi.v3.testing;
exports org.jdbi.v3.testing.junit5;
exports org.jdbi.v3.testing.junit5.internal;

requires transitive org.jdbi.v3.core;
requires transitive org.junit.jupiter.api;
requires transitive junit;
requires static transitive org.xerial.sqlitejdbc;
requires static transitive otj.pg.embedded;
requires static transitive org.flywaydb.core;
requires static transitive com.h2database;
requires static transitive org.postgresql.jdbc;
requires static transitive de.softwareforge.testing.postgres;
}
7 changes: 7 additions & 0 deletions vavr/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module org.jdbi.v3.vavr {

exports org.jdbi.v3.vavr;

requires transitive org.jdbi.v3.core;
requires transitive io.vavr;
}