QPID-4382 : [Java Broker] Implement the default exchange as a facade on top of the queue registry

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

8 files changed, 32 insertions, 25 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
index 4d6d60906d..26fc51c400 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/ack/AcknowledgeTest.java
@@ -25,7 +25,6 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.protocol.InternalTestProtocolSession;
 import org.apache.qpid.server.queue.SimpleAMQQueue;
 import org.apache.qpid.server.store.MessageStore;
@@ -53,8 +52,6 @@ public class AcknowledgeTest extends QpidTestCase
         _queueName = getTestName();
         _queue = BrokerTestHelper.createQueue(_queueName, virtualHost);
         _messageStore = virtualHost.getMessageStore();
-        Exchange defaultExchange = virtualHost.getExchangeRegistry().getDefaultExchange();
-        virtualHost.getBindingFactory().addBinding(_queueName, _queue, defaultExchange, null);
     }
 
     @Override
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
index 121a8764ec..2ddb417d5d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/FanoutExchangeTest.java
@@ -20,24 +20,39 @@
  */
 package org.apache.qpid.server.exchange;
 
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.UUID;
-
 import junit.framework.TestCase;
 
+import org.apache.qpid.AMQException;
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.AMQSecurityException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.logging.LogActor;
+import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.security.SecurityManager;
+import org.apache.qpid.server.virtualhost.VirtualHost;
 
 public class FanoutExchangeTest extends TestCase
 {
     private FanoutExchange _exchange;
+    private VirtualHost _virtualHost;
 
-    public void setUp()
+    public void setUp() throws AMQException
     {
+        CurrentActor.setDefault(mock(LogActor.class));
+
         _exchange = new FanoutExchange();
+        _virtualHost = mock(VirtualHost.class);
+        SecurityManager securityManager = mock(SecurityManager.class);
+        when(_virtualHost.getSecurityManager()).thenReturn(securityManager);
+        when(securityManager.authoriseBind(any(Exchange.class),any(AMQQueue.class),any(AMQShortString.class))).thenReturn(true);
+        _exchange.initialise(UUID.randomUUID(), _virtualHost, AMQShortString.valueOf("test"), false, 0, false);
     }
 
     public void testIsBoundAMQShortStringFieldTableAMQQueueWhenQueueIsNull()
@@ -57,31 +72,32 @@ public class FanoutExchangeTest extends TestCase
         assertFalse("calling isBound(AMQQueue) with null queue should return false", _exchange.isBound((AMQQueue) null));
     }
 
-    public void testIsBoundAMQShortStringFieldTableAMQQueue()
+    public void testIsBoundAMQShortStringFieldTableAMQQueue() throws AMQSecurityException, AMQInternalException
     {
         AMQQueue queue = bindQueue();
         assertTrue("Should return true for a bound queue",
                 _exchange.isBound((AMQShortString) null, (FieldTable) null, queue));
     }
 
-    public void testIsBoundAMQShortStringAMQQueue()
+    public void testIsBoundAMQShortStringAMQQueue() throws AMQSecurityException, AMQInternalException
     {
         AMQQueue queue = bindQueue();
         assertTrue("Should return true for a bound queue",
                 _exchange.isBound((AMQShortString) null, queue));
     }
 
-    public void testIsBoundAMQQueue()
+    public void testIsBoundAMQQueue() throws AMQSecurityException, AMQInternalException
     {
         AMQQueue queue = bindQueue();
         assertTrue("Should return true for a bound queue",
                 _exchange.isBound(queue));
     }
 
-    private AMQQueue bindQueue()
+    private AMQQueue bindQueue() throws AMQSecurityException, AMQInternalException
     {
         AMQQueue queue = mock(AMQQueue.class);
-        _exchange.addBinding(new Binding(UUID.randomUUID(), "does not matter", queue, _exchange, null));
+        when(queue.getVirtualHost()).thenReturn(_virtualHost);
+        _exchange.addBinding("does not matter", queue, null);
         return queue;
     }
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
index dd8d28e836..a33c85dfd1 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
@@ -45,7 +45,7 @@ public class BindingLogSubjectTest extends AbstractTestLogSubject
 
         _testVhost = BrokerTestHelper.createVirtualHost("test");
         _routingKey = new AMQShortString("RoutingKey");
-        _exchange = _testVhost.getExchangeRegistry().getDefaultExchange();
+        _exchange = _testVhost.getExchangeRegistry().getExchange("amq.direct");
         _queue = new MockAMQQueue("BindingLogSubjectTest");
         ((MockAMQQueue) _queue).setVirtualHost(_testVhost);
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
index 8d1b89bf3c..775a306bd3 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
@@ -40,7 +40,7 @@ public class ExchangeLogSubjectTest extends AbstractTestLogSubject
 
         _testVhost = BrokerTestHelper.createVirtualHost("test");
 
-        _exchange = _testVhost.getExchangeRegistry().getDefaultExchange();
+        _exchange = _testVhost.getExchangeRegistry().getExchange("amq.direct");
         _subject = new ExchangeLogSubject(_exchange,_testVhost);
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index ece42f7de3..505c47a69b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -37,6 +37,7 @@ import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.server.binding.Binding;
 import org.apache.qpid.server.exchange.DirectExchange;
 import org.apache.qpid.server.message.AMQMessage;
 import org.apache.qpid.server.message.MessageMetaData;
@@ -164,7 +165,7 @@ public class SimpleAMQQueueTest extends QpidTestCase
 
     public void testBinding() throws AMQSecurityException, AMQInternalException
     {
-        _virtualHost.getBindingFactory().addBinding(String.valueOf(_routingKey), _queue, _exchange, Collections.EMPTY_MAP);
+        _exchange.addBinding(String.valueOf(_routingKey), _queue, Collections.EMPTY_MAP);
 
         assertTrue("Routing key was not bound",
                         _exchange.isBound(_routingKey));
@@ -177,7 +178,7 @@ public class SimpleAMQQueueTest extends QpidTestCase
         assertEquals("Wrong exchange bound", _exchange,
                 _queue.getBindings().get(0).getExchange());
 
-        _virtualHost.getBindingFactory().removeBinding(String.valueOf(_routingKey), _queue, _exchange, Collections.EMPTY_MAP);
+        _exchange.removeBinding(String.valueOf(_routingKey), _queue, Collections.EMPTY_MAP);
         assertFalse("Routing key was still bound",
                 _exchange.isBound(_routingKey));
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
index ffd777243b..809ae72b89 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -829,7 +829,7 @@ public class MessageStoreTest extends QpidTestCase
 
         try
         {
-            getVirtualHost().getBindingFactory().addBinding(String.valueOf(routingKey), queue, exchange, FieldTable.convertToMap(bindArguments));
+            exchange.addBinding(String.valueOf(routingKey), queue, FieldTable.convertToMap(bindArguments));
         }
         catch (Exception e)
         {
@@ -849,7 +849,7 @@ public class MessageStoreTest extends QpidTestCase
 
         try
         {
-            getVirtualHost().getBindingFactory().removeBinding(String.valueOf(routingKey), queue, exchange, FieldTable.convertToMap(bindArguments));
+            exchange.removeBinding(String.valueOf(routingKey), queue, FieldTable.convertToMap(bindArguments));
         }
         catch (Exception e)
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
index d35a90e3c8..25b86eb73f 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/QueueBrowserUsesNoAckTest.java
@@ -55,8 +55,6 @@ public class QueueBrowserUsesNoAckTest extends QpidTestCase
         _queueName = getTestName();
         _queue = BrokerTestHelper.createQueue(_queueName, virtualHost);
         _messageStore = virtualHost.getMessageStore();
-        Exchange defaultExchange = virtualHost.getExchangeRegistry().getDefaultExchange();
-        virtualHost.getBindingFactory().addBinding(_queueName, _queue, defaultExchange, null);
     }
 
     @Override
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
index 1d99d99820..324e36e132 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
@@ -21,9 +21,9 @@
 package org.apache.qpid.server.virtualhost;
 
 import java.util.concurrent.ScheduledFuture;
-import org.apache.qpid.server.binding.BindingFactory;
 import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.connection.IConnectionRegistry;
+import org.apache.qpid.server.exchange.AbstractExchange;
 import org.apache.qpid.server.exchange.ExchangeFactory;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
@@ -61,11 +61,6 @@ public class MockVirtualHost implements VirtualHost
         return null;
     }
 
-    public BindingFactory getBindingFactory()
-    {
-        return null;
-    }
-
     public DtxRegistry getDtxRegistry()
     {
         return null;