Don't use Deque, and thus become compatible with Java 1.5. This changeset can be reversed once we drop Java 1.5 support.

Author: Simon MacMullen

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

@@ -7,7 +7,7 @@
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Deque;
+import java.util.List;
 
 import static com.rabbitmq.client.test.functional.QosTests.drain;
 
@@ -20,12 +20,12 @@ protected void createResources() throws IOException {
     }
 
     private interface Closure {
-        public void makeMore(Deque<Delivery> deliveries) throws IOException;
+        public void makeMore(List<Delivery> deliveries) throws IOException;
     }
 
     public void testSingleAck() throws IOException {
         testPrefetch(new Closure() {
-            public void makeMore(Deque<Delivery> deliveries) throws IOException {
+            public void makeMore(List<Delivery> deliveries) throws IOException {
                 for (Delivery del : deliveries) {
                     ack(del, false);
                 }
@@ -35,16 +35,16 @@ public void makeMore(Deque<Delivery> deliveries) throws IOException {
 
     public void testMultiAck() throws IOException {
         testPrefetch(new Closure() {
-            public void makeMore(Deque<Delivery> deliveries) throws IOException {
-                ack(deliveries.getLast(), true);
+            public void makeMore(List<Delivery> deliveries) throws IOException {
+                ack(deliveries.get(deliveries.size() - 1), true);
             }
         });
     }
 
     public void testSingleNack() throws IOException {
         for (final boolean requeue: Arrays.asList(false, true)) {
             testPrefetch(new Closure() {
-                public void makeMore(Deque<Delivery> deliveries) throws IOException {
+                public void makeMore(List<Delivery> deliveries) throws IOException {
                     for (Delivery del : deliveries) {
                         nack(del, false, requeue);
                     }
@@ -56,16 +56,16 @@ public void makeMore(Deque<Delivery> deliveries) throws IOException {
     public void testMultiNack() throws IOException {
         for (final boolean requeue: Arrays.asList(false, true)) {
             testPrefetch(new Closure() {
-                public void makeMore(Deque<Delivery> deliveries) throws IOException {
-                    nack(deliveries.getLast(), true, requeue);
+                public void makeMore(List<Delivery> deliveries) throws IOException {
+                    nack(deliveries.get(deliveries.size() - 1), true, requeue);
                 }
             });
         }
     }
 
     public void testRecover() throws IOException {
         testPrefetch(new Closure() {
-            public void makeMore(Deque<Delivery> deliveries) throws IOException {
+            public void makeMore(List<Delivery> deliveries) throws IOException {
                 channel.basicRecover();
             }
         });
@@ -75,7 +75,7 @@ private void testPrefetch(Closure closure) throws IOException {
         QueueingConsumer c = new QueueingConsumer(channel);
         publish(q, 15);
         consume(c, 5, false);
-        Deque<Delivery> deliveries = drain(c, 5);
+        List<Delivery> deliveries = drain(c, 5);
 
         ack(channel.basicGet(q, false), false);
         drain(c, 0);

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

@@ -22,12 +22,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Queue;
 
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
@@ -66,16 +64,16 @@ public void fill(int n)
      * receive n messages - check that we receive no fewer and cannot
      * receive more
      **/
-    public static Deque<Delivery> drain(QueueingConsumer c, int n)
+    public static List<Delivery> drain(QueueingConsumer c, int n)
         throws IOException
     {
-        Deque<Delivery> res = new LinkedList<Delivery>();
+        List<Delivery> res = new LinkedList<Delivery>();
         try {
             long start = System.currentTimeMillis();
             for (int i = 0; i < n; i++) {
                 Delivery d = c.nextDelivery(1000);
                 assertNotNull(d);
-                res.offer(d);
+                res.add(d);
             }
             long finish = System.currentTimeMillis();
             Thread.sleep( (n == 0 ? 0 : (finish - start) / n) + 10 );
@@ -131,7 +129,7 @@ public void testNoAckObeysLimit()
         } catch (InterruptedException ie) {
             fail("interrupted");
         }
-        Queue<Delivery> d = drain(c1, 1);
+        List<Delivery> d = drain(c1, 1);
         ack(d, false); // must ack before the next one appears
         d = drain(c1, 1);
         ack(d, false);
@@ -164,7 +162,7 @@ public void testFairness()
         List<String> queues = configure(c, 1, queueCount, messageCount);
 
         for (int i = 0; i < messageCount - 1; i++) {
-            Queue<Delivery> d = drain(c, 1);
+            List<Delivery> d = drain(c, 1);
             ack(d, false);
         }
 
@@ -245,7 +243,7 @@ public void testConsumerLifecycle()
         String tag;
         for (int i = 0; i < 2; i++) {
             tag = channel.basicConsume(queue, false, c);
-            Queue<Delivery> d = drain(c, 1);
+            List<Delivery> d = drain(c, 1);
             channel.basicCancel(tag);
             drain(c, 0);
             ack(d, true);
@@ -264,7 +262,7 @@ public void testSetLimitAfterConsume()
         //We actually only guarantee that the limit takes effect
         //*eventually*, so this can in fact fail. It's pretty unlikely
         //though.
-        Queue<Delivery> d = drain(c, 1);
+        List<Delivery> d = drain(c, 1);
         ack(d, true);
         drain(c, 1);
     }
@@ -282,7 +280,7 @@ public void testLimitDecrease()
         throws IOException
     {
         QueueingConsumer c = new QueueingConsumer(channel);
-        Queue<Delivery> d = configure(c, 2, 4);
+        List<Delivery> d = configure(c, 2, 4);
         channel.basicQos(1, true);
         drain(c, 0);
         ack(d, true);
@@ -312,10 +310,10 @@ public void testLimitingMultipleChannels()
         ch1.basicQos(1, true);
         ch2.basicQos(1, true);
         fill(5);
-        Queue<Delivery> d1 = drain(c1, 1);
-        Queue<Delivery> d2 = drain(c2, 1);
-        ackDelivery(ch1, d1.remove(), true);
-        ackDelivery(ch2, d2.remove(), true);
+        List<Delivery> d1 = drain(c1, 1);
+        List<Delivery> d2 = drain(c2, 1);
+        ackDelivery(ch1, d1.remove(0), true);
+        ackDelivery(ch2, d2.remove(0), true);
         drain(c1, 1);
         drain(c2, 1);
         ch1.close();
@@ -364,7 +362,7 @@ protected void runLimitTests(int limit,
         }
 
         //is limit enforced?
-        Queue<Delivery> d = drain(c, limit);
+        List<Delivery> d = drain(c, limit);
 
         //is basic.get not limited?
         List<Long> tags = new ArrayList<Long>();
@@ -396,7 +394,7 @@ protected void runLimitTests(int limit,
         drain(c, 0);
     }
 
-    protected Delivery ack(Queue<Delivery> d, boolean multiAck)
+    protected Delivery ack(List<Delivery> d, boolean multiAck)
         throws IOException
     {
         Delivery last = null;
@@ -430,7 +428,7 @@ protected List<String> configure(QueueingConsumer c,
         return queues;
     }
 
-    protected Queue<Delivery> configure(QueueingConsumer c,
+    protected List<Delivery> configure(QueueingConsumer c,
                                         int limit,
                                         int messages)
         throws IOException