From 7370ac4779a6982a9cf90bc509daa56b234e1312 Mon Sep 17 00:00:00 2001 From: Ferdinand Swoboda Date: Sat, 16 Apr 2022 21:58:36 +0200 Subject: [PATCH 1/2] Add module descriptor --- src/main/java/module-info.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/main/java/module-info.java diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 0000000..6ebf525 --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,16 @@ +module folo { + requires java.compiler; + requires transitive org.jooq; + requires static jsr305; + requires static com.google.errorprone.annotations; + requires static org.immutables.value.annotations; + + exports io.github.ferdinandswoboda.folo; + + uses org.jooq.Field; + uses org.jooq.Record; + uses org.jooq.Table; + uses org.jooq.TableField; + uses org.jooq.ForeignKey; + uses org.jooq.UniqueKey; +} From a567635ffebef20ca0132531ec4734d7fab0f865 Mon Sep 17 00:00:00 2001 From: Ferdinand Swoboda Date: Tue, 7 Mar 2023 19:08:29 +0100 Subject: [PATCH 2/2] Clean up --- src/main/java/io/github/ferdinandswoboda/folo/IdPair.java | 4 +--- .../java/io/github/ferdinandswoboda/folo/ObjectMapping.java | 3 +-- src/main/java/module-info.java | 5 ++--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/github/ferdinandswoboda/folo/IdPair.java b/src/main/java/io/github/ferdinandswoboda/folo/IdPair.java index 1c0242a..037df7c 100644 --- a/src/main/java/io/github/ferdinandswoboda/folo/IdPair.java +++ b/src/main/java/io/github/ferdinandswoboda/folo/IdPair.java @@ -6,6 +6,4 @@ * @param leftId The left-hand ID of the relation. * @param rightId The right-hand ID of the relation. */ -// XXX: Workaround for https://github.com/google/error-prone/issues/2321 -@SuppressWarnings("InvalidParam") -record IdPair(long leftId, long rightId) {} +public record IdPair(long leftId, long rightId) {} diff --git a/src/main/java/io/github/ferdinandswoboda/folo/ObjectMapping.java b/src/main/java/io/github/ferdinandswoboda/folo/ObjectMapping.java index ba0c3d3..b22daf3 100644 --- a/src/main/java/io/github/ferdinandswoboda/folo/ObjectMapping.java +++ b/src/main/java/io/github/ferdinandswoboda/folo/ObjectMapping.java @@ -12,6 +12,5 @@ * @param toSuccessors A map of all {@link L} objects to their related {@link R} objects. * @param toPredecessors A reverse map of all {@link R} objects to their related {@link L} objects. */ -// XXX: Workaround for https://github.com/google/error-prone/issues/2321 -@SuppressWarnings({"ImmutableMemberCollection", "InvalidParam"}) +@SuppressWarnings("ImmutableMemberCollection") record ObjectMapping(Map> toSuccessors, Map> toPredecessors) {} diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 6ebf525..2721b31 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,9 +1,8 @@ -module folo { +module io.github.ferdinandswoboda.folo { requires java.compiler; requires transitive org.jooq; - requires static jsr305; requires static com.google.errorprone.annotations; - requires static org.immutables.value.annotations; + requires static org.jetbrains.annotations; exports io.github.ferdinandswoboda.folo;