From 3b069c12ca39f65521628e7b4299d72883205fca Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Tue, 30 Sep 2025 09:36:55 +0200 Subject: [PATCH] upgrade caffeine to remove unsafe access method --- build.gradle | 2 +- .../java/com/sparrowwallet/drongo/dns/DnsPaymentCache.java | 7 +++---- src/main/java/module-info.java | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 74a7f87..cf35b8a 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ dependencies { exclude group: 'net.java.dev.jna', module: 'jna' } implementation('dnsjava:dnsjava:3.6.3') - implementation('com.github.ben-manes.caffeine:caffeine:3.0.1') + implementation('com.github.ben-manes.caffeine:caffeine:3.2.2') implementation ('net.java.dev.jna:jna:5.16.0') implementation ('ch.qos.logback:logback-classic:1.5.18') { exclude group: 'org.slf4j' diff --git a/src/main/java/com/sparrowwallet/drongo/dns/DnsPaymentCache.java b/src/main/java/com/sparrowwallet/drongo/dns/DnsPaymentCache.java index ff69894..82ab6d1 100644 --- a/src/main/java/com/sparrowwallet/drongo/dns/DnsPaymentCache.java +++ b/src/main/java/com/sparrowwallet/drongo/dns/DnsPaymentCache.java @@ -7,8 +7,7 @@ import com.sparrowwallet.drongo.address.Address; import com.sparrowwallet.drongo.silentpayments.SilentPayment; import com.sparrowwallet.drongo.silentpayments.SilentPaymentAddress; import com.sparrowwallet.drongo.wallet.Payment; -import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.NonNull; +import org.jspecify.annotations.NonNull; import java.util.concurrent.TimeUnit; @@ -23,12 +22,12 @@ public class DnsPaymentCache { } @Override - public long expireAfterUpdate(@NonNull DnsAddress address, @NonNull DnsPayment dnsPayment, long currentTime, @NonNegative long currentDuration) { + public long expireAfterUpdate(@NonNull DnsAddress address, @NonNull DnsPayment dnsPayment, long currentTime, long currentDuration) { return expireAfterCreate(address, dnsPayment, currentTime); } @Override - public long expireAfterRead(@NonNull DnsAddress address, @NonNull DnsPayment dnsPayment, long currentTime, @NonNegative long currentDuration) { + public long expireAfterRead(@NonNull DnsAddress address, @NonNull DnsPayment dnsPayment, long currentTime, long currentDuration) { return currentDuration; } }).build(); diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 1fabb6c..e10a38d 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -8,7 +8,7 @@ open module com.sparrowwallet.drongo { requires ch.qos.logback.classic; requires org.dnsjava; requires com.github.benmanes.caffeine; - requires org.checkerframework.checker.qual; + requires org.jspecify; exports com.sparrowwallet.drongo; exports com.sparrowwallet.drongo.psbt; exports com.sparrowwallet.drongo.protocol;