QPID-5578 : [Java Broker] Remove DurableConfigurationStoreHelper as it no longer does anything useful

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

7 files changed, 30 insertions, 113 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
index 38542fce42..df548d651f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
@@ -39,7 +39,6 @@ import org.apache.qpid.server.model.Queue;
 import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.store.DurableConfigurationStoreHelper;
 import org.apache.qpid.server.util.StateChangeListener;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 
@@ -84,7 +83,7 @@ public class BindingImpl
         super.onCreate();
         if (isDurable())
         {
-            DurableConfigurationStoreHelper.createBinding(_queue.getVirtualHost().getDurableConfigurationStore(), this);
+            _queue.getVirtualHost().getDurableConfigurationStore().create(asObjectRecord());
         }
 
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 80f3ce930a..ef57af3af0 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -59,7 +59,6 @@ import org.apache.qpid.server.model.State;
 import org.apache.qpid.server.plugin.ExchangeType;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.BaseQueue;
-import org.apache.qpid.server.store.DurableConfigurationStoreHelper;
 import org.apache.qpid.server.store.StorableMessageMetaData;
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.util.Action;
@@ -179,7 +178,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
         super.onCreate();
         if(isDurable())
         {
-            DurableConfigurationStoreHelper.createExchange(getVirtualHost().getDurableConfigurationStore(), this);
+            getVirtualHost().getDurableConfigurationStore().create(asObjectRecord());
         }
 
     }
@@ -219,7 +218,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
 
         if (isDurable() && !isAutoDelete())
         {
-            DurableConfigurationStoreHelper.removeExchange(getVirtualHost().getDurableConfigurationStore(), this);
+            getVirtualHost().getDurableConfigurationStore().remove(asObjectRecord());
 
         }
 
@@ -247,7 +246,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
 
             if (isDurable() && !isAutoDelete())
             {
-                DurableConfigurationStoreHelper.removeExchange(getVirtualHost().getDurableConfigurationStore(), this);
+                getVirtualHost().getDurableConfigurationStore().remove(asObjectRecord());
 
             }
         }
@@ -652,7 +651,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
 
             if (b.isDurable())
             {
-                DurableConfigurationStoreHelper.removeBinding(_virtualHost.getDurableConfigurationStore(), b);
+                _virtualHost.getDurableConfigurationStore().remove(b.asObjectRecord());
             }
             b.delete();
         }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index e637701d60..69c430e74c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -75,7 +75,6 @@ import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
-import org.apache.qpid.server.store.DurableConfigurationStoreHelper;
 import org.apache.qpid.server.store.StorableMessageMetaData;
 import org.apache.qpid.server.txn.AutoCommitTransaction;
 import org.apache.qpid.server.txn.LocalTransaction;
@@ -247,7 +246,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         if (isDurable() && !(getLifetimePolicy()  == LifetimePolicy.DELETE_ON_CONNECTION_CLOSE
                              || getLifetimePolicy() == LifetimePolicy.DELETE_ON_SESSION_END))
         {
-            DurableConfigurationStoreHelper.createQueue(_virtualHost.getDurableConfigurationStore(), this);
+            _virtualHost.getDurableConfigurationStore().create(asObjectRecord());
         }
     }
 
@@ -2728,8 +2727,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
         {
             if (isDurable())
             {
-                DurableConfigurationStoreHelper.updateQueue(this.getVirtualHost().getDurableConfigurationStore(),
-                                                            this);
+                this.getVirtualHost().getDurableConfigurationStore().update(false, asObjectRecord());
             }
         }
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java
deleted file mode 100644
index e7f380660c..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreHelper.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.store;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.qpid.server.binding.BindingImpl;
-import org.apache.qpid.server.exchange.ExchangeImpl;
-import org.apache.qpid.server.model.Binding;
-import org.apache.qpid.server.model.Exchange;
-import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.queue.AMQQueue;
-
-public class DurableConfigurationStoreHelper
-{
-
-    private static final String BINDING = Binding.class.getSimpleName();
-    private static final String EXCHANGE = Exchange.class.getSimpleName();
-    private static final String QUEUE = Queue.class.getSimpleName();
-    private static final Set<String> QUEUE_ARGUMENTS_EXCLUDES = new HashSet<String>(Arrays.asList(Queue.ALTERNATE_EXCHANGE));
-
-    public static void updateQueue(DurableConfigurationStore store, AMQQueue queue)
-    {
-        store.update(false, queue.asObjectRecord());
-    }
-
-    public static void createQueue(DurableConfigurationStore store, AMQQueue<?> queue)
-    {
-        store.create(queue.asObjectRecord());
-    }
-
-    public static void removeQueue(DurableConfigurationStore store, AMQQueue queue)
-    {
-        store.remove(queue.asObjectRecord());
-    }
-
-    public static void createExchange(DurableConfigurationStore store, ExchangeImpl exchange)
-    {
-        store.create(exchange.asObjectRecord());
-    }
-
-    public static void removeExchange(DurableConfigurationStore store, ExchangeImpl exchange)
-    {
-        store.remove(exchange.asObjectRecord());
-    }
-
-    public static void createBinding(DurableConfigurationStore store, final BindingImpl binding)
-    {
-        store.create(binding.asObjectRecord());
-    }
-
-
-    public static void removeBinding(DurableConfigurationStore store, BindingImpl binding)
-    {
-        store.remove(binding.asObjectRecord());
-    }
-
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index b770fab698..5189bc6fee 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -75,7 +75,6 @@ import org.apache.qpid.server.security.access.Operation;
 import org.apache.qpid.server.stats.StatisticsCounter;
 import org.apache.qpid.server.store.ConfiguredObjectRecord;
 import org.apache.qpid.server.store.DurableConfigurationStore;
-import org.apache.qpid.server.store.DurableConfigurationStoreHelper;
 import org.apache.qpid.server.store.DurableConfiguredObjectRecoverer;
 import org.apache.qpid.server.store.Event;
 import org.apache.qpid.server.store.EventListener;
@@ -594,7 +593,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
                                       == LifetimePolicy.DELETE_ON_SESSION_END))
         {
             DurableConfigurationStore store = getDurableConfigurationStore();
-            DurableConfigurationStoreHelper.removeQueue(store, queue);
+            store.remove(queue.asObjectRecord());
         }
         return purged;
 }
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
index e37445d27e..8be1f10445 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
@@ -124,7 +124,7 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest
     public void testCreateExchange() throws Exception
     {
         ExchangeImpl exchange = createTestExchange();
-        DurableConfigurationStoreHelper.createExchange(_configStore, exchange);
+        _configStore.create(exchange.asObjectRecord());
 
         reopenStore();
         verify(_handler).handle(matchesRecord(_exchangeId, EXCHANGE,
@@ -156,9 +156,9 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest
     public void testRemoveExchange() throws Exception
     {
         ExchangeImpl exchange = createTestExchange();
-        DurableConfigurationStoreHelper.createExchange(_configStore, exchange);
+        _configStore.create(exchange.asObjectRecord());
 
-        DurableConfigurationStoreHelper.removeExchange(_configStore, exchange);
+        _configStore.remove(exchange.asObjectRecord());
 
         reopenStore();
         verify(_handler, never()).handle(any(ConfiguredObjectRecord.class));
@@ -169,10 +169,10 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest
         ExchangeImpl<?> exchange = createTestExchange();
         AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false, null);
         BindingImpl binding = createBinding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
-                                                            exchange, _bindingArgs);
-        DurableConfigurationStoreHelper.createExchange(_configStore, exchange);
-        DurableConfigurationStoreHelper.createQueue(_configStore, queue);
-        DurableConfigurationStoreHelper.createBinding(_configStore, binding);
+                                            exchange, _bindingArgs);
+        _configStore.create(exchange.asObjectRecord());
+        _configStore.create(queue.asObjectRecord());
+        _configStore.create(binding.asObjectRecord());
 
         reopenStore();
 
@@ -257,14 +257,14 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest
     public void testUnbindQueue() throws Exception
     {
         ExchangeImpl<?> exchange = createTestExchange();
-        DurableConfigurationStoreHelper.createExchange(_configStore, exchange);
+        _configStore.create(exchange.asObjectRecord());
 
         AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false, null);
         BindingImpl binding = createBinding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
-                                                            exchange, _bindingArgs);
-        DurableConfigurationStoreHelper.createBinding(_configStore, binding);
+                                            exchange, _bindingArgs);
+        _configStore.create(binding.asObjectRecord());
 
-        DurableConfigurationStoreHelper.removeBinding(_configStore, binding);
+        _configStore.remove(binding.asObjectRecord());
         reopenStore();
 
         verify(_handler, never()).handle(matchesRecord(ANY_UUID, BINDING,
@@ -274,7 +274,7 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest
     public void testCreateQueueAMQQueue() throws Exception
     {
         AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, null);
-        DurableConfigurationStoreHelper.createQueue(_configStore, queue);
+        _configStore.create(queue.asObjectRecord());
 
         reopenStore();
         Map<String, Object> queueAttributes = new HashMap<String, Object>();
@@ -291,7 +291,7 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest
         attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 10);
         AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
 
-        DurableConfigurationStoreHelper.createQueue(_configStore, queue);
+        _configStore.create(queue.asObjectRecord());
 
         reopenStore();
 
@@ -311,7 +311,7 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest
         ExchangeImpl alternateExchange = createTestAlternateExchange();
 
         AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, alternateExchange, null);
-        DurableConfigurationStoreHelper.createQueue(_configStore, queue);
+        _configStore.create(queue.asObjectRecord());
 
         reopenStore();
 
@@ -340,12 +340,12 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest
         attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 10);
         AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
 
-        DurableConfigurationStoreHelper.createQueue(_configStore, queue);
+        _configStore.create(queue.asObjectRecord());
 
         // update the queue to have exclusive=false
         queue = createTestQueue(getName(), getName() + "Owner", false, attributes);
 
-        DurableConfigurationStoreHelper.updateQueue(_configStore, queue);
+        _configStore.update(false, queue.asObjectRecord());
 
         reopenStore();
 
@@ -365,13 +365,13 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest
         attributes.put(AbstractVirtualHost.CREATE_DLQ_ON_CREATION, Boolean.TRUE);
         attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 10);
         AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
-        DurableConfigurationStoreHelper.createQueue(_configStore, queue);
+        _configStore.create(queue.asObjectRecord());
 
         // update the queue to have exclusive=false
         ExchangeImpl alternateExchange = createTestAlternateExchange();
         queue = createTestQueue(getName(), getName() + "Owner", false, alternateExchange, attributes);
 
-        DurableConfigurationStoreHelper.updateQueue(_configStore, queue);
+        _configStore.update(false, queue.asObjectRecord());
 
         reopenStore();
 
@@ -391,10 +391,10 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest
         attributes.put(AbstractVirtualHost.CREATE_DLQ_ON_CREATION, Boolean.TRUE);
         attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 10);
         AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, attributes);
-        DurableConfigurationStoreHelper.createQueue(_configStore, queue);
+        _configStore.create(queue.asObjectRecord());
 
         // remove queue
-        DurableConfigurationStoreHelper.removeQueue(_configStore,queue);
+        _configStore.remove(queue.asObjectRecord());
         reopenStore();
         verify(_handler, never()).handle(any(ConfiguredObjectRecord.class));
     }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
index d37fb4d90f..b1941f4d39 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
@@ -327,7 +327,7 @@ public class VirtualHostMessageStoreTest extends QpidTestCase
 
         //test that removing the queue means it is not recovered next time
         final AMQQueue<?> queue = getVirtualHost().getQueue(durableQueueName);
-        DurableConfigurationStoreHelper.removeQueue(getVirtualHost().getDurableConfigurationStore(),queue);
+        getVirtualHost().getDurableConfigurationStore().remove(queue.asObjectRecord());
 
         reloadVirtualHost();
 
@@ -378,7 +378,7 @@ public class VirtualHostMessageStoreTest extends QpidTestCase
 
         //test that removing the exchange means it is not recovered next time
         final ExchangeImpl<?> exchange = getVirtualHost().getExchange(directExchangeName);
-        DurableConfigurationStoreHelper.removeExchange(getVirtualHost().getDurableConfigurationStore(), exchange);
+        getVirtualHost().getDurableConfigurationStore().remove(exchange.asObjectRecord());
 
         reloadVirtualHost();