QPID-4973 : [Java Broker] Refactor DurableConfigurationStore interface to be in terms of ConfiguredObject rather than implementation classes

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

11 files changed, 116 insertions, 92 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
index 341ab1b372..56f118cf7d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
@@ -179,8 +179,8 @@ public class DefaultExchangeFactoryTest extends QpidTestCase
             }
 
             @Override
-            public Exchange newInstance(UUID id, VirtualHost host, AMQShortString name, boolean durable, int ticket,
-                    boolean autoDelete) throws AMQException
+            public Exchange newInstance(UUID id, VirtualHost host, AMQShortString name, boolean durable,
+                                        boolean autoDelete) throws AMQException
             {
                 return null;
             }
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 7b7e2ec346..f608bc8cb0 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
@@ -64,7 +64,7 @@ public class FanoutExchangeTest extends TestCase
         when(securityManager.authoriseBind(any(Exchange.class), any(AMQQueue.class), any(AMQShortString.class))).thenReturn(true);
         when(securityManager.authoriseUnbind(any(Exchange.class), any(AMQShortString.class), any(AMQQueue.class))).thenReturn(true);
 
-        _exchange.initialise(UUID.randomUUID(), _virtualHost, AMQShortString.valueOf("test"), false, 0, false);
+        _exchange.initialise(UUID.randomUUID(), _virtualHost, AMQShortString.valueOf("test"), false, false);
     }
 
     public void testIsBoundAMQShortStringFieldTableAMQQueueWhenQueueIsNull()
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index 2b965358e0..d76c7d1128 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
@@ -68,7 +68,7 @@ public class HeadersExchangeTest extends TestCase
         when(securityManager.authoriseBind(any(Exchange.class), any(AMQQueue.class), any(AMQShortString.class))).thenReturn(true);
         when(securityManager.authoriseUnbind(any(Exchange.class), any(AMQShortString.class), any(AMQQueue.class))).thenReturn(true);
 
-        _exchange.initialise(UUID.randomUUID(), _virtualHost, AMQShortString.valueOf("test"), false, 0, false);
+        _exchange.initialise(UUID.randomUUID(), _virtualHost, AMQShortString.valueOf("test"), false, false);
 
     }
 
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 a33c85dfd1..e63744af9a 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().getExchange("amq.direct");
+        _exchange = _testVhost.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 775a306bd3..b327738797 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().getExchange("amq.direct");
+        _exchange = _testVhost.getExchange("amq.direct");
         _subject = new ExchangeLogSubject(_exchange,_testVhost);
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
index 8d5e6b8ee3..c8e0e53d75 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
@@ -142,25 +142,24 @@ public class AMQQueueFactoryTest extends QpidTestCase
         fieldTable.setBoolean(AMQQueueFactory.X_QPID_DLQ_ENABLED, true);
 
         String queueName = "testDeadLetterQueueEnabled";
-        AMQShortString dlExchangeName = new AMQShortString(queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
-        AMQShortString dlQueueName = new AMQShortString(queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
+        String dlExchangeName = queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX;
+        String dlQueueName = queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX;
 
         QueueRegistry qReg = _virtualHost.getQueueRegistry();
-        ExchangeRegistry exReg = _virtualHost.getExchangeRegistry();
 
         assertNull("The DLQ should not yet exist", qReg.getQueue(dlQueueName));
-        assertNull("The alternate exchange should not yet exist", exReg.getExchange(dlExchangeName));
+        assertNull("The alternate exchange should not yet exist", _virtualHost.getExchange(dlExchangeName));
 
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner", false, false,
                                            _virtualHost, FieldTable.convertToMap(fieldTable));
 
         Exchange altExchange = queue.getAlternateExchange();
         assertNotNull("Queue should have an alternate exchange as DLQ is enabled", altExchange);
-        assertEquals("Alternate exchange name was not as expected", dlExchangeName.asString(), altExchange.getName());
+        assertEquals("Alternate exchange name was not as expected", dlExchangeName, altExchange.getName());
         assertEquals("Alternate exchange type was not as expected", ExchangeDefaults.FANOUT_EXCHANGE_CLASS, altExchange.getType().getName());
 
-        assertNotNull("The alternate exchange was not registered as expected", exReg.getExchange(dlExchangeName));
-        assertEquals("The registered exchange was not the expected exchange instance", altExchange, exReg.getExchange(dlExchangeName));
+        assertNotNull("The alternate exchange was not registered as expected", _virtualHost.getExchange(dlExchangeName));
+        assertEquals("The registered exchange was not the expected exchange instance", altExchange, _virtualHost.getExchange(dlExchangeName));
 
         AMQQueue dlQueue = qReg.getQueue(dlQueueName);
         assertNotNull("The DLQ was not registered as expected", dlQueue);
@@ -180,14 +179,13 @@ public class AMQQueueFactoryTest extends QpidTestCase
     public void testDeadLetterQueueDoesNotInheritDLQorMDCSettings() throws Exception
     {
         String queueName = "testDeadLetterQueueEnabled";
-        AMQShortString dlExchangeName = new AMQShortString(queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
-        AMQShortString dlQueueName = new AMQShortString(queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
+        String dlExchangeName = queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX;
+        String dlQueueName = queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX;
 
         QueueRegistry qReg = _virtualHost.getQueueRegistry();
-        ExchangeRegistry exReg = _virtualHost.getExchangeRegistry();
 
         assertNull("The DLQ should not yet exist", qReg.getQueue(dlQueueName));
-        assertNull("The alternate exchange should not yet exist", exReg.getExchange(dlExchangeName));
+        assertNull("The alternate exchange should not yet exist", _virtualHost.getExchange(dlExchangeName));
 
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner", false, false,
                                            _virtualHost, null);
@@ -195,11 +193,11 @@ public class AMQQueueFactoryTest extends QpidTestCase
         assertEquals("Unexpected maximum delivery count", 5, queue.getMaximumDeliveryCount());
         Exchange altExchange = queue.getAlternateExchange();
         assertNotNull("Queue should have an alternate exchange as DLQ is enabled", altExchange);
-        assertEquals("Alternate exchange name was not as expected", dlExchangeName.toString(), altExchange.getName());
+        assertEquals("Alternate exchange name was not as expected", dlExchangeName, altExchange.getName());
         assertEquals("Alternate exchange type was not as expected", ExchangeDefaults.FANOUT_EXCHANGE_CLASS, altExchange.getType().getName());
 
-        assertNotNull("The alternate exchange was not registered as expected", exReg.getExchange(dlExchangeName));
-        assertEquals("The registered exchange was not the expected exchange instance", altExchange, exReg.getExchange(dlExchangeName));
+        assertNotNull("The alternate exchange was not registered as expected", _virtualHost.getExchange(dlExchangeName));
+        assertEquals("The registered exchange was not the expected exchange instance", altExchange, _virtualHost.getExchange(dlExchangeName));
 
         AMQQueue dlQueue = qReg.getQueue(dlQueueName);
         assertNotNull("The DLQ was not registered as expected", dlQueue);
@@ -222,20 +220,19 @@ public class AMQQueueFactoryTest extends QpidTestCase
         fieldTable.setBoolean(AMQQueueFactory.X_QPID_DLQ_ENABLED, false);
 
         String queueName = "testDeadLetterQueueDisabled";
-        AMQShortString dlExchangeName = new AMQShortString(queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
-        AMQShortString dlQueueName = new AMQShortString(queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
+        String dlExchangeName = queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX;
+        String dlQueueName = queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX;
 
         QueueRegistry qReg = _virtualHost.getQueueRegistry();
-        ExchangeRegistry exReg = _virtualHost.getExchangeRegistry();
 
         assertNull("The DLQ should not yet exist", qReg.getQueue(dlQueueName));
-        assertNull("The alternate exchange should not exist", exReg.getExchange(dlExchangeName));
+        assertNull("The alternate exchange should not exist", _virtualHost.getExchange(dlExchangeName));
 
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner", false, false,
                                            _virtualHost, FieldTable.convertToMap(fieldTable));
 
         assertNull("Queue should not have an alternate exchange as DLQ is disabled", queue.getAlternateExchange());
-        assertNull("The alternate exchange should still not exist", exReg.getExchange(dlExchangeName));
+        assertNull("The alternate exchange should still not exist", _virtualHost.getExchange(dlExchangeName));
 
         assertNull("The DLQ should still not exist", qReg.getQueue(dlQueueName));
 
@@ -255,14 +252,13 @@ public class AMQQueueFactoryTest extends QpidTestCase
         fieldTable.setBoolean(AMQQueueFactory.X_QPID_DLQ_ENABLED, true);
 
         String queueName = "testDeadLetterQueueNotCreatedForAutodeleteQueues";
-        AMQShortString dlExchangeName = new AMQShortString(queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX);
-        AMQShortString dlQueueName = new AMQShortString(queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX);
+        String dlExchangeName = queueName + DefaultExchangeFactory.DEFAULT_DLE_NAME_SUFFIX;
+        String dlQueueName = queueName + AMQQueueFactory.DEFAULT_DLQ_NAME_SUFFIX;
 
         QueueRegistry qReg = _virtualHost.getQueueRegistry();
-        ExchangeRegistry exReg = _virtualHost.getExchangeRegistry();
 
         assertNull("The DLQ should not yet exist", qReg.getQueue(dlQueueName));
-        assertNull("The alternate exchange should not exist", exReg.getExchange(dlExchangeName));
+        assertNull("The alternate exchange should not exist", _virtualHost.getExchange(dlExchangeName));
 
         //create an autodelete queue
         AMQQueue queue = AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), queueName, false, "owner", true, false,
@@ -271,7 +267,7 @@ public class AMQQueueFactoryTest extends QpidTestCase
 
         //ensure that the autodelete property overrides the request to enable DLQ
         assertNull("Queue should not have an alternate exchange as queue is autodelete", queue.getAlternateExchange());
-        assertNull("The alternate exchange should not exist as queue is autodelete", exReg.getExchange(dlExchangeName));
+        assertNull("The alternate exchange should not exist as queue is autodelete", _virtualHost.getExchange(dlExchangeName));
         assertNull("The DLQ should not exist as queue is autodelete", qReg.getQueue(dlQueueName));
 
         //only 1 queue should have been registered
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 505c47a69b..c37e6da729 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
@@ -112,7 +112,7 @@ public class SimpleAMQQueueTest extends QpidTestCase
         _queue = (SimpleAMQQueue) AMQQueueFactory.createAMQQueueImpl(UUIDGenerator.generateRandomUUID(), _qname.asString(), false, _owner.asString(),
                 false, false, _virtualHost, FieldTable.convertToMap(_arguments));
 
-        _exchange = (DirectExchange) _virtualHost.getExchangeRegistry().getExchange(ExchangeDefaults.DIRECT_EXCHANGE_NAME);
+        _exchange = (DirectExchange) _virtualHost.getExchange(ExchangeDefaults.DIRECT_EXCHANGE_NAME.toString());
     }
 
     @Override
@@ -423,7 +423,7 @@ public class SimpleAMQQueueTest extends QpidTestCase
         assertEquals("Unexpected total number of messages sent to both after enqueue", 2, subscription1.getMessages().size() + subscription2.getMessages().size());
 
         /* Now release the first message only, causing it to be requeued */
-        queueEntries.get(0).release();  
+        queueEntries.get(0).release();
 
         Thread.sleep(150); // Work done by SubFlushRunner/QueueRunner Threads
 
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 af4bbd1731..8b678c4eb4 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
@@ -21,6 +21,8 @@
 package org.apache.qpid.server.store;
 
 
+import java.util.ArrayList;
+import java.util.Collection;
 import org.apache.commons.configuration.PropertiesConfiguration;
 
 import org.apache.qpid.AMQException;
@@ -78,9 +80,9 @@ public class MessageStoreTest extends QpidTestCase
     public static final String SELECTOR_VALUE = "Test = 'MST'";
     public static final String LVQ_KEY = "MST-LVQ-KEY";
 
-    private AMQShortString nonDurableExchangeName = new AMQShortString("MST-NonDurableDirectExchange");
-    private AMQShortString directExchangeName = new AMQShortString("MST-DirectExchange");
-    private AMQShortString topicExchangeName = new AMQShortString("MST-TopicExchange");
+    private String nonDurableExchangeName = "MST-NonDurableDirectExchange";
+    private String directExchangeName = "MST-DirectExchange";
+    private String topicExchangeName = "MST-TopicExchange";
 
     private AMQShortString durablePriorityTopicQueueName = new AMQShortString("MST-PriorityTopicQueue-Durable");
     private AMQShortString durableTopicQueueName = new AMQShortString("MST-TopicQueue-Durable");
@@ -365,12 +367,12 @@ public class MessageStoreTest extends QpidTestCase
      */
     public void testExchangePersistence() throws Exception
     {
-        int origExchangeCount = getVirtualHost().getExchangeRegistry().getExchangeNames().size();
+        int origExchangeCount = getVirtualHost().getExchanges().size();
 
-        Map<AMQShortString, Exchange> oldExchanges = createExchanges();
+        Map<String, Exchange> oldExchanges = createExchanges();
 
         assertEquals("Incorrect number of exchanges registered before recovery",
-                origExchangeCount + 3, getVirtualHost().getExchangeRegistry().getExchangeNames().size());
+                origExchangeCount + 3, getVirtualHost().getExchanges().size());
 
         reloadVirtualHost();
 
@@ -385,31 +387,28 @@ public class MessageStoreTest extends QpidTestCase
      */
     public void testDurableExchangeRemoval() throws Exception
     {
-        int origExchangeCount = getVirtualHost().getExchangeRegistry().getExchangeNames().size();
+        int origExchangeCount = getVirtualHost().getExchanges().size();
 
         createExchange(DirectExchange.TYPE, directExchangeName, true);
 
-        ExchangeRegistry exchangeRegistry = getVirtualHost().getExchangeRegistry();
         assertEquals("Incorrect number of exchanges registered before recovery",
-                origExchangeCount + 1,  exchangeRegistry.getExchangeNames().size());
+                origExchangeCount + 1,  getVirtualHost().getExchanges().size());
 
         reloadVirtualHost();
 
-        exchangeRegistry = getVirtualHost().getExchangeRegistry();
         assertEquals("Incorrect number of exchanges registered after first recovery",
-                origExchangeCount + 1,  exchangeRegistry.getExchangeNames().size());
+                origExchangeCount + 1,  getVirtualHost().getExchanges().size());
 
         //test that removing the exchange means it is not recovered next time
-        final Exchange exchange = exchangeRegistry.getExchange(directExchangeName);
+        final Exchange exchange = getVirtualHost().getExchange(directExchangeName);
         DurableConfigurationStoreHelper.removeExchange(getVirtualHost().getDurableConfigurationStore(), exchange);
 
         reloadVirtualHost();
 
-        exchangeRegistry = getVirtualHost().getExchangeRegistry();
         assertEquals("Incorrect number of exchanges registered after second recovery",
-                origExchangeCount,  exchangeRegistry.getExchangeNames().size());
+                origExchangeCount,  getVirtualHost().getExchanges().size());
         assertNull("Durable exchange was not removed:" + directExchangeName,
-                exchangeRegistry.getExchange(directExchangeName));
+                getVirtualHost().getExchange(directExchangeName));
     }
 
     /**
@@ -420,12 +419,12 @@ public class MessageStoreTest extends QpidTestCase
      */
     public void testBindingPersistence() throws Exception
     {
-        int origExchangeCount = getVirtualHost().getExchangeRegistry().getExchangeNames().size();
+        int origExchangeCount = getVirtualHost().getExchanges().size();
 
         createAllQueues();
         createAllTopicQueues();
 
-        Map<AMQShortString, Exchange> exchanges = createExchanges();
+        Map<String, Exchange> exchanges = createExchanges();
 
         Exchange nonDurableExchange = exchanges.get(nonDurableExchangeName);
         Exchange directExchange = exchanges.get(directExchangeName);
@@ -436,7 +435,7 @@ public class MessageStoreTest extends QpidTestCase
         bindAllTopicQueuesToExchange(topicExchange, topicRouting);
 
         assertEquals("Incorrect number of exchanges registered before recovery",
-                origExchangeCount + 3, getVirtualHost().getExchangeRegistry().getExchangeNames().size());
+                origExchangeCount + 3, getVirtualHost().getExchanges().size());
 
         reloadVirtualHost();
 
@@ -469,8 +468,7 @@ public class MessageStoreTest extends QpidTestCase
         assertEquals("Incorrect number of bindings registered after first recovery",
                 1, queueRegistry.getQueue(durableQueueName).getBindings().size());
 
-        ExchangeRegistry exchangeRegistry = getVirtualHost().getExchangeRegistry();
-        exch = exchangeRegistry.getExchange(directExchangeName);
+        exch = getVirtualHost().getExchange(directExchangeName);
         assertNotNull("Exchange was not recovered", exch);
 
         //remove the binding and verify result after recovery
@@ -488,26 +486,30 @@ public class MessageStoreTest extends QpidTestCase
      * and that the new exchanges are not the same objects as the provided list (i.e. that the
      * reload actually generated new exchange objects)
      */
-    private void validateExchanges(int originalNumExchanges, Map<AMQShortString, Exchange> oldExchanges)
+    private void validateExchanges(int originalNumExchanges, Map<String, Exchange> oldExchanges)
     {
-        ExchangeRegistry registry = getVirtualHost().getExchangeRegistry();
-
+        Collection<Exchange> exchanges = getVirtualHost().getExchanges();
+        Collection<String> exchangeNames = new ArrayList(exchanges.size());
+        for(Exchange exchange : exchanges)
+        {
+            exchangeNames.add(exchange.getName());
+        }
         assertTrue(directExchangeName + " exchange NOT reloaded",
-                registry.getExchangeNames().contains(directExchangeName));
+                exchangeNames.contains(directExchangeName));
         assertTrue(topicExchangeName + " exchange NOT reloaded",
-                registry.getExchangeNames().contains(topicExchangeName));
+                exchangeNames.contains(topicExchangeName));
         assertTrue(nonDurableExchangeName + " exchange reloaded",
-                !registry.getExchangeNames().contains(nonDurableExchangeName));
+                !exchangeNames.contains(nonDurableExchangeName));
 
         //check the old exchange objects are not the same as the new exchanges
         assertTrue(directExchangeName + " exchange NOT reloaded",
-                registry.getExchange(directExchangeName) != oldExchanges.get(directExchangeName));
+                getVirtualHost().getExchange(directExchangeName) != oldExchanges.get(directExchangeName));
         assertTrue(topicExchangeName + " exchange NOT reloaded",
-                registry.getExchange(topicExchangeName) != oldExchanges.get(topicExchangeName));
+                getVirtualHost().getExchange(topicExchangeName) != oldExchanges.get(topicExchangeName));
 
         // There should only be the original exchanges + our 2 recovered durable exchanges
         assertEquals("Incorrect number of exchanges available",
-                originalNumExchanges + 2, registry.getExchangeNames().size());
+                originalNumExchanges + 2, getVirtualHost().getExchanges().size());
     }
 
     /** Validates the Durable queues and their properties are as expected following recovery */
@@ -771,9 +773,9 @@ public class MessageStoreTest extends QpidTestCase
 
     }
 
-    private Map<AMQShortString, Exchange> createExchanges()
+    private Map<String, Exchange> createExchanges()
     {
-        Map<AMQShortString, Exchange> exchanges = new HashMap<AMQShortString, Exchange>();
+        Map<String, Exchange> exchanges = new HashMap<String, Exchange>();
 
         //Register non-durable DirectExchange
         exchanges.put(nonDurableExchangeName, createExchange(DirectExchange.TYPE, nonDurableExchangeName, false));
@@ -785,32 +787,19 @@ public class MessageStoreTest extends QpidTestCase
         return exchanges;
     }
 
-    private Exchange createExchange(ExchangeType<?> type, AMQShortString name, boolean durable)
+    private Exchange createExchange(ExchangeType<?> type, String name, boolean durable)
     {
         Exchange exchange = null;
 
         try
         {
-            exchange = type.newInstance(UUIDGenerator.generateRandomUUID(), getVirtualHost(), name, durable, 0, false);
+            exchange = getVirtualHost().createExchange(null, name, type.getName().toString(), durable, false, null);
         }
         catch (AMQException e)
         {
             fail(e.getMessage());
         }
 
-        try
-        {
-            getVirtualHost().getExchangeRegistry().registerExchange(exchange);
-            if (durable)
-            {
-                DurableConfigurationStoreHelper.createExchange(getVirtualHost().getDurableConfigurationStore(),
-                        exchange);
-            }
-        }
-        catch (AMQException e)
-        {
-            fail(e.getMessage());
-        }
         return exchange;
     }
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
index 7811d04997..24cdf34360 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
@@ -190,7 +190,7 @@ public class BrokerTestHelper
         when(info.getExchange()).thenReturn(exchangeNameAsShortString);
         when(info.getRoutingKey()).thenReturn(rouningKey);
 
-        Exchange exchange = channel.getVirtualHost().getExchangeRegistry().getExchange(exchangeName);
+        Exchange exchange = channel.getVirtualHost().getExchange(exchangeName);
         for (int count = 0; count < numberOfMessages; count++)
         {
             channel.setPublishFrame(info, exchange);
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 7552a653fe..78d55c42bf 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
@@ -20,12 +20,16 @@
  */
 package org.apache.qpid.server.virtualhost;
 
+import java.util.Collection;
 import java.util.concurrent.ScheduledFuture;
+import org.apache.qpid.AMQException;
 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.Exchange;
 import org.apache.qpid.server.exchange.ExchangeFactory;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
+import org.apache.qpid.server.plugin.ExchangeType;
 import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.security.SecurityManager;
@@ -77,16 +81,6 @@ public class MockVirtualHost implements VirtualHost
         return null;
     }
 
-    public ExchangeFactory getExchangeFactory()
-    {
-        return null;
-    }
-
-    public ExchangeRegistry getExchangeRegistry()
-    {
-        return null;
-    }
-
     public int getHouseKeepingActiveCount()
     {
         return 0;
@@ -127,11 +121,56 @@ public class MockVirtualHost implements VirtualHost
         return null;
     }
 
+    @Override
+    public Exchange createExchange(UUID id,
+                                   String exchange,
+                                   String type,
+                                   boolean durable,
+                                   boolean autoDelete,
+                                   String alternateExchange) throws AMQException
+    {
+        return null;
+    }
+
+    @Override
+    public void removeExchange(Exchange exchange, boolean force) throws AMQException
+    {
+    }
+
+    @Override
+    public Exchange getExchange(String name)
+    {
+        return null;
+    }
+
+    @Override
+    public Exchange getDefaultExchange()
+    {
+        return null;
+    }
+
+    @Override
+    public Collection<Exchange> getExchanges()
+    {
+        return null;
+    }
+
+    @Override
+    public Collection<ExchangeType<? extends Exchange>> getExchangeTypes()
+    {
+        return null;
+    }
+
     public SecurityManager getSecurityManager()
     {
         return null;
     }
 
+    @Override
+    public void addVirtualHostListener(VirtualHostListener listener)
+    {
+    }
+
     public LinkRegistry getLinkRegistry(String remoteContainerId)
     {
         return null;
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
index ae09e8d7e7..6b8ea0e80b 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
@@ -200,7 +200,7 @@ public class StandardVirtualHostTest extends QpidTestCase
         File config = writeConfigFile(vhostName, queueName, exchangeName, false, new String[]{"ping","pong"}, bindingArguments);
         VirtualHost vhost = createVirtualHost(vhostName, config);
 
-        Exchange exch = vhost.getExchangeRegistry().getExchange(getName() +".direct");
+        Exchange exch = vhost.getExchange(getName() +".direct");
         Collection<Binding> bindings = exch.getBindings();
         assertNotNull("Bindings cannot be null", bindings);
         assertEquals("Unexpected number of bindings", 3, bindings.size());
@@ -245,10 +245,10 @@ public class StandardVirtualHostTest extends QpidTestCase
         AMQQueue queue = vhost.getQueueRegistry().getQueue(queueName);
         assertNotNull("queue should exist", queue);
 
-        Exchange defaultExch = vhost.getExchangeRegistry().getDefaultExchange();
+        Exchange defaultExch = vhost.getDefaultExchange();
         assertTrue("queue should have been bound to default exchange with its name", defaultExch.isBound(queueName, queue));
 
-        Exchange exch = vhost.getExchangeRegistry().getExchange(exchangeName);
+        Exchange exch = vhost.getExchange(exchangeName);
         assertTrue("queue should have been bound to " + exchangeName + " with its name", exch.isBound(queueName, queue));
 
         for(String key: routingKeys)