Change name of variations on noAck in examples too

Author: Michael Bridgen

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

@@ -68,10 +68,10 @@ public static void main(String[] args) {
             final String hostName = optArg(args, 0, "localhost");
             final int portNumber = optArg(args, 1, AMQP.PROTOCOL.PORT);
             boolean writeStats = optArg(args, 2, true);
-            boolean noAck = optArg(args, 3, true);
+            boolean autoAck = optArg(args, 3, true);
             final Connection conn = new ConnectionFactory(){{setHost(hostName); setPort(portNumber);}}.newConnection();
             System.out.println("Channel 0 fully open.");
-            new ConsumerMain(conn, writeStats, noAck).run();
+            new ConsumerMain(conn, writeStats, autoAck).run();
         } catch (Exception e) {
             System.err.println("Main thread caught exception: " + e);
             e.printStackTrace();
@@ -91,14 +91,14 @@ public static void sleep(int ms) {
 
     public boolean _writeStats;
 
-    public boolean _noAck;
+    public boolean _autoAck;
 
-    public ConsumerMain(Connection connection, boolean writeStats, boolean noAck) {
+    public ConsumerMain(Connection connection, boolean writeStats, boolean autoAck) {
         _connection = connection;
         _writeStats = writeStats;
-        _noAck = noAck;
+        _autoAck = autoAck;
         System.out.println((_writeStats ? "WILL" : "WON'T") + " write statistics.");
-        System.out.println((_noAck ? "WILL" : "WON'T") + " use server-side auto-acking.");
+        System.out.println((_autoAck ? "WILL" : "WON'T") + " use server-side auto-acking.");
     }
 
     public void run() {
@@ -124,9 +124,9 @@ private void runIt() throws IOException {
         channel.queueBind(completionQueue, exchangeName, "");
 
         LatencyExperimentConsumer callback = new LatencyExperimentConsumer(channel, queueName);
-        callback._noAck = this._noAck;
+        callback._autoAck = this._autoAck;
 
-        channel.basicConsume(queueName, _noAck, callback);
+        channel.basicConsume(queueName, _autoAck, callback);
         channel.basicConsume(completionQueue, true, "completion", callback);
         callback.report(_writeStats);
 
@@ -165,7 +165,7 @@ public static class LatencyExperimentConsumer extends DefaultConsumer {
 
         public long _nextSummaryTime;
 
-        public boolean _noAck = true;
+        public boolean _autoAck = true;
 
         public LatencyExperimentConsumer(Channel ch, String queueName) {
             super(ch);
@@ -277,7 +277,7 @@ public void report(boolean writeStats) throws IOException {
             if (msgStartTime != -1) {
                 _deltas[_received++] = now - msgStartTime;
 
-                if (!_noAck && ((_received % ACK_BATCH_SIZE) == 0)) {
+                if (!_autoAck && ((_received % ACK_BATCH_SIZE) == 0)) {
                     getChannel().basicAck(0, true);
                 }
             }
@@ -293,7 +293,7 @@ public void report(boolean writeStats) throws IOException {
         }
 
         public void finish() throws IOException {
-            if (!_noAck)
+            if (!_autoAck)
                 getChannel().basicAck(0, true);
             _blocker.setIfUnset(new Object());
         }

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

@@ -323,27 +323,27 @@ public TracingConsumer(Channel ch) {
     }
 
     public class BatchedTracingConsumer extends TracingConsumer {
-        final boolean _noAck;
+        final boolean _autoAck;
 
         final BlockingCell<Object> _k;
 
         final int _batchSize;
 
         int _counter;
 
-        public BatchedTracingConsumer(boolean noAck, BlockingCell<Object> k, int batchSize, Channel ch) {
+        public BatchedTracingConsumer(boolean autoAck, BlockingCell<Object> k, int batchSize, Channel ch) {
             super(ch);
-            _noAck = noAck;
+            _autoAck = autoAck;
             _k = k;
             _batchSize = batchSize;
             _counter = 0;
         }
 
         @Override public void handleDelivery(String consumer_Tag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) throws IOException {
-            log("Async message (" + _counter + "," + (_noAck ? "noack" : "ack") + "): " + new String(body));
+            log("Async message (" + _counter + "," + (_autoAck ? "autoack" : "ack") + "): " + new String(body));
             _counter++;
             if (_counter == _batchSize) {
-                if (!_noAck) {
+                if (!_autoAck) {
                     log("Acking batch.");
                     getChannel().basicAck(envelope.getDeliveryTag(), true);
                 }
@@ -379,15 +379,15 @@ public void assertNonNull(Object o) {
         }
     }
 
-    public int drain(int batchSize, String queueName, boolean noAck) throws IOException {
+    public int drain(int batchSize, String queueName, boolean autoAck) throws IOException {
         long latestTag = 0;
         boolean notEmpty = true;
         int remaining = batchSize;
         int count = 0;
 
         while (notEmpty && (remaining > 0)) {
             for (int i = 0; (i < 2) && (remaining > 0); i++) {
-                GetResponse c = _ch1.basicGet(queueName, noAck);
+                GetResponse c = _ch1.basicGet(queueName, autoAck);
                 if (c == null) {
                     notEmpty = false;
                 } else {
@@ -398,7 +398,7 @@ public int drain(int batchSize, String queueName, boolean noAck) throws IOExcept
                     count++;
                 }
             }
-            if (!noAck && latestTag != 0) {
+            if (!autoAck && latestTag != 0) {
                 _ch1.basicAck(latestTag, true);
                 latestTag = 0;
             }