fix hidden method and remove experimental api (fixed test)

nats-io · Nov 10, 2021 · 39eae74 · 39eae74
1 parent 864914f
commit 39eae74
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/src/test/java/io/nats/client/impl/JetStreamPullTests.java b/src/test/java/io/nats/client/impl/JetStreamPullTests.java
@@ -564,24 +564,17 @@ public void testDurable() throws Exception {
             PullSubscribeOptions options1 = PullSubscribeOptions.builder().durable(DURABLE).build();
             _testDurable(js, () -> js.subscribe(SUBJECT, options1));
 
-            // no subject so stream and durable are required
-            PullSubscribeOptions options2 = PullSubscribeOptions.builder()
-                .stream(STREAM)
-                .durable(DURABLE)
-                .build();
-            _testDurable(js, () -> js.subscribe(null, options2));
-
             // bind long form
-            PullSubscribeOptions options3 = PullSubscribeOptions.builder()
+            PullSubscribeOptions options2 = PullSubscribeOptions.builder()
                 .stream(STREAM)
                 .durable(DURABLE)
                 .bind(true)
                 .build();
-            _testDurable(js, () -> js.subscribe(null, options3));
+            _testDurable(js, () -> js.subscribe(null, options2));
 
             // bind short form
-            PullSubscribeOptions options4 = PullSubscribeOptions.bind(STREAM, DURABLE);
-            _testDurable(js, () -> js.subscribe(null, options4));
+            PullSubscribeOptions options3 = PullSubscribeOptions.bind(STREAM, DURABLE);
+            _testDurable(js, () -> js.subscribe(null, options3));
         });
     }
 

diff --git a/src/test/java/io/nats/client/impl/JetStreamPushTests.java b/src/test/java/io/nats/client/impl/JetStreamPushTests.java
@@ -145,29 +145,20 @@ private void _testPushDurable(String deliverSubject) throws Exception {
             _testPushDurableSubSync(deliverSubject, nc, js, () -> js.subscribe(SUBJECT, options1));
             _testPushDurableSubAsync(js, dispatcher, (d, h) -> js.subscribe(SUBJECT, d, h, false, options1));
 
-            // no subject so stream and durable are required
+            // bind long form
             PushSubscribeOptions options2 = PushSubscribeOptions.builder()
                 .stream(STREAM)
                 .durable(DURABLE)
+                .bind(true)
                 .deliverSubject(deliverSubject)
                 .build();
             _testPushDurableSubSync(deliverSubject, nc, js, () -> js.subscribe(null, options2));
             _testPushDurableSubAsync(js, dispatcher, (d, h) -> js.subscribe(null, d, h, false, options2));
 
-            // bind long form
-            PushSubscribeOptions options3 = PushSubscribeOptions.builder()
-                .stream(STREAM)
-                .durable(DURABLE)
-                .bind(true)
-                .deliverSubject(deliverSubject)
-                .build();
+            // bind short form
+            PushSubscribeOptions options3 = PushSubscribeOptions.bind(STREAM, DURABLE);
             _testPushDurableSubSync(deliverSubject, nc, js, () -> js.subscribe(null, options3));
             _testPushDurableSubAsync(js, dispatcher, (d, h) -> js.subscribe(null, d, h, false, options3));
-
-            // bind short form
-            PushSubscribeOptions options4 = PushSubscribeOptions.bind(STREAM, DURABLE);
-            _testPushDurableSubSync(deliverSubject, nc, js, () -> js.subscribe(null, options4));
-            _testPushDurableSubAsync(js, dispatcher, (d, h) -> js.subscribe(null, d, h, false, options4));
         });
     }