QPID-5800: [Java Broker] Refactor Derby/JDBC message store implementations - Address review comments from Alex Rudyy

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

3 files changed, 10 insertions, 9 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
index 7487315000..974b3ba9ff 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
@@ -196,8 +196,9 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
 
     }
 
-    private void upgradeFromV7()
+    private void upgradeFromV7() throws SQLException
     {
+        updateDbVersion(8);
     }
 
     private void upgradeFromV6() throws SQLException
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
index 540e92fac7..6596b5b621 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
@@ -47,7 +47,7 @@ public class DerbyConfigurationStore extends AbstractJDBCConfigurationStore
     private static final Logger LOGGER = Logger.getLogger(DerbyConfigurationStore.class);
 
     private final AtomicBoolean _configurationStoreOpen = new AtomicBoolean();
-    private final MessageStoreWrapper _messageStore = new MessageStoreWrapper();
+    private final ProvidedMessageStore _providedMessageStore = new ProvidedMessageStore();
 
     private String _connectionURL;
     private String _storeLocation;
@@ -89,7 +89,7 @@ public class DerbyConfigurationStore extends AbstractJDBCConfigurationStore
     @Override
     public void closeConfigurationStore() throws StoreException
     {
-        if (_messageStore.isMessageStoreOpen())
+        if (_providedMessageStore.isMessageStoreOpen())
         {
             throw new IllegalStateException("Cannot close the store as the provided message store is still open");
         }
@@ -134,7 +134,7 @@ public class DerbyConfigurationStore extends AbstractJDBCConfigurationStore
     @Override
     public void onDelete()
     {
-        if (_messageStore.isMessageStoreOpen())
+        if (_providedMessageStore.isMessageStoreOpen())
         {
             throw new IllegalStateException("Cannot delete the store as the provided message store is still open");
         }
@@ -161,7 +161,7 @@ public class DerbyConfigurationStore extends AbstractJDBCConfigurationStore
     @Override
     public MessageStore getMessageStore()
     {
-        return _messageStore;
+        return _providedMessageStore;
     }
 
     @Override
@@ -185,7 +185,7 @@ public class DerbyConfigurationStore extends AbstractJDBCConfigurationStore
         return LOGGER;
     }
 
-    private class MessageStoreWrapper extends AbstractDerbyMessageStore
+    private class ProvidedMessageStore extends AbstractDerbyMessageStore
     {
         @Override
         protected void doOpen(final ConfiguredObject<?> parent, final Map<String, Object> messageStoreSettings)
diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
index 7bafe5a859..6e707b5f3b 100644
--- a/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
+++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
@@ -52,7 +52,7 @@ public class GenericJDBCConfigurationStore extends AbstractJDBCConfigurationStor
     public static final String JDBC_BLOB_TYPE = "blobType";
 
     private final AtomicBoolean _configurationStoreOpen = new AtomicBoolean();
-    private final MessageStore _messageStoreFacade = new MessageStoreWrapper();
+    private final MessageStore _providedMessageStore = new ProvidedMessageStore();
 
     protected String _connectionURL;
     private ConnectionProvider _connectionProvider;
@@ -222,10 +222,10 @@ public class GenericJDBCConfigurationStore extends AbstractJDBCConfigurationStor
     @Override
     public MessageStore getMessageStore()
     {
-        return _messageStoreFacade;
+        return _providedMessageStore;
     }
 
-    private class MessageStoreWrapper extends GenericAbstractJDBCMessageStore
+    private class ProvidedMessageStore extends GenericAbstractJDBCMessageStore
     {
         @Override
         protected void doOpen(final ConfiguredObject<?> parent, final Map<String, Object> messageStoreSettings)