Merge branch 'main' into auth_violation_reproduce_program

Author: scottf

build.gradle

@@ -15,7 +15,9 @@ plugins {
 
 def jarVersion = "2.21.3"
 
-def isRelease = System.getenv("BUILD_EVENT") == "release"
+def buildEvent = System.getenv("BUILD_EVENT")
+def isLocal = buildEvent == null
+def isRelease = buildEvent == "release"
 def brn = System.getenv("BRANCH_REF_NAME")
 def snap = brn == null || brn.equals("") ? "-SNAPSHOT" : "." + brn + "-SNAPSHOT"
 
@@ -37,6 +39,7 @@ repositories {
 
 dependencies {
     implementation 'org.bouncycastle:bcprov-lts8on:2.73.7'
+    implementation 'org.jetbrains:annotations:26.0.2'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
     testImplementation 'io.nats:jnats-server-runner:2.0.0'
@@ -81,10 +84,15 @@ test {
         events "started", "passed", "skipped", "failed"
         showStandardStreams = true
     }
-    retry {
-        failOnPassedAfterRetry = false
-        maxFailures = 5
-        maxRetries = 5
+    if (isLocal) {
+        failFast = true
+    }
+    else {
+        retry {
+            failOnPassedAfterRetry = false
+            maxFailures = 5
+            maxRetries = 5
+        }
     }
     maxParallelForks = Runtime.runtime.availableProcessors()
 }

src/examples/java/io/nats/examples/service/ServiceExample.java

@@ -18,6 +18,7 @@
 import io.nats.client.support.JsonValue;
 import io.nats.client.support.JsonValueUtils;
 import io.nats.service.*;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -233,11 +234,13 @@ public ExampleStatsData(String sData, int iData) {
         }
 
         @Override
+        @NotNull
         public String toJson() {
             return toJsonValue().toJson();
         }
 
         @Override
+        @NotNull
         public JsonValue toJsonValue() {
             Map<String, JsonValue> map = new HashMap<>();
             map.put("sdata", new JsonValue(sData));

src/main/java/io/nats/client/BaseConsumeOptions.java

@@ -17,6 +17,7 @@
 import io.nats.client.support.JsonParser;
 import io.nats.client.support.JsonSerializable;
 import io.nats.client.support.JsonValue;
+import org.jetbrains.annotations.NotNull;
 
 import static io.nats.client.support.ApiConstants.*;
 import static io.nats.client.support.JsonUtils.*;
@@ -72,6 +73,7 @@ protected BaseConsumeOptions(Builder<?, ?> b) {
     }
 
     @Override
+    @NotNull
     public String toJson() {
         StringBuilder sb = beginJson();
         addField(sb, MESSAGES, messages);

src/main/java/io/nats/client/NatsSystemClock.java

@@ -0,0 +1,30 @@
+// Copyright 2025 The NATS Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at:
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package io.nats.client;
+
+public class NatsSystemClock {
+    private static NatsSystemClockProvider PROVIDER = new NatsSystemClockProvider() {};
+
+    public static void setProvider(final NatsSystemClockProvider provider) {
+        PROVIDER = provider == null ? new NatsSystemClockProvider() {} : provider;
+    }
+
+    public static long currentTimeMillis() {
+        return PROVIDER.currentTimeMillis();
+    }
+
+    public static long nanoTime() {
+        return PROVIDER.nanoTime();
+    }
+}

src/main/java/io/nats/client/NatsSystemClockProvider.java

@@ -0,0 +1,19 @@
+// Copyright 2025 The NATS Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at:
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package io.nats.client;
+
+public interface NatsSystemClockProvider {
+    default long currentTimeMillis() { return System.currentTimeMillis(); }
+    default long nanoTime() { return System.nanoTime(); }
+}

src/main/java/io/nats/client/PullRequestOptions.java

@@ -15,6 +15,7 @@
 
 import io.nats.client.support.JsonSerializable;
 import io.nats.client.support.JsonUtils;
+import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
 
@@ -47,6 +48,7 @@ public PullRequestOptions(Builder b) {
     }
 
     @Override
+    @NotNull
     public String toJson() {
         StringBuilder sb = JsonUtils.beginJson();
         JsonUtils.addField(sb, BATCH, batchSize);

src/main/java/io/nats/client/PurgeOptions.java

@@ -15,6 +15,7 @@
 
 import io.nats.client.support.JsonSerializable;
 import io.nats.client.support.JsonUtils;
+import org.jetbrains.annotations.NotNull;
 
 import static io.nats.client.support.ApiConstants.*;
 import static io.nats.client.support.JsonUtils.beginJson;
@@ -37,6 +38,7 @@ private PurgeOptions(String subject, long seq, long keep) {
     }
 
     @Override
+    @NotNull
     public String toJson() {
         StringBuilder sb = beginJson();
         JsonUtils.addField(sb, FILTER, subject);

src/main/java/io/nats/client/api/AccountLimits.java

@@ -26,9 +26,9 @@ public class AccountLimits {
 
     private final long maxMemory;
     private final long maxStorage;
-    private final long maxStreams;
-    private final long maxConsumers;
-    private final long maxAckPending;
+    private final long maxStreams;     // should be an int
+    private final long maxConsumers;   // should be an int
+    private final long maxAckPending;  // should be an int
     private final long memoryMaxStreamBytes;
     private final long storageMaxStreamBytes;
     private final boolean maxBytesRequired;

src/main/java/io/nats/client/api/AccountStatistics.java

@@ -15,6 +15,8 @@
 
 import io.nats.client.Message;
 import io.nats.client.support.JsonValue;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,8 +28,7 @@
 /**
  * The JetStream Account Statistics
  */
-public class AccountStatistics
-        extends ApiResponse<AccountStatistics> {
+public class AccountStatistics extends ApiResponse<AccountStatistics> {
 
     private final AccountTier rollupTier;
     private final String domain;
@@ -111,9 +112,10 @@ public AccountLimits getLimits() {
     }
 
     /**
-     * Gets the account domain
+     * Gets the account domain. May be null
      * @return the domain
      */
+    @Nullable
     public String getDomain() {
         return domain;
     }
@@ -122,14 +124,16 @@ public String getDomain() {
      * Gets the account api stats
      * @return the ApiStats object
      */
+    @NotNull
     public ApiStats getApi() {
         return api;
     }
 
     /**
-     * Gets the map of the Account Tiers by tier name
+     * Gets the map of the Account Tiers by tier name. May be empty, but never null.
      * @return the map
      */
+    @NotNull
     public Map<String, AccountTier> getTiers() {
         return tiers;
     }

src/main/java/io/nats/client/api/AccountTier.java

@@ -14,6 +14,7 @@
 package io.nats.client.api;
 
 import io.nats.client.support.JsonValue;
+import org.jetbrains.annotations.NotNull;
 
 import static io.nats.client.support.ApiConstants.*;
 import static io.nats.client.support.JsonValueUtils.readInteger;
@@ -110,6 +111,7 @@ public int getConsumers() {
      * The limits of this tier.
      * @return the limits object
      */
+    @NotNull
     public AccountLimits getLimits() {
         return limits;
     }

src/main/java/io/nats/client/api/AckPolicy.java

@@ -13,6 +13,8 @@
 
 package io.nats.client.api;
 
+import org.jetbrains.annotations.Nullable;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -52,6 +54,7 @@ public String toString() {
         }
     }
 
+    @Nullable
     public static AckPolicy get(String value) {
         return strEnumHash.get(value);
     }

src/main/java/io/nats/client/api/ApiResponse.java

@@ -16,6 +16,7 @@
 import io.nats.client.JetStreamApiException;
 import io.nats.client.Message;
 import io.nats.client.support.*;
+import org.jetbrains.annotations.Nullable;
 
 import static io.nats.client.support.ApiConstants.ERROR;
 import static io.nats.client.support.ApiConstants.TYPE;
@@ -90,6 +91,7 @@ public T throwOnHasError() throws JetStreamApiException {
         return (T)this;
     }
 
+    @Nullable
     public JsonValue getJv() {
         return jv;
     }
@@ -98,6 +100,7 @@ public boolean hasError() {
         return error != null;
     }
 
+    @Nullable
     public String getType() {
         return type;
     }
@@ -110,14 +113,17 @@ public int getApiErrorCode() {
         return error == null ? Error.NOT_SET : error.getApiErrorCode();
     }
 
+    @Nullable
     public String getDescription() {
         return error == null ? null : error.getDescription();
     }
 
+    @Nullable
     public String getError() {
         return error == null ? null : error.toString();
     }
 
+    @Nullable
     public Error getErrorObject() {
         return error;
     }

src/main/java/io/nats/client/api/ClusterInfo.java

@@ -14,6 +14,7 @@
 package io.nats.client.api;
 
 import io.nats.client.support.JsonValue;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -39,14 +40,29 @@ static ClusterInfo optionalInstance(JsonValue v) {
         replicas = Replica.optionalListOf(readValue(v, REPLICAS));
     }
 
+    /**
+     * The cluster name. Technically can be null
+     * @return the cluster or null
+     */
+    @Nullable
     public String getName() {
         return name;
     }
 
+    /**
+     * The server name of the RAFT leader
+     * @return the leader or null
+     */
+    @Nullable
     public String getLeader() {
         return leader;
     }
 
+    /**
+     * The members of the RAFT cluster. May be null if there are no replicas.
+     * @return the replicas or null
+     */
+    @Nullable
     public List<Replica> getReplicas() {
         return replicas;
     }

src/main/java/io/nats/client/api/CompressionOption.java

@@ -13,6 +13,8 @@
 
 package io.nats.client.api;
 
+import org.jetbrains.annotations.Nullable;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -42,6 +44,7 @@ public String toString() {
         }
     }
 
+    @Nullable
     public static CompressionOption get(String value) {
         return strEnumHash.get(value);
     }