QPID-932 : Remove references to unusued constructor argument "browsedAcks" of NonTransactionalContext

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@648669 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 16 insertions, 27 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java b/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
index 7e2d56b460..2898cb38a6 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/exchange/DestWildExchangeTest.java
@@ -38,8 +38,6 @@ import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 
-import java.util.HashSet;
-import java.util.List;
 import java.util.LinkedList;
 
 public class DestWildExchangeTest extends TestCase
@@ -565,8 +563,8 @@ public class DestWildExchangeTest extends TestCase
         MessagePublishInfo info = new PublishInfo(new AMQShortString(s));
 
         TransactionalContext trancontext = new NonTransactionalContext(_store, _context, null,
-                                                                       new LinkedList<RequiredDeliveryException>(),
-                                                                       new HashSet<Long>());
+                                                                       new LinkedList<RequiredDeliveryException>()
+        );
 
         AMQMessage message = new AMQMessage(0L, info, trancontext);
         message.setContentHeaderBody(new ContentHeaderBody());
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
index ed79384d42..65db2a6425 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
@@ -40,7 +40,6 @@ import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 
 import javax.management.Notification;
 import java.util.LinkedList;
-import java.util.HashSet;
 
 /** This class tests all the alerts an AMQQueue can throw based on threshold values of different parameters */
 public class AMQQueueAlertTest extends TestCase
@@ -57,8 +56,8 @@ public class AMQQueueAlertTest extends TestCase
     private StoreContext _storeContext = new StoreContext();
     private TransactionalContext _transactionalContext = new NonTransactionalContext(_messageStore, _storeContext,
                                                                                      null,
-                                                                                     new LinkedList<RequiredDeliveryException>(),
-                                                                                     new HashSet<Long>());
+                                                                                     new LinkedList<RequiredDeliveryException>()
+    );
 
     /**
      * Tests if the alert gets thrown when message count increases the threshold limit
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
index c02b47e9fd..9b874d63e8 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
@@ -44,7 +44,6 @@ import org.apache.mina.common.ByteBuffer;
 
 import javax.management.JMException;
 import java.util.LinkedList;
-import java.util.HashSet;
 
 /**
  * Test class to test AMQQueueMBean attribtues and operations
@@ -272,8 +271,8 @@ public class AMQQueueMBeanTest extends TestCase
 
         _transactionalContext = new NonTransactionalContext(_messageStore, _storeContext,
                                                             null,
-                                                            new LinkedList<RequiredDeliveryException>(),
-                                                            new HashSet<Long>());
+                                                            new LinkedList<RequiredDeliveryException>()
+        );
 
         _queue = new AMQQueue(new AMQShortString("testQueue"), false, new AMQShortString("AMQueueMBeanTest"), false, _virtualHost);
         _queueMBean = new AMQQueueMBean(_queue);
diff --git a/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java b/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
index 42d9cccb4f..7b8db758f0 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
@@ -22,10 +22,8 @@ package org.apache.qpid.server.ack;
 
 import junit.framework.TestCase;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicPublishBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.AMQFrameDecodingException;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.server.RequiredDeliveryException;
 import org.apache.qpid.server.queue.AMQMessage;
@@ -103,8 +101,8 @@ public class TxAckTest extends TestCase
         {
             TransactionalContext txnContext = new NonTransactionalContext(new TestableMemoryMessageStore(),
                                                                           _storeContext, null,
-                                                                          new LinkedList<RequiredDeliveryException>(),
-                                                                          new HashSet<Long>());
+                                                                          new LinkedList<RequiredDeliveryException>()
+            );
             for (int i = 0; i < messageCount; i++)
             {
                 long deliveryTag = i + 1;
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 58323086b5..17ef63fa30 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -268,8 +268,8 @@ public class AbstractHeadersExchangeTestBase extends TestCase
 
         private static TransactionalContext _txnContext = new NonTransactionalContext(_messageStore, _storeContext,
                                                                                       null,
-                                                                         new LinkedList<RequiredDeliveryException>(),
-                                                                         new HashSet<Long>());
+                                                                         new LinkedList<RequiredDeliveryException>()
+        );
 
         Message(String id, String... headers) throws AMQException
         {
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
index 95ffb505fb..3498e9a8ae 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/AckTest.java
@@ -40,7 +40,6 @@ import org.apache.qpid.server.util.NullApplicationRegistry;
 
 import java.util.LinkedList;
 import java.util.Set;
-import java.util.HashSet;
 
 /**
  * Tests that acknowledgements are handled correctly.
@@ -90,8 +89,8 @@ public class AckTest extends TestCase
     private void publishMessages(int count, boolean persistent) throws AMQException
     {
         TransactionalContext txnContext = new NonTransactionalContext(_messageStore, _storeContext, null,
-                                                                      new LinkedList<RequiredDeliveryException>(),
-                                                                      new HashSet<Long>());
+                                                                      new LinkedList<RequiredDeliveryException>()
+        );
         MessageHandleFactory factory = new MessageHandleFactory();
         for (int i = 1; i <= count; i++)
         {
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java b/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
index 521bedeccd..d0c0f7de6c 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
@@ -20,7 +20,6 @@
  */
 package org.apache.qpid.server.queue;
 
-import org.apache.qpid.framing.BasicPublishBody;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
@@ -28,7 +27,6 @@ import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.SkeletonMessageStore;
 import org.apache.qpid.server.store.StoreContext;
 import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.util.TestApplicationRegistry;
 import org.apache.qpid.server.util.NullApplicationRegistry;
 import org.apache.qpid.server.txn.TransactionalContext;
 import org.apache.qpid.server.txn.NonTransactionalContext;
@@ -38,7 +36,6 @@ import org.apache.qpid.AMQException;
 import junit.framework.TestCase;
 
 import java.util.LinkedList;
-import java.util.HashSet;
 
 class MessageTestHelper extends TestCase
 {
@@ -47,8 +44,8 @@ class MessageTestHelper extends TestCase
     private final StoreContext _storeContext = new StoreContext();
 
     private final TransactionalContext _txnContext = new NonTransactionalContext(_messageStore, _storeContext, null,
-                                                                                 new LinkedList<RequiredDeliveryException>(),
-                                                                                 new HashSet<Long>());
+                                                                                 new LinkedList<RequiredDeliveryException>()
+    );
 
     MessageTestHelper() throws Exception
     {
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java b/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
index 374c69fa00..c7984d5d33 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/store/TestReferenceCounting.java
@@ -23,7 +23,6 @@ package org.apache.qpid.server.store;
 import junit.framework.TestCase;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.BasicPublishBody;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
@@ -83,7 +82,7 @@ public class TestReferenceCounting extends TestCase
         };
 
         AMQMessage message = new AMQMessage(_store.getNewMessageId(), info,
-                                            new NonTransactionalContext(_store, _storeContext, null, null, null),
+                                            new NonTransactionalContext(_store, _storeContext, null, null),
                                             createPersistentContentHeader());
         message = message.takeReference();
 
@@ -137,7 +136,7 @@ public class TestReferenceCounting extends TestCase
 
         AMQMessage message = new AMQMessage(_store.getNewMessageId(),
                                             info,
-                                            new NonTransactionalContext(_store, _storeContext, null, null, null),
+                                            new NonTransactionalContext(_store, _storeContext, null, null),
                                             createPersistentContentHeader());
         
         message = message.takeReference();