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, 65 deletions

diff --git a/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java b/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java
deleted file mode 100644
index 8148ff9371..0000000000
--- a/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java
+++ /dev/null
@@ -1,60 +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.Map;
-
-import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
-import org.apache.qpid.server.plugin.MessageStoreFactory;
-import org.apache.qpid.server.plugin.PluggableService;
-
-@PluggableService
-public class MemoryMessageStoreFactory implements MessageStoreFactory, DurableConfigurationStoreFactory
-{
-
-    @Override
-    public String getType()
-    {
-        return MemoryConfigurationStore.TYPE;
-    }
-
-    @Override
-    public MessageStore createMessageStore()
-    {
-        return new MemoryMessageStore();
-    }
-
-    @Override
-    public void validateAttributes(Map<String, Object> attributes)
-    {
-    }
-
-    @Override
-    public DurableConfigurationStore createDurableConfigurationStore()
-    {
-        return new MemoryConfigurationStore();
-    }
-
-    @Override
-    public void validateConfigurationStoreSettings(Map<String, Object> attributes)
-    {
-    }
-}
diff --git a/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java b/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java
index ce587388ce..1fd4717ae1 100644
--- a/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java
+++ b/qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/virtualhostnode/memory/MemoryVirtualHostNode.java
@@ -25,8 +25,8 @@ import java.util.Map;
 import org.apache.qpid.server.model.Broker;
 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.MemoryMessageStoreFactory;
+import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.store.MemoryConfigurationStore;
 import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode;
 
 @ManagedObject(type="Memory",category=false)
@@ -40,9 +40,8 @@ public class MemoryVirtualHostNode extends AbstractStandardVirtualHostNode<Memor
     }
 
     @Override
-    public DurableConfigurationStoreFactory getDurableConfigurationStoreFactory()
+    protected DurableConfigurationStore createConfigurationStore()
     {
-        return new MemoryMessageStoreFactory();
+        return new MemoryConfigurationStore();
     }
-
 }