From 21aceae395ef19dca56dc603ed3f2af744b620a7 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Sat, 7 Jun 2014 19:00:39 +0000 Subject: 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 --- .../store/derby/DerbyMessageStoreFactory.java | 88 ---------------------- .../derby/DerbyVirtualHostNode.java | 8 +- .../server/store/jdbc/JDBCMessageStoreFactory.java | 85 --------------------- .../jdbc/JDBCVirtualHostNodeImpl.java | 9 +-- .../plugin/servlet/rest/HelperServlet.java | 2 +- .../virtualhost/standard/addVirtualHost.js | 2 +- .../server/store/MemoryMessageStoreFactory.java | 60 --------------- .../memory/MemoryVirtualHostNode.java | 9 +-- 8 files changed, 14 insertions(+), 249 deletions(-) delete mode 100644 qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStoreFactory.java delete mode 100644 qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreFactory.java delete mode 100644 qpid/java/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemoryMessageStoreFactory.java (limited to 'qpid/java/broker-plugins') 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 attributes) - { - @SuppressWarnings("unchecked") - Map messageStoreSettings = (Map) 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 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 attributes) - { - @SuppressWarnings("unchecked") - Map messageStoreSettings = (Map) attributes.get(VirtualHost.MESSAGE_STORE_SETTINGS); - if(getType().equals(messageStoreSettings.get(MessageStore.STORE_TYPE))) - { - Object connectionURL = messageStoreSettings.get(JDBCMessageStore.CONNECTION_URL); - if(!(connectionURL instanceof String)) - { - throw new IllegalArgumentException("Setting '"+ JDBCMessageStore.CONNECTION_URL - +"' is required and must be of type String."); - - } - } - } - - @Override - public void validateConfigurationStoreSettings(Map configurationStoreSettings) - { - if(configurationStoreSettings != null && getType().equals(configurationStoreSettings.get(DurableConfigurationStore.STORE_TYPE))) - { - Object connectionURL = configurationStoreSettings.get(JDBCMessageStore.CONNECTION_URL); - if(!(connectionURL instanceof String)) - { - throw new IllegalArgumentException("Setting '"+ JDBCMessageStore.CONNECTION_URL - +"' is required and must be of type String."); - } - } - } - -} diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java index cb3077bc65..29986335d0 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNodeImpl.java @@ -26,8 +26,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.jdbc.JDBCMessageStoreFactory; +import org.apache.qpid.server.store.DurableConfigurationStore; +import org.apache.qpid.server.store.jdbc.JDBCMessageStore; import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode; @ManagedObject( category = false, type = "JDBC" ) @@ -58,9 +58,9 @@ public class JDBCVirtualHostNodeImpl extends AbstractStandardVirtualHostNode attributes) - { - } - - @Override - public DurableConfigurationStore createDurableConfigurationStore() - { - return new MemoryConfigurationStore(); - } - - @Override - public void validateConfigurationStoreSettings(Map 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