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

9 files changed, 34 insertions, 96 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
index 2c7288de14..dfd26b474a 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
@@ -106,19 +106,13 @@ public class BindingLoggingTest extends AbstractTestLogging
 
         List<String> results = waitAndFindMatches(BND_PREFIX);
 
-        // We will have two binds as we bind all queues to the default exchange
-        assertEquals("Result set larger than expected.", 2, results.size());
+        assertEquals("Result set larger than expected.", 1, results.size());
 
-        String exchange = "direct/<<default>>";
         String messageID = "BND-1001";
-        String message = "Create";
         String queueName = _queue.getQueueName();
-
+        String exchange = "direct/amq.direct";
+        String message = "Create : Arguments : {x-filter-jms-selector=}";
         validateLogMessage(getLogMessage(results, 0), messageID, message, exchange, queueName, queueName);
-
-        exchange = "direct/amq.direct";
-        message = "Create : Arguments : {x-filter-jms-selector=}";
-        validateLogMessage(getLogMessage(results, 1), messageID, message, exchange, queueName, queueName);
     }
 
     /**
@@ -145,23 +139,14 @@ public class BindingLoggingTest extends AbstractTestLogging
 
         List<String> results = waitAndFindMatches(BND_PREFIX);
 
-        // We will have two binds as we bind all queues to the default exchange
-        assertEquals("Result set larger than expected.", 2, results.size());
+        assertEquals("Result set larger than expected.", 1, results.size());
 
-        //Verify the first entry is the default binding       
         String messageID = "BND-1001";
-        String message = "Create";
-        
-        validateLogMessage(getLogMessage(results, 0), messageID, message, 
-                "direct/<<default>>", "clientid:" + getName(), "clientid:" + getName());
 
-        //Default binding will be without the selector
-        assertTrue("JMSSelector identified in binding:"+message, !message.contains("jms-selector"));
-
-        // Perform full testing on the second non default binding
-        message = getMessageString(fromMessage(getLogMessage(results, 1)));
+        // Perform full testing on the binding
+        String message = getMessageString(fromMessage(getLogMessage(results, 0)));
         
-        validateLogMessage(getLogMessage(results, 1), messageID, message, 
+        validateLogMessage(getLogMessage(results, 0), messageID, message,
                 "topic/amq.topic", "topic", "clientid:" + getName());
 
         assertTrue("JMSSelector not identified in binding:"+message, message.contains("jms-selector"));
@@ -204,7 +189,7 @@ public class BindingLoggingTest extends AbstractTestLogging
         List<String> results = waitAndFindMatches(BND_PREFIX);
 
         // We will have two binds as we bind all queues to the default exchange
-        assertEquals("Result not as expected." + results, 4, results.size());
+        assertEquals("Result not as expected." + results, 2, results.size());
 
 
         String messageID = "BND-1001";
@@ -214,49 +199,20 @@ public class BindingLoggingTest extends AbstractTestLogging
         validateMessageID(messageID, log);
         assertEquals("Log Message not as expected", message, getMessageString(fromMessage(log)));
 
-        log = getLogMessage(results, 1);
-        validateMessageID(messageID, log);
-        assertEquals("Log Message not as expected", message, getMessageString(fromMessage(log)));
-
-
-        String DEFAULT = "direct/<<default>>";
         String DIRECT = "direct/amq.direct";
 
         messageID = "BND-1002";
         message = "Deleted";
 
-        log = getLogMessage(results, 2);
+        log = getLogMessage(results, 1);
         validateMessageID(messageID, log);
 
         String subject = fromSubject(log);
         
         validateBindingDeleteArguments(subject, "/test");
 
-        boolean defaultFirst = DEFAULT.equals(AbstractTestLogSubject.getSlice("ex", subject));
-        boolean directFirst = DIRECT.equals(AbstractTestLogSubject.getSlice("ex", subject));
-
         assertEquals("Log Message not as expected", message, getMessageString(fromMessage(log)));
 
-        log = getLogMessage(results, 3);
-
-        validateMessageID(messageID, log);
-
-        subject = fromSubject(log);
-
-        validateBindingDeleteArguments(subject, "/test");
-        
-        if (!defaultFirst)
-        {
-            assertEquals(DEFAULT, AbstractTestLogSubject.getSlice("ex", subject));
-            assertTrue("First Exchange Log was not a direct exchange delete",directFirst);
-        }
-        else
-        {
-            assertEquals(DIRECT, AbstractTestLogSubject.getSlice("ex", subject));
-            assertTrue("First Exchange Log was not a default exchange delete",defaultFirst);
-        }
-
-        assertEquals("Log Message not as expected", message, getMessageString(fromMessage(log)));
     }
     
     private void validateBindingDeleteArguments(String subject, String vhostName)
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
index 3f979bea27..f6b56f64ce 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
@@ -64,11 +64,7 @@ public class BrokerManagementTest extends QpidBrokerTestCase
     public void testCreateQueueAndDeletion() throws Exception
     {
         final String queueName = getTestQueueName();
-        final ManagedExchange defaultExchange = _jmxUtils.getManagedExchange(ExchangeDefaults.DEFAULT_EXCHANGE_NAME.asString());
 
-        // Check that bind does not exist before queue creation
-        assertFalse("Binding to " + queueName + " should not exist in default exchange before queue creation",
-                     defaultExchange.bindings().containsKey(new String[] {queueName}));
 
         _managedBroker.createNewQueue(queueName, "testowner", true);
 
@@ -76,16 +72,11 @@ public class BrokerManagementTest extends QpidBrokerTestCase
         assertNotNull("Queue object name expected to exist", _jmxUtils.getQueueObjectName(VIRTUAL_HOST, queueName));
         assertNotNull("Manager queue expected to be available", _jmxUtils.getManagedQueue(queueName));
 
-        // Now verify that the default exchange has been bound.
-        assertTrue("Binding to " + queueName + " should exist in default exchange after queue creation",
-                     defaultExchange.bindings().containsKey(new String[] {queueName}));
 
         // Now delete the queue
         _managedBroker.deleteQueue(queueName);
 
-        // Finally ensure that the binding has been removed.
-        assertFalse("Binding to " + queueName + " should not exist in default exchange after queue deletion",
-                defaultExchange.bindings().containsKey(new String[] {queueName}));
+
     }
 
     /**
@@ -105,24 +96,24 @@ public class BrokerManagementTest extends QpidBrokerTestCase
     /**
      * Tests that it is disallowed to unregister the default exchange.
      */
-    public void testUnregisterOfDefaultExchangeDisallowed() throws Exception
+    public void testUnregisterOfAmqDirectExchangeDisallowed() throws Exception
     {
-        String defaultExchangeName = ExchangeDefaults.DEFAULT_EXCHANGE_NAME.asString();
+        String amqDirectExchangeName = "amq.direct";
 
-        ManagedExchange defaultExchange = _jmxUtils.getManagedExchange(defaultExchangeName);
-        assertNotNull("Exchange should exist", defaultExchange);
+        ManagedExchange amqDirectExchange = _jmxUtils.getManagedExchange(amqDirectExchangeName);
+        assertNotNull("Exchange should exist", amqDirectExchange);
         try
         {
-            _managedBroker.unregisterExchange(defaultExchangeName);
+            _managedBroker.unregisterExchange(amqDirectExchangeName);
             fail("Exception not thrown");
         }
         catch (UnsupportedOperationException e)
         {
             // PASS
-            assertEquals("'<<default>>' is a reserved exchange and can't be deleted", e.getMessage());
+            assertEquals("'"+amqDirectExchangeName+"' is a reserved exchange and can't be deleted", e.getMessage());
         }
-        defaultExchange = _jmxUtils.getManagedExchange(defaultExchangeName);
-        assertNotNull("Exchange should exist", defaultExchange);
+        amqDirectExchange = _jmxUtils.getManagedExchange(amqDirectExchangeName);
+        assertNotNull("Exchange should exist", amqDirectExchange);
     }
 
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
index 69e81cf85d..4358b4b450 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
@@ -365,7 +365,7 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
 
         List<String> results = waitAndFindMatches("BND-1001");
 
-        assertEquals("Unexpected number of bindings logged", 2, results.size());
+        assertEquals("Unexpected number of bindings logged", 1, results.size());
 
         String log = getLogMessage(results, 0);
 
@@ -392,7 +392,7 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
 
         List<String> results = waitAndFindMatches("BND-1001");
 
-        assertEquals("Unexpected number of bindings logged", 2, results.size());
+        assertEquals("Unexpected number of bindings logged", 1, results.size());
 
         String log = getLogMessage(results, 0);
 
@@ -419,7 +419,7 @@ public class ManagementActorLoggingTest extends AbstractTestLogging
 
         List<String> results = waitAndFindMatches("BND-1001");
 
-        assertEquals("Unexpected number of bindings logged", 2, results.size());
+        assertEquals("Unexpected number of bindings logged", 1, results.size());
 
         String log = getLogMessage(results, 0);
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
index a113cd734e..666c78f070 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BindingRestTest.java
@@ -46,7 +46,7 @@ public class BindingRestTest extends QpidRestTestCase
     {
         List<Map<String, Object>> bindings = getRestTestHelper().getJsonAsList("/rest/binding/test");
         assertNotNull("Bindings cannot be null", bindings);
-        assertEquals("Unexpected number of bindings", EXPECTED_QUEUES.length * 2, bindings.size());
+        assertEquals("Unexpected number of bindings", EXPECTED_QUEUES.length, bindings.size());
         for (String queueName : EXPECTED_QUEUES)
         {
             Map<String, Object> searchAttributes = new HashMap<String, Object>();
@@ -55,11 +55,6 @@ public class BindingRestTest extends QpidRestTestCase
 
             Map<String, Object> binding = getRestTestHelper().find(searchAttributes, bindings);
             Asserts.assertBinding(queueName, "amq.direct", binding);
-
-            searchAttributes.put(Binding.EXCHANGE, "<<default>>");
-
-            binding = getRestTestHelper().find(searchAttributes, bindings);
-            Asserts.assertBinding(queueName, "<<default>>", binding);
         }
     }
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
index 743ba00cdd..57398ea929 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
@@ -41,7 +41,7 @@ public class QpidRestTestCase extends QpidBrokerTestCase
 
     public static final String[] EXPECTED_VIRTUALHOSTS = { TEST1_VIRTUALHOST, TEST2_VIRTUALHOST, TEST3_VIRTUALHOST};
     public static final String[] EXPECTED_QUEUES = { "queue", "ping" };
-    public static final String[] EXPECTED_EXCHANGES = { "amq.fanout", "amq.match", "amq.direct","amq.topic","<<default>>" };
+    public static final String[] EXPECTED_EXCHANGES = { "amq.fanout", "amq.match", "amq.direct","amq.topic" };
 
     private RestTestHelper _restTestHelper = new RestTestHelper(findFreePort());
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
index d6eae154cf..fec516bc2b 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java
@@ -94,11 +94,9 @@ public class QueueRestTest extends QpidRestTestCase
             @SuppressWarnings("unchecked")
             List<Map<String, Object>> bindings = (List<Map<String, Object>>) queueDetails.get(QUEUE_ATTRIBUTE_BINDINGS);
             assertNotNull("Queue bindings are not found", bindings);
-            assertEquals("Unexpected number of bindings", 2, bindings.size());
+            assertEquals("Unexpected number of bindings", 1, bindings.size());
 
-            Map<String, Object> defaultExchangeBinding = getRestTestHelper().find(Binding.EXCHANGE, "<<default>>", bindings);
             Map<String, Object> directExchangeBinding = getRestTestHelper().find(Binding.EXCHANGE, "amq.direct", bindings);
-            Asserts.assertBinding(name, "<<default>>", defaultExchangeBinding);
             Asserts.assertBinding(name, "amq.direct", directExchangeBinding);
         }
     }
@@ -113,11 +111,9 @@ public class QueueRestTest extends QpidRestTestCase
         @SuppressWarnings("unchecked")
         List<Map<String, Object>> bindings = (List<Map<String, Object>>) queueDetails.get(QUEUE_ATTRIBUTE_BINDINGS);
         assertNotNull("Queue bindings are not found", bindings);
-        assertEquals("Unexpected number of bindings", 2, bindings.size());
+        assertEquals("Unexpected number of bindings", 1, bindings.size());
 
-        Map<String, Object> defaultExchangeBinding = getRestTestHelper().find(Binding.EXCHANGE, "<<default>>", bindings);
         Map<String, Object> directExchangeBinding = getRestTestHelper().find(Binding.EXCHANGE, "amq.direct", bindings);
-        Asserts.assertBinding(queueName, "<<default>>", defaultExchangeBinding);
         Asserts.assertBinding(queueName, "amq.direct", directExchangeBinding);
 
         @SuppressWarnings("unchecked")
@@ -169,7 +165,7 @@ public class QueueRestTest extends QpidRestTestCase
     {
         String queueName = getTestQueueName();
         String bindingName = queueName + 2;
-        String[] exchanges = { "amq.direct", "amq.fanout", "amq.topic", "amq.match", "<<default>>" };
+        String[] exchanges = { "amq.direct", "amq.fanout", "amq.topic", "amq.match" };
 
         for (int i = 0; i < exchanges.length; i++)
         {
@@ -182,7 +178,7 @@ public class QueueRestTest extends QpidRestTestCase
         @SuppressWarnings("unchecked")
         List<Map<String, Object>> bindings = (List<Map<String, Object>>) queueDetails.get(QUEUE_ATTRIBUTE_BINDINGS);
         assertNotNull("Queue bindings are not found", bindings);
-        assertEquals("Unexpected number of bindings", exchanges.length + 2, bindings.size());
+        assertEquals("Unexpected number of bindings", exchanges.length + 1, bindings.size());
 
         Map<String, Object> searchAttributes = new HashMap<String, Object>();
         searchAttributes.put(Binding.NAME, bindingName);
@@ -244,7 +240,7 @@ public class QueueRestTest extends QpidRestTestCase
                 statistics.get(Queue.CONSUMER_COUNT));
         assertEquals("Unexpected queue statistics attribute " + Queue.CONSUMER_COUNT_WITH_CREDIT, 1,
                 statistics.get(Queue.CONSUMER_COUNT_WITH_CREDIT));
-        assertEquals("Unexpected queue statistics attribute " + Queue.BINDING_COUNT, 2, statistics.get(Queue.BINDING_COUNT));
+        assertEquals("Unexpected queue statistics attribute " + Queue.BINDING_COUNT, 1, statistics.get(Queue.BINDING_COUNT));
         assertEquals("Unexpected queue statistics attribute " + Queue.PERSISTENT_DEQUEUED_MESSAGES, DEQUEUED_MESSAGES,
                 statistics.get(Queue.PERSISTENT_DEQUEUED_MESSAGES));
         assertEquals("Unexpected queue statistics attribute " + Queue.TOTAL_DEQUEUED_MESSAGES, DEQUEUED_MESSAGES,
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
index cb4fd1ad5b..664b8fffa4 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/StructureRestTest.java
@@ -23,6 +23,7 @@ package org.apache.qpid.systest.rest;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.test.utils.TestBrokerConfiguration;
 
@@ -79,7 +80,8 @@ public class StructureRestTest extends QpidRestTestCase
                 Map<String, Object> exchange = getRestTestHelper().find("name", exchangeName, exchanges);
                 assertNotNull("Exchange " + exchangeName + " is not found ", exchange);
                 assertNode(exchange, exchangeName);
-                if ("amq.direct".equalsIgnoreCase(exchangeName) || "<<default>>".equalsIgnoreCase(exchangeName))
+                if (ExchangeDefaults.DIRECT_EXCHANGE_NAME.asString().equalsIgnoreCase(exchangeName) ||
+                    ExchangeDefaults.DEFAULT_EXCHANGE_NAME.asString().equalsIgnoreCase(exchangeName))
                 {
                     @SuppressWarnings("unchecked")
                     List<Map<String, Object>> bindings = (List<Map<String, Object>>) exchange.get("bindings");
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
index c65f8bbd08..1e49351323 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostRestTest.java
@@ -84,7 +84,6 @@ public class VirtualHostRestTest extends QpidRestTestCase
         Asserts.assertDurableExchange("amq.topic", "topic", getRestTestHelper().find(Exchange.NAME, "amq.topic", exchanges));
         Asserts.assertDurableExchange("amq.direct", "direct", getRestTestHelper().find(Exchange.NAME, "amq.direct", exchanges));
         Asserts.assertDurableExchange("amq.match", "headers", getRestTestHelper().find(Exchange.NAME, "amq.match", exchanges));
-        Asserts.assertDurableExchange("<<default>>", "direct", getRestTestHelper().find(Exchange.NAME, "<<default>>", exchanges));
 
         @SuppressWarnings("unchecked")
         List<Map<String, Object>> queues = (List<Map<String, Object>>) hostDetails.get(VIRTUALHOST_QUEUES_ATTRIBUTE);
@@ -600,7 +599,6 @@ public class VirtualHostRestTest extends QpidRestTestCase
         Asserts.assertDurableExchange("amq.topic", "topic", restTestHelper.find(Exchange.NAME, "amq.topic", exchanges));
         Asserts.assertDurableExchange("amq.direct", "direct", restTestHelper.find(Exchange.NAME, "amq.direct", exchanges));
         Asserts.assertDurableExchange("amq.match", "headers", restTestHelper.find(Exchange.NAME, "amq.match", exchanges));
-        Asserts.assertDurableExchange("<<default>>", "direct", restTestHelper.find(Exchange.NAME, "<<default>>", exchanges));
 
         assertNull("Unexpected queues", hostDetails.get(VIRTUALHOST_QUEUES_ATTRIBUTE));
         assertNull("Unexpected connections", hostDetails.get(VIRTUALHOST_CONNECTIONS_ATTRIBUTE));
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
index 22a98b6f42..3783b0bd02 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
@@ -108,7 +108,7 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
                 (AMQSession_0_10)jmsSession).isQueueExist(dest, true));
         assertTrue("Queue not bound as expected",(
                 (AMQSession_0_10)jmsSession).isQueueBound("", 
-                    dest.getAddressName(),dest.getAddressName(), dest.getNode().getDeclareArgs()));
+                    dest.getAddressName(),dest.getAddressName(), null));
         
         // create receiver -----------------------------------------
         addr1 = "ADDR:testQueue2; { create: receiver }";
@@ -133,7 +133,7 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
                 (AMQSession_0_10)jmsSession).isQueueExist(dest, true));
         assertTrue("Queue not bound as expected",(
                 (AMQSession_0_10)jmsSession).isQueueBound("", 
-                    dest.getAddressName(),dest.getAddressName(), dest.getNode().getDeclareArgs()));
+                    dest.getAddressName(),dest.getAddressName(), null));
         
         // create never --------------------------------------------
         addr1 = "ADDR:testQueue3; { create: never }";
@@ -182,7 +182,7 @@ public class AddressBasedDestinationTest extends QpidBrokerTestCase
                 (AMQSession_0_10)jmsSession).isQueueExist(dest, true));
         assertTrue("Queue not bound as expected",(
                 (AMQSession_0_10)jmsSession).isQueueBound("", 
-                    dest.getAddressName(),dest.getAddressName(), dest.getNode().getDeclareArgs()));
+                    dest.getAddressName(),dest.getAddressName(), null));
         
     }