QPID-1385 : Extracted annonymous class from AMQChannel.resend(boolean), Added new Mock Objects to the broke to allow direct testing of the new class.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@707344 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 112 insertions, 56 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 0e2645689c..0fd2b5c83a 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -22,9 +22,7 @@ package org.apache.qpid.server;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.configuration.Configured;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.FieldTable;
@@ -60,7 +58,6 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 
 public class AMQChannel
 {
@@ -594,60 +591,9 @@ public class AMQChannel
         // Process the Unacked-Map.
         // Marking messages who still have a consumer for to be resent
         // and those that don't to be requeued.
+        _unacknowledgedMessageMap.visit(new ExtractResendAndRequeue(_unacknowledgedMessageMap, msgToRequeue,
+                                                                    msgToResend, requeue, _storeContext));
 
-        _unacknowledgedMessageMap.visit(new UnacknowledgedMessageMap.Visitor()
-        {
-            public boolean callback(final long deliveryTag, QueueEntry message) throws AMQException
-            {
-
-                AMQMessage msg = message.getMessage();
-                msg.setRedelivered(true);
-                final Subscription subscription = message.getDeliveredSubscription();
-                if (subscription != null)
-                {
-                    // Consumer exists
-                    if (!subscription.isClosed())
-                    {
-                        msgToResend.put(deliveryTag, message);
-                    }
-                    else // consumer has gone
-                    {
-                        msgToRequeue.put(deliveryTag, message);
-                    }
-                }
-                else
-                {
-                    // Message has no consumer tag, so was "delivered" to a GET
-                    // or consumer no longer registered
-                    // cannot resend, so re-queue.
-                    if (!message.isQueueDeleted())
-                    {
-                        if (requeue)
-                        {
-                            msgToRequeue.put(deliveryTag, message);
-                        }
-                        else
-                        {
-                            _log.info("No DeadLetter Queue and requeue not requested so dropping message:" + message);
-                        }
-                    }
-                    else
-                    {
-                        message.discard(_storeContext);
-                        _log.warn("Message.queue is null and no DeadLetter Queue so dropping message:" + message);
-                    }
-                }
-
-                // false means continue processing
-                return false;
-            }
-
-            public void visitComplete()
-            {
-            }
-        });
-
-        _unacknowledgedMessageMap.clear();
 
         // Process Messages to Resend
         if (_log.isDebugEnabled())
diff --git a/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java b/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
new file mode 100644
index 0000000000..4f5461bc0e
--- /dev/null
+++ b/java/broker/src/main/java/org/apache/qpid/server/ExtractResendAndRequeue.java
@@ -0,0 +1,110 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server;
+
+import org.apache.qpid.server.ack.UnacknowledgedMessageMap;
+import org.apache.qpid.server.ack.UnacknowledgedMessageMapImpl;
+import org.apache.qpid.server.queue.QueueEntry;
+import org.apache.qpid.server.queue.AMQMessage;
+import org.apache.qpid.server.subscription.Subscription;
+import org.apache.qpid.server.store.StoreContext;
+import org.apache.qpid.AMQException;
+import org.apache.log4j.Logger;
+
+import java.util.Map;
+
+public class ExtractResendAndRequeue implements UnacknowledgedMessageMap.Visitor
+{
+    private static final Logger _log = Logger.getLogger(ExtractResendAndRequeue.class);
+
+    private Map<Long, QueueEntry> _msgToRequeue;
+    private Map<Long, QueueEntry> _msgToResend;
+    private boolean _requeueIfUnabletoResend;
+    private StoreContext _storeContext;
+    private UnacknowledgedMessageMap _unacknowledgedMessageMap;
+
+    public ExtractResendAndRequeue(UnacknowledgedMessageMap unacknowledgedMessageMap, 
+                                   Map<Long, QueueEntry> msgToRequeue,
+                                   Map<Long, QueueEntry> msgToResend,
+                                   boolean requeueIfUnabletoResend,
+                                   StoreContext storeContext)
+    {
+        _unacknowledgedMessageMap = unacknowledgedMessageMap;
+        _msgToRequeue = msgToRequeue;
+        _msgToResend = msgToResend;
+        _requeueIfUnabletoResend = requeueIfUnabletoResend;
+        _storeContext = storeContext;
+    }
+
+    @Override
+    public boolean callback(final long deliveryTag, QueueEntry message) throws AMQException
+    {
+
+        AMQMessage msg = message.getMessage();
+        msg.setRedelivered(true);
+        final Subscription subscription = message.getDeliveredSubscription();
+        if (subscription != null)
+        {
+            // Consumer exists
+            if (!subscription.isClosed())
+            {
+                _msgToResend.put(deliveryTag, message);
+            }
+            else // consumer has gone
+            {
+                _msgToRequeue.put(deliveryTag, message);
+            }
+        }
+        else
+        {
+            // Message has no consumer tag, so was "delivered" to a GET
+            // or consumer no longer registered
+            // cannot resend, so re-queue.
+            if (!message.isQueueDeleted())
+            {
+                if (_requeueIfUnabletoResend)
+                {
+                    _msgToRequeue.put(deliveryTag, message);
+                }
+                else
+                {
+                    message.discard(_storeContext);
+                    _log.info("No DeadLetter Queue and requeue not requested so dropping message:" + message);
+                }
+            }
+            else
+            {
+                message.discard(_storeContext);
+                _log.warn("Message.queue is null and no DeadLetter Queue so dropping message:" + message);
+            }
+        }
+
+        // false means continue processing
+        return false;
+    }
+
+    @Override
+    public void visitComplete()
+    {
+        _unacknowledgedMessageMap.clear();
+    }
+
+}