QPID-5800: [Java Broker} Refactor MessageStore implementations extracting a MessageStoreProvider interface.

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

4 files changed, 9 insertions, 11 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 0993783e54..b6dd1b1b71 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
@@ -27,12 +27,12 @@ import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.message.MessageContentSource;
 import org.apache.qpid.server.model.ConfiguredObject;
 
-public class QuotaMessageStore extends AbstractMemoryMessageStore
+public class QuotaMessageStore extends MemoryMessageStore
 {
     public static final String TYPE = "QuotaMessageStore";
     private final AtomicLong _messageId = new AtomicLong(1);
 
-    private long _totalStoreSize;;
+    private long _totalStoreSize;
     private boolean _limitBusted;
     private long _persistentSizeLowThreshold;
     private long _persistentSizeHighThreshold;
@@ -66,12 +66,11 @@ public class QuotaMessageStore extends AbstractMemoryMessageStore
     }
 
 
-    @SuppressWarnings("unchecked")
     @Override
-    public StoredMessage<StorableMessageMetaData> addMessage(StorableMessageMetaData metaData)
+    public <T extends StorableMessageMetaData> StoredMessage<T> addMessage(T metaData)
     {
         final long id = _messageId.getAndIncrement();
-        return new StoredMemoryMessage(id, metaData);
+        return new StoredMemoryMessage<T>(id, metaData);
     }
 
     @Override
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 ba00c430ed..0a686926e3 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
@@ -146,7 +146,7 @@ public class SlowMessageStore implements MessageStore, DurableConfigurationStore
             _defaultDelay = Long.parseLong(String.valueOf(delays.get(DEFAULT_DELAY)));
         }
 
-        final Object realStoreAttr = messageStoreSettings.get(REAL_STORE) == null ? MemoryMessageStore.TYPE : messageStoreSettings.get(REAL_STORE);
+        final Object realStoreAttr = messageStoreSettings.get(REAL_STORE) == null ? MemoryConfigurationStore.TYPE : messageStoreSettings.get(REAL_STORE);
         final String realStore = (String) realStoreAttr;
         _realMessageStore = MessageStoreFactory.FACTORY_LOADER.get(realStore).createMessageStore();
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 1aee32db1b..e9f33a1658 100755
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -67,7 +67,7 @@ import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.VirtualHostNode;
 import org.apache.qpid.server.store.DurableConfigurationStore;
-import org.apache.qpid.server.store.MemoryMessageStore;
+import org.apache.qpid.server.store.MemoryConfigurationStore;
 import org.apache.qpid.url.URLSyntaxException;
 import org.apache.qpid.util.FileUtils;
 import org.apache.qpid.util.SystemUtils;
@@ -854,7 +854,7 @@ public class QpidBrokerTestCase extends QpidTestCase
         {
             storeDir = ":memory:";
         }
-        else if (!MemoryMessageStore.TYPE.equals(storeType))
+        else if (!MemoryConfigurationStore.TYPE.equals(storeType))
         {
             storeDir = "${QPID_WORK}" + File.separator + virtualHostNodeName + File.separator + brokerPort;
         }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java
index e4d4e5b24e..0dcfbf2be3 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestUtils.java
@@ -32,14 +32,13 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.qpid.server.model.BrokerModel;
-import org.apache.qpid.server.model.Model;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.model.VirtualHostNode;
 import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
 import org.apache.qpid.server.store.ConfiguredObjectRecordImpl;
 import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.JsonFileConfigStore;
-import org.apache.qpid.server.store.MemoryMessageStore;
+import org.apache.qpid.server.store.MemoryConfigurationStore;
 import org.apache.qpid.server.virtualhost.StandardVirtualHost;
 import org.apache.qpid.util.FileUtils;
 import org.apache.qpid.util.Strings;
@@ -84,7 +83,7 @@ public class TestUtils
 
         config.setObjectAttribute(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST, VirtualHostNode.IS_MESSAGE_STORE_PROVIDER, false);
         // If using MMS, switch to split store with JSON config store.
-        if (MemoryMessageStore.TYPE.equals(configStoreType))
+        if (MemoryConfigurationStore.TYPE.equals(configStoreType))
         {
             configStoreType =  JsonFileConfigStore.TYPE;
         }