Fix use of JsOptions timeout (#953)

nats-io · Aug 16, 2023 · 154bcff · 154bcff
1 parent 04ac649
commit 154bcff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/main/java/io/nats/client/JetStreamOptions.java b/src/main/java/io/nats/client/JetStreamOptions.java
@@ -26,7 +26,9 @@
  */
 public class JetStreamOptions {
 
+    @Deprecated
     public static final Duration DEFAULT_TIMEOUT = Options.DEFAULT_CONNECTION_TIMEOUT;
+
     public static final JetStreamOptions DEFAULT_JS_OPTIONS = new Builder().build();
 
     private final String jsPrefix;
@@ -75,7 +77,7 @@ public boolean isDefaultPrefix() {
     }
 
     /**
-     * Gets the whether the publish no ack flag was set
+     * Gets whether the publish no ack flag was set
      * @return the flag
      */
     public boolean isPublishNoAck() {
@@ -203,7 +205,6 @@ public Builder optOut290ConsumerCreate(boolean optOut) {
          * @return JetStream options
          */
         public JetStreamOptions build() {
-            this.requestTimeout = requestTimeout == null ? DEFAULT_TIMEOUT : requestTimeout;
             return new JetStreamOptions(this);
         }
     }

diff --git a/src/main/java/io/nats/client/impl/NatsJetStreamImpl.java b/src/main/java/io/nats/client/impl/NatsJetStreamImpl.java
@@ -50,7 +50,14 @@ public CachedStreamInfo(StreamInfo si) {
     // ----------------------------------------------------------------------------------------------------
     NatsJetStreamImpl(NatsConnection connection, JetStreamOptions jsOptions) throws IOException {
         conn = connection;
-        jso = JetStreamOptions.builder(jsOptions).build(); // builder handles null
+
+        // Get a working version of JetStream Options...
+        // Clone the input jsOptions (JetStreamOptions.builder(...) handles null.
+        // If jsOptions is not supplied or the jsOptions request timeout
+        // was not set, use the connection options connect timeout.
+        Duration rt = jsOptions == null || jsOptions.getRequestTimeout() == null ? conn.getOptions().getConnectionTimeout() : jsOptions.getRequestTimeout();
+        jso = JetStreamOptions.builder(jsOptions).requestTimeout(rt).build();
+
         consumerCreate290Available = conn.getInfo().isSameOrNewerThanVersion("2.9.0") && !jso.isOptOut290ConsumerCreate();
     }
 
@@ -93,7 +100,7 @@ else if (durable == null) {
         }
 
         ConsumerCreateRequest ccr = new ConsumerCreateRequest(streamName, config);
-        Message resp = makeRequestResponseRequired(subj, ccr.serialize(), conn.getOptions().getConnectionTimeout());
+        Message resp = makeRequestResponseRequired(subj, ccr.serialize(), jso.getRequestTimeout());
         return new ConsumerInfo(resp).throwOnHasError();
     }
 

diff --git a/src/test/java/io/nats/client/JetStreamOptionsTests.java b/src/test/java/io/nats/client/JetStreamOptionsTests.java
@@ -28,15 +28,15 @@ public class JetStreamOptionsTests extends TestBase {
     public void testBuilder() {
         // default
         JetStreamOptions jso = JetStreamOptions.defaultOptions();
-        assertEquals(Options.DEFAULT_CONNECTION_TIMEOUT, jso.getRequestTimeout());
+        assertNull(jso.getRequestTimeout());
         assertEquals(DEFAULT_API_PREFIX, jso.getPrefix());
         assertTrue(jso.isDefaultPrefix());
         assertFalse(jso.isPublishNoAck());
         assertFalse(jso.isOptOut290ConsumerCreate());
 
         // default copy
         jso = JetStreamOptions.builder(jso).build();
-        assertEquals(Options.DEFAULT_CONNECTION_TIMEOUT, jso.getRequestTimeout());
+        assertNull(jso.getRequestTimeout());
         assertEquals(DEFAULT_API_PREFIX, jso.getPrefix());
         assertTrue(jso.isDefaultPrefix());
         assertFalse(jso.isPublishNoAck());
@@ -69,15 +69,15 @@ public void testBuilder() {
             .publishNoAck(false)
             .optOut290ConsumerCreate(false)
             .build();
-        assertEquals(Options.DEFAULT_CONNECTION_TIMEOUT, jso.getRequestTimeout());
+        assertNull(jso.getRequestTimeout());
         assertEquals("pre.", jso.getPrefix());
         assertFalse(jso.isDefaultPrefix());
         assertFalse(jso.isPublishNoAck());
         assertFalse(jso.isOptOut290ConsumerCreate());
 
         // variations / coverage copy
         jso = JetStreamOptions.builder(jso).build();
-        assertEquals(Options.DEFAULT_CONNECTION_TIMEOUT, jso.getRequestTimeout());
+        assertNull(jso.getRequestTimeout());
         assertEquals("pre.", jso.getPrefix());
         assertFalse(jso.isDefaultPrefix());
         assertFalse(jso.isPublishNoAck());