Add JSpecify nullability annotations to Java APIs.

[resolves #689]

Author: mp911de

pom.xml

@@ -36,7 +36,7 @@
         <awaitility.version>4.3.0</awaitility.version>
         <hikari-cp.version>4.0.3</hikari-cp.version>
         <java.version>1.8</java.version>
-        <jsr305.version>3.0.2</jsr305.version>
+        <jspecify.version>1.0.0</jspecify.version>
         <junit.version>6.0.0</junit.version>
         <jmh.version>1.37</jmh.version>
         <mbr.version>1.0.0</mbr.version>
@@ -156,9 +156,9 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>${jsr305.version}</version>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+            <version>${jspecify.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/io/r2dbc/postgresql/BoundedStatementCache.java

@@ -20,9 +20,9 @@
 import io.r2dbc.postgresql.client.Client;
 import io.r2dbc.postgresql.client.ExtendedQueryMessageFlow;
 import io.r2dbc.postgresql.util.Assert;
+import org.jspecify.annotations.Nullable;
 import reactor.util.Logger;
 import reactor.util.Loggers;
-import reactor.util.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -141,8 +141,7 @@ Collection<String> getCachedStatementNames() {
      * @see CacheKey
      * @return statement name by key
      */
-    @Nullable
-    private String get(CacheKey key) {
+    private @Nullable String get(CacheKey key) {
         synchronized (this.cache) {
             return this.cache.get(key);
         }

src/main/java/io/r2dbc/postgresql/EscapeAwareColumnMatcher.java

@@ -16,7 +16,7 @@
 
 package io.r2dbc.postgresql;
 
-import reactor.util.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collection;
 
@@ -26,8 +26,7 @@
  */
 final class EscapeAwareColumnMatcher {
 
-    @Nullable
-    public static String findColumn(String name, Collection<String> names) {
+    public static @Nullable String findColumn(String name, Collection<String> names) {
 
         for (String s : names) {
             if (matches(name, s)) {

src/main/java/io/r2dbc/postgresql/ExceptionFactory.java

@@ -27,8 +27,8 @@
 import io.r2dbc.spi.R2dbcPermissionDeniedException;
 import io.r2dbc.spi.R2dbcRollbackException;
 import io.r2dbc.spi.R2dbcTransientException;
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.SynchronousSink;
-import reactor.util.annotation.Nullable;
 
 /**
  * Factory for Postgres-specific {@link R2dbcException}s.

src/main/java/io/r2dbc/postgresql/ExtendedFlowDelegate.java

@@ -44,10 +44,10 @@
 import io.r2dbc.postgresql.message.frontend.Parse;
 import io.r2dbc.postgresql.message.frontend.Sync;
 import io.r2dbc.postgresql.util.Operators;
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Sinks;
 import reactor.core.publisher.SynchronousSink;
-import reactor.util.annotation.Nullable;
 import reactor.util.concurrent.Queues;
 
 import java.util.ArrayList;
@@ -313,8 +313,7 @@ static class ExtendedFlowOperator extends AtomicInteger implements Predicate<Bac
 
         private final Binding binding;
 
-        @Nullable
-        private volatile String name;
+        private volatile @Nullable String name;
 
         private final StatementCache cache;
 

src/main/java/io/r2dbc/postgresql/MultiHostConnectionStrategy.java

@@ -22,10 +22,10 @@
 import io.r2dbc.postgresql.codec.DefaultCodecs;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.spi.IsolationLevel;
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import javax.annotation.Nullable;
 import java.net.SocketAddress;
 import java.time.Clock;
 import java.time.Instant;

src/main/java/io/r2dbc/postgresql/PostgresqlConnection.java

@@ -41,6 +41,7 @@
 import io.r2dbc.spi.TransactionDefinition;
 import io.r2dbc.spi.ValidationDepth;
 import io.r2dbc.spi.Wrapped;
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscription;
 import reactor.core.CoreSubscriber;
@@ -52,7 +53,6 @@
 import reactor.core.scheduler.Scheduler;
 import reactor.util.Logger;
 import reactor.util.Loggers;
-import reactor.util.annotation.Nullable;
 
 import java.time.Duration;
 import java.util.concurrent.atomic.AtomicReference;
@@ -509,8 +509,7 @@ static class NotificationAdapter {
 
         private final Sinks.Many<Notification> sink = Sinks.many().multicast().directBestEffort();
 
-        @Nullable
-        private volatile Disposable subscription = null;
+        private volatile @Nullable Disposable subscription = null;
 
         void dispose() {
             Disposable subscription = this.subscription;

src/main/java/io/r2dbc/postgresql/PostgresqlConnectionConfiguration.java

@@ -37,10 +37,10 @@
 import io.r2dbc.postgresql.message.backend.NoticeResponse;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.LogLevel;
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Mono;
 import reactor.netty.resources.LoopResources;
-import reactor.util.annotation.Nullable;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SNIHostName;
@@ -86,8 +86,7 @@ public final class PostgresqlConnectionConfiguration {
 
     private final boolean compatibilityMode;
 
-    @Nullable
-    private final Duration connectTimeout;
+    private final @Nullable Duration connectTimeout;
 
     private final String database;
 
@@ -99,31 +98,25 @@ public final class PostgresqlConnectionConfiguration {
 
     private final boolean forceBinary;
 
-    @Nullable
-    private final Duration lockWaitTimeout;
+    private final @Nullable Duration lockWaitTimeout;
 
-    @Nullable
-    private final LoopResources loopResources;
+    private final @Nullable LoopResources loopResources;
 
-    @Nullable
-    private final MultiHostConfiguration multiHostConfiguration;
+    private final @Nullable MultiHostConfiguration multiHostConfiguration;
 
     private final LogLevel noticeLogLevel;
 
     private final Map<String, String> options;
 
-    @Nullable
-    private final Publisher<CharSequence> password;
+    private final @Nullable Publisher<CharSequence> password;
 
     private final boolean preferAttachedBuffers;
 
     private final int preparedStatementCacheQueries;
 
-    @Nullable
-    private final SingleHostConfiguration singleHostConfiguration;
+    private final @Nullable SingleHostConfiguration singleHostConfiguration;
 
-    @Nullable
-    private final Duration statementTimeout;
+    private final @Nullable Duration statementTimeout;
 
     private final SSLConfig sslConfig;
 
@@ -135,7 +128,7 @@ public final class PostgresqlConnectionConfiguration {
 
     private final Publisher<String> username;
 
-    private PostgresqlConnectionConfiguration(String applicationName, boolean autodetectExtensions, @Nullable boolean compatibilityMode, @Nullable Duration connectTimeout, @Nullable String database
+    private PostgresqlConnectionConfiguration(String applicationName, boolean autodetectExtensions, boolean compatibilityMode, @Nullable Duration connectTimeout, @Nullable String database
         , LogLevel errorResponseLogLevel, List<Extension> extensions, ToIntFunction<String> fetchSize, boolean forceBinary, @Nullable Duration lockWaitTimeout,
                                               @Nullable LoopResources loopResources, @Nullable MultiHostConfiguration multiHostConfiguration, LogLevel noticeLogLevel,
                                               @Nullable Map<String, String> options, @Nullable Publisher<CharSequence> password, boolean preferAttachedBuffers, int preparedStatementCacheQueries,
@@ -230,7 +223,6 @@ Duration getConnectTimeout() {
         return this.connectTimeout;
     }
 
-    @Nullable
     String getDatabase() {
         return this.database;
     }
@@ -360,11 +352,9 @@ public static final class Builder {
 
         private boolean compatibilityMode = false;
 
-        @Nullable
-        private Duration connectTimeout;
+        private @Nullable Duration connectTimeout;
 
-        @Nullable
-        private String database;
+        private @Nullable String database;
 
         private LogLevel errorResponseLogLevel = LogLevel.DEBUG;
 
@@ -374,49 +364,39 @@ public static final class Builder {
 
         private boolean forceBinary = false;
 
-        @Nullable
-        private Duration lockWaitTimeout;
+        private @Nullable Duration lockWaitTimeout;
 
-        @Nullable
-        private MultiHostConfiguration.Builder multiHostConfiguration;
+        private MultiHostConfiguration.@Nullable Builder multiHostConfiguration;
 
         private LogLevel noticeLogLevel = LogLevel.DEBUG;
 
-        private Map<String, String> options;
+        private @Nullable Map<String, String> options;
 
-        @Nullable
-        private Publisher<CharSequence> password;
+        private @Nullable Publisher<CharSequence> password;
 
         private boolean preferAttachedBuffers = false;
 
         private int preparedStatementCacheQueries = -1;
 
-        @Nullable
-        private String schema;
+        private @Nullable String schema;
 
-        @Nullable
-        private SingleHostConfiguration.Builder singleHostConfiguration;
+        private SingleHostConfiguration.@Nullable Builder singleHostConfiguration;
 
-        @Nullable
-        private URL sslCert = null;
+        private @Nullable URL sslCert = null;
 
         private HostnameVerifier sslHostnameVerifier = DefaultHostnameVerifier.INSTANCE;
 
-        @Nullable
-        private URL sslKey = null;
+        private @Nullable URL sslKey = null;
 
         private SSLMode sslMode = SSLMode.DISABLE;
 
         private SSLNegotiation sslNegotiation = SSLNegotiation.POSTGRES;
 
-        @Nullable
-        private CharSequence sslPassword = null;
+        private @Nullable CharSequence sslPassword = null;
 
-        @Nullable
-        private URL sslRootCert = null;
+        private @Nullable URL sslRootCert = null;
 
-        @Nullable
-        private Duration statementTimeout = null;
+        private @Nullable Duration statementTimeout = null;
 
         private Function<SslContextBuilder, SslContextBuilder> sslContextBuilderCustomizer = Function.identity();
 
@@ -432,11 +412,9 @@ public static final class Builder {
 
         private TimeZone timeZone = TimeZone.getDefault();
 
-        @Nullable
-        private LoopResources loopResources = null;
+        private @Nullable LoopResources loopResources = null;
 
-        @Nullable
-        private Publisher<String> username;
+        private @Nullable Publisher<String> username;
 
         private Builder() {
         }

src/main/java/io/r2dbc/postgresql/PostgresqlConnectionFactory.java

@@ -31,10 +31,10 @@
 import io.r2dbc.spi.IsolationLevel;
 import io.r2dbc.spi.R2dbcException;
 import io.r2dbc.spi.R2dbcNonTransientResourceException;
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.util.annotation.Nullable;
 
 import java.time.ZoneId;
 import java.util.ArrayList;

src/main/java/io/r2dbc/postgresql/PostgresqlCopyIn.java

@@ -31,11 +31,11 @@
 import io.r2dbc.postgresql.message.frontend.Query;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.Operators;
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Sinks;
-import reactor.util.annotation.Nullable;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -140,8 +140,7 @@ static final class Builder implements CopyInBuilder {
 
         private final String sql;
 
-        @Nullable
-        private Publisher<? extends Publisher<ByteBuf>> stdin;
+        private @Nullable Publisher<? extends Publisher<ByteBuf>> stdin;
 
         Builder(ConnectionResources resources, String sql) {
             this.resources = resources;