QPID-5800: [Java Broker] Remove the now redundant MessageStore/DurableConfigurationStore factories

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

2 files changed, 4 insertions, 92 deletions

diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
deleted file mode 100644
index 9bc3780a71..0000000000
--- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java
+++ /dev/null
@@ -1,88 +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.derby;
-
-import java.util.Map;
-
-import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
-import org.apache.qpid.server.plugin.MessageStoreFactory;
-import org.apache.qpid.server.plugin.PluggableService;
-import org.apache.qpid.server.store.DurableConfigurationStore;
-import org.apache.qpid.server.store.MessageStore;
-
-@PluggableService
-public class DerbyMessageStoreFactory implements MessageStoreFactory, DurableConfigurationStoreFactory
-{
-
-    @Override
-    public String getType()
-    {
-        return DerbyMessageStore.TYPE;
-    }
-
-    @Override
-    public DurableConfigurationStore createDurableConfigurationStore()
-    {
-        return new DerbyMessageStore();
-    }
-
-    @Override
-    public MessageStore createMessageStore()
-    {
-        return (new DerbyMessageStore()).getMessageStore();
-    }
-
-    @Override
-    public void validateAttributes(Map<String, Object> attributes)
-    {
-        @SuppressWarnings("unchecked")
-        Map<String, Object> messageStoreSettings = (Map<String, Object>) attributes.get(VirtualHost.MESSAGE_STORE_SETTINGS);
-
-        if(getType().equals(messageStoreSettings.get(MessageStore.STORE_TYPE)))
-        {
-            Object storePath = messageStoreSettings.get(MessageStore.STORE_PATH);
-            if(!(storePath instanceof String))
-            {
-                throw new IllegalArgumentException("Setting '"+ MessageStore.STORE_PATH
-                                                               +"' is required and must be of type String.");
-
-            }
-        }
-
-    }
-
-    @Override
-    public void validateConfigurationStoreSettings(Map<String, Object> configurationStoreSettings)
-    {
-        if(configurationStoreSettings != null && getType().equals(configurationStoreSettings.get(DurableConfigurationStore.STORE_TYPE)))
-        {
-            Object storePath = configurationStoreSettings.get(DurableConfigurationStore.STORE_PATH);
-            if(!(storePath instanceof String))
-            {
-                throw new IllegalArgumentException("Setting '"+ DurableConfigurationStore.STORE_PATH
-                                                               +"' is required and must be of type String.");
-
-            }
-        }
-    }
-
-}
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
index f65cc78f6a..9dc68d0343 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhostnode/derby/DerbyVirtualHostNode.java
@@ -27,8 +27,8 @@ import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ManagedAttributeField;
 import org.apache.qpid.server.model.ManagedObject;
 import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
-import org.apache.qpid.server.store.derby.DerbyMessageStoreFactory;
+import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.store.derby.DerbyMessageStore;
 import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode;
 import org.apache.qpid.server.virtualhostnode.FileBasedVirtualHostNode;
 
@@ -45,9 +45,9 @@ public class DerbyVirtualHostNode extends AbstractStandardVirtualHostNode<DerbyV
     }
 
     @Override
-    protected DurableConfigurationStoreFactory getDurableConfigurationStoreFactory()
+    protected DurableConfigurationStore createConfigurationStore()
     {
-        return new DerbyMessageStoreFactory();
+        return new DerbyMessageStore();
     }
 
     @Override