remove debug

Author: scottf

src/main/java/io/nats/client/impl/NatsJetStreamSubscription.java

@@ -151,22 +151,10 @@ protected Message _nextUnmanagedNoWait(String expectedPullSubject) throws Interr
         }
     }
 
-    public static boolean INTERNAL_DEBUG__nextUnmanaged = false;
-
     protected Message _nextUnmanaged(long timeoutNanos, String expectedPullSubject) throws InterruptedException {
-        if (INTERNAL_DEBUG__nextUnmanaged) {
-            System.out.println("_nextUnmanaged | "
-                + "timeoutNanos: " + timeoutNanos + "ns |"
-            );
-        }
         long timeLeftNanos = timeoutNanos;
         long start = NatsSystemClock.nanoTime();
         while (timeLeftNanos > 0) {
-            if (INTERNAL_DEBUG__nextUnmanaged) {
-                System.out.println("_nextUnmanaged | "
-                    + "timeLeftNanos: " + timeLeftNanos + "ns |"
-                );
-            }
             Message msg = nextMessageInternal( Duration.ofNanos(timeLeftNanos) );
             if (msg == null) {
                 return null; // normal timeout

src/test/java/io/nats/client/impl/KeyValueTests.java

@@ -1847,9 +1847,9 @@ public void testLimitMarker() throws Exception {
     public void testLimitMarkerAlso() throws Exception {
         jsServer.run(TestBase::atLeast2_11_2, nc -> {
             String bucket = bucket();
-            String key1 = "k1"; //key();
-            String key2 = "k2"; //key();
-            String key3 = "k3"; //key();
+            String key1 = key();
+            String key2 = key();
+            String key3 = key();
 
             KeyValueManagement kvm = nc.keyValueManagement();
             KeyValueConfiguration config = KeyValueConfiguration.builder()
@@ -1918,8 +1918,13 @@ public void endOfData() {
                     }
                 }
             };
+
             JetStreamSubscription sub = nc.jetStream().subscribe(null, d, rawHandler, true,
-                PushSubscribeOptions.builder().stream("KV_" + bucket).configuration(ConsumerConfiguration.builder().filterSubject(">").build()).build());
+                PushSubscribeOptions.builder()
+                    .stream("KV_" + bucket)
+                    .configuration(ConsumerConfiguration.builder().filterSubject(">")
+                        .build())
+                    .build());
 
             kv.create(key1, dataBytes(), MessageTtl.seconds(2));
             kv.create(key2, dataBytes());
@@ -1932,25 +1937,25 @@ public void endOfData() {
             kv.purge(key2, MessageTtl.seconds(2));
             kv.purge(key3);
 
-            if (before2_11_6()) {
-                sleep(8000); // longer than the message ttl plus the limit marker since double purge plus some extra
-
-                assertNull(kv.get(key1));
-                assertNull(kv.get(key2));
-                assertNull(kv.get(key3));
-
-                // create and put
-                assertEquals(3, wPuts.get());
-                assertEquals(4, wPurges.get()); // the 2 message ttl purge markers, the manual purge and the manual purge's purge.
-                assertEquals(0, wDels.get());
-                assertEquals(1, wEod.get());
-
-                assertEquals(7, rMessages.get());
-                assertEquals(2, rPurges.get());
-                assertEquals(2, rMaxAges.get());
-                assertEquals(2, rTtl2.get());
-                assertEquals(2, rTtl5.get());
-            }
+            // This section will have to be modified if there are changes
+            // to how purge markers are handled (double purge on ttl purge, fix for no purge of non-ttl purge)
+            sleep(8000); // longer than the message ttl plus the limit marker since double purge plus some extra
+
+            assertNull(kv.get(key1));
+            assertNull(kv.get(key2));
+            assertNull(kv.get(key3));
+
+            // create and put
+            assertEquals(3, wPuts.get());
+            assertEquals(4, wPurges.get()); // the 2 message ttl purge markers, the manual purge and the manual purge's purge.
+            assertEquals(0, wDels.get());
+            assertEquals(1, wEod.get());
+
+            assertEquals(7, rMessages.get());
+            assertEquals(2, rPurges.get());
+            assertEquals(2, rMaxAges.get());
+            assertEquals(2, rTtl2.get());
+            assertEquals(2, rTtl5.get());
         });
     }
 }

src/test/java/io/nats/client/impl/SimplificationTests.java

@@ -935,9 +935,6 @@ private static void _testOrderedFetch(StreamContext sctx, int expectedStreamSeq,
 
     @Test
     public void testOrderedBehaviorIterable() throws Exception {
-        NatsJetStreamSubscription.INTERNAL_DEBUG__nextUnmanaged = true;
-        System.out.println("testOrderedBehaviorIterable IN");
-
         jsServer.run(TestBase::atLeast2_9_1, nc -> {
             // Setup
             JetStream js = nc.jetStream();
@@ -974,17 +971,9 @@ public void testOrderedBehaviorIterable() throws Exception {
                 .consumerNamePrefix(prefix())
                 .deliverPolicy(DeliverPolicy.ByStartSequence).startSequence(2));
         });
-        System.out.println("testOrderedBehaviorIterable OUT");
-        NatsJetStreamSubscription.INTERNAL_DEBUG__nextUnmanaged = false;
     }
 
     private static void _testOrderedIterate(StreamContext sctx, int expectedStreamSeq, OrderedConsumerConfiguration occ) throws Exception {
-        System.out.println("_testOrderedIterate | "
-                + "CS_FOR_SS_3: " + CS_FOR_SS_3 + " | "
-                + "seq: " + expectedStreamSeq + " | "
-                + "prefix: " + occ.getConsumerNamePrefix() + " | "
-                + "occ: " + occ.toJson()
-            );
         OrderedConsumerContext occtx = sctx.createOrderedConsumer(occ);
         try (IterableConsumer icon = occtx.iterate()) {
             if (occ.getConsumerNamePrefix() != null) {

src/test/java/io/nats/client/utils/TestBase.java

@@ -165,14 +165,6 @@ public static boolean atLeast2_11_2(ServerInfo si) {
         return si.isSameOrNewerThanVersion("2.11.2");
     }
 
-    public static boolean before2_11_6() {
-        return before2_11_6(RUN_SERVER_INFO);
-    }
-
-    public static boolean before2_11_6(ServerInfo si) {
-        return si.isOlderThanVersion("2.11.6");
-    }
-
     public static void runInServer(InServerTest inServerTest) throws Exception {
         runInServer(false, false, null, null, inServerTest);
     }