rename ackSet to unconfirmedSet

Author: Alexandru Scvortov

test/src/com/rabbitmq/client/test/functional/Confirm.java

@@ -35,12 +35,13 @@ public class Confirm extends BrokerTestCase
 {
     final static int NUM_MESSAGES = 1000;
     private static final String TTL_ARG = "x-message-ttl";
-    private SortedSet<Long> ackSet;
+    private SortedSet<Long> unconfirmedSet;
 
     @Override
     protected void setUp() throws IOException {
         super.setUp();
-        ackSet = Collections.synchronizedSortedSet(new TreeSet<Long>());
+        unconfirmedSet =
+            Collections.synchronizedSortedSet(new TreeSet<Long>());
         channel.setConfirmListener(new ConfirmListener() {
                 public void handleAck(long seqNo, boolean multiple) {
                     Confirm.this.handleAck(seqNo, multiple);
@@ -239,7 +240,7 @@ private void publishN(String exchangeName, String queueName,
         throws IOException
     {
         for (long i = 0; i < NUM_MESSAGES; i++) {
-            ackSet.add(channel.getNextPublishSeqNo());
+            unconfirmedSet.add(channel.getNextPublishSeqNo());
             publish(exchangeName, queueName, persistent, mandatory, immediate);
         }
     }
@@ -257,13 +258,13 @@ private void publish(String exchangeName, String queueName,
     }
 
     private void handleAck(long msgSeqNo, boolean multiple) {
-        if (!ackSet.contains(msgSeqNo)) {
+        if (!unconfirmedSet.contains(msgSeqNo)) {
             fail("got duplicate ack: " + msgSeqNo);
         }
         if (multiple) {
-            ackSet.headSet(msgSeqNo + 1).clear();
+            unconfirmedSet.headSet(msgSeqNo + 1).clear();
         } else {
-            ackSet.remove(msgSeqNo);
+            unconfirmedSet.remove(msgSeqNo);
         }
     }
 
@@ -281,7 +282,7 @@ private void basicRejectCommon(boolean requeue)
     }
 
     private void waitAcks() throws InterruptedException {
-        while (ackSet.size() > 0)
+        while (unconfirmedSet.size() > 0)
             Thread.sleep(10);
     }
 }

test/src/com/rabbitmq/examples/ConfirmDontLoseMessages.java

@@ -48,7 +48,7 @@ public static void main(String[] args)
     }
 
     static class Publisher implements Runnable {
-        private volatile SortedSet<Long> ackSet =
+        private volatile SortedSet<Long> unconfirmedSet =
             Collections.synchronizedSortedSet(new TreeSet<Long>());
 
         public void run() {
@@ -63,22 +63,22 @@ public void run() {
                 ch.setConfirmListener(new ConfirmListener() {
                         public void handleAck(long seqNo, boolean multiple) {
                             if (multiple) {
-                                ackSet.headSet(seqNo+1).clear();
+                                unconfirmedSet.headSet(seqNo+1).clear();
                             } else {
-                                ackSet.remove(seqNo);
+                                unconfirmedSet.remove(seqNo);
                             }
                         }
 
                         public void handleNack(long seqNo, boolean multiple) {
                             int lost = 0;
                             if (multiple) {
                                 SortedSet<Long> nackd =
-                                    ackSet.headSet(seqNo+1);
+                                    unconfirmedSet.headSet(seqNo+1);
                                 lost = nackd.size();
                                 nackd.clear();
                             } else {
                                 lost = 1;
-                                ackSet.remove(seqNo);
+                                unconfirmedSet.remove(seqNo);
                             }
                             System.out.printf("Probably lost %d messages.\n",
                                               lost);
@@ -87,14 +87,14 @@ public void handleNack(long seqNo, boolean multiple) {
 
                 // Publish
                 for (long i = 0; i < MSG_COUNT; ++i) {
-                    ackSet.add(ch.getNextPublishSeqNo());
+                    unconfirmedSet.add(ch.getNextPublishSeqNo());
                     ch.basicPublish("", QUEUE_NAME,
                                     MessageProperties.PERSISTENT_BASIC,
                                     "nop".getBytes());
                 }
 
                 // Wait
-                while (ackSet.size() > 0)
+                while (unconfirmedSet.size() > 0)
                     Thread.sleep(10);
 
                 // Cleanup

test/src/com/rabbitmq/examples/MulticastMain.java

@@ -239,7 +239,7 @@ public static class Producer implements Runnable, ReturnListener,
         private long      confirmCount;
         private long      nackCount;
         private Semaphore confirmPool;
-        private volatile SortedSet<Long> ackSet =
+        private volatile SortedSet<Long> unconfirmedSet =
             Collections.synchronizedSortedSet(new TreeSet<Long>());
 
         public Producer(Channel channel, String exchangeName, String id,
@@ -287,11 +287,11 @@ private void handleAckNack(long seqNo, boolean multiple,
                                    boolean nack) {
             int numConfirms = 0;
             if (multiple) {
-                SortedSet<Long> confirmed = ackSet.headSet(seqNo + 1);
+                SortedSet<Long> confirmed = unconfirmedSet.headSet(seqNo + 1);
                 numConfirms += confirmed.size();
                 confirmed.clear();
             } else {
-                ackSet.remove(seqNo);
+                unconfirmedSet.remove(seqNo);
                 numConfirms = 1;
             }
             synchronized (this) {
@@ -349,7 +349,7 @@ public void run() {
         private void publish(byte[] msg)
             throws IOException {
 
-            ackSet.add(channel.getNextPublishSeqNo());
+            unconfirmedSet.add(channel.getNextPublishSeqNo());
             channel.basicPublish(exchangeName, id,
                                  mandatory, immediate,
                                  persistent ? MessageProperties.MINIMAL_PERSISTENT_BASIC : MessageProperties.MINIMAL_BASIC,