Author: kwall
Date: Wed Jun 18 20:53:43 2014
New Revision: 1603627
URL: http://svn.apache.org/r1603627
Log:
QPID-5800: [Java Broker] Refactor Derby/JDBC message store implementations -
Address review comments from Alex Rudyy
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java?rev=1603627&r1=1603626&r2=1603627&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
Wed Jun 18 20:53:43 2014
@@ -196,8 +196,9 @@ public abstract class AbstractJDBCMessag
}
- private void upgradeFromV7()
+ private void upgradeFromV7() throws SQLException
{
+ updateDbVersion(8);
}
private void upgradeFromV6() throws SQLException
Modified:
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java?rev=1603627&r1=1603626&r2=1603627&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
Wed Jun 18 20:53:43 2014
@@ -47,7 +47,7 @@ public class DerbyConfigurationStore ext
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 ext
@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 ext
@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 ext
@Override
public MessageStore getMessageStore()
{
- return _messageStore;
+ return _providedMessageStore;
}
@Override
@@ -185,7 +185,7 @@ public class DerbyConfigurationStore ext
return LOGGER;
}
- private class MessageStoreWrapper extends AbstractDerbyMessageStore
+ private class ProvidedMessageStore extends AbstractDerbyMessageStore
{
@Override
protected void doOpen(final ConfiguredObject<?> parent, final
Map<String, Object> messageStoreSettings)
Modified:
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java?rev=1603627&r1=1603626&r2=1603627&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/GenericJDBCConfigurationStore.java
Wed Jun 18 20:53:43 2014
@@ -52,7 +52,7 @@ public class GenericJDBCConfigurationSto
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 GenericJDBCConfigurationSto
@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)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
