QPID-4973 : [Java Broker] Refactor DurableConfigurationStore

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

2 files changed, 18 insertions, 50 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
index 69efb7e310..a1d3d1542e 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
@@ -28,7 +28,8 @@ import org.apache.qpid.server.message.EnqueableMessage;
 import org.apache.qpid.server.message.MessageContentSource;
 import org.apache.qpid.server.model.VirtualHost;
 
-public class QuotaMessageStore extends NullMessageStore
+public class
+        QuotaMessageStore extends NullMessageStore
 {
     private final AtomicLong _messageId = new AtomicLong(1);
     private final AtomicBoolean _closed = new AtomicBoolean(false);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
index 76250e126a..50f2ed655f 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
@@ -22,16 +22,13 @@ package org.apache.qpid.server.store;
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.UUID;
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.AMQStoreException;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.binding.Binding;
-import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.message.EnqueableMessage;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.queue.AMQQueue;
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
@@ -176,51 +173,28 @@ public class SlowMessageStore implements MessageStore, DurableConfigurationStore
     }
 
 
-    public void createExchange(Exchange exchange) throws AMQStoreException
-    {
-        doPreDelay("createExchange");
-        _durableConfigurationStore.createExchange(exchange);
-        doPostDelay("createExchange");
-    }
-
-    public void removeExchange(Exchange exchange) throws AMQStoreException
-    {
-        doPreDelay("removeExchange");
-        _durableConfigurationStore.removeExchange(exchange);
-        doPostDelay("removeExchange");
-    }
-
-    public void bindQueue(Binding binding) throws AMQStoreException
-    {
-        doPreDelay("bindQueue");
-        _durableConfigurationStore.bindQueue(binding);
-        doPostDelay("bindQueue");
-    }
-
-    public void unbindQueue(Binding binding) throws AMQStoreException
-    {
-        doPreDelay("unbindQueue");
-        _durableConfigurationStore.unbindQueue(binding);
-        doPostDelay("unbindQueue");
-    }
-
-    public void createQueue(AMQQueue queue) throws AMQStoreException
+    @Override
+    public void create(UUID id, String type, Map<String, Object> attributes) throws AMQStoreException
     {
-        createQueue(queue, null);
+        doPreDelay("create");
+        _durableConfigurationStore.create(id, type, attributes);
+        doPostDelay("create");
     }
 
-    public void createQueue(AMQQueue queue, FieldTable arguments) throws AMQStoreException
+    @Override
+    public void remove(UUID id, String type) throws AMQStoreException
     {
-        doPreDelay("createQueue");
-        _durableConfigurationStore.createQueue(queue, arguments);
-        doPostDelay("createQueue");
+        doPreDelay("remove");
+        _durableConfigurationStore.remove(id, type);
+        doPostDelay("remove");
     }
 
-    public void removeQueue(AMQQueue queue) throws AMQStoreException
+    @Override
+    public void update(UUID id, String type, Map<String, Object> attributes) throws AMQStoreException
     {
-        doPreDelay("removeQueue");
-        _durableConfigurationStore.removeQueue(queue);
-        doPostDelay("removeQueue");
+        doPreDelay("update");
+        _durableConfigurationStore.update(id, type, attributes);
+        doPostDelay("update");
     }
 
     public Transaction newTransaction()
@@ -314,13 +288,6 @@ public class SlowMessageStore implements MessageStore, DurableConfigurationStore
         }
     }
 
-    public void updateQueue(AMQQueue queue) throws AMQStoreException
-    {
-        doPreDelay("updateQueue");
-        _durableConfigurationStore.updateQueue(queue);
-        doPostDelay("updateQueue");
-    }
-
     @Override
     public void activate() throws Exception
     {