You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2013/07/02 17:26:43 UTC
svn commit: r1498976 [2/2] - in /qpid/trunk/qpid/java:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/...
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java?rev=1498976&r1=1498975&r2=1498976&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/DurableConfigurationStoreTest.java Tue Jul 2 15:26:42 2013
@@ -21,9 +21,8 @@
package org.apache.qpid.server.store;
import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyMap;
import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.isA;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -32,7 +31,6 @@ import static org.mockito.Mockito.when;
import static org.mockito.Mockito.times;
import java.io.File;
-import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -48,13 +46,12 @@ import org.apache.qpid.server.logging.Sy
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.actors.TestLogActor;
import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.model.LifetimePolicy;
+import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.MockStoredMessage;
-import org.apache.qpid.server.store.ConfigurationRecoveryHandler.BindingRecoveryHandler;
-import org.apache.qpid.server.store.ConfigurationRecoveryHandler.ExchangeRecoveryHandler;
-import org.apache.qpid.server.store.ConfigurationRecoveryHandler.QueueRecoveryHandler;
import org.apache.qpid.server.store.MessageStoreRecoveryHandler.StoredMessageRecoveryHandler;
import org.apache.qpid.server.store.Transaction.Record;
import org.apache.qpid.server.store.derby.DerbyMessageStore;
@@ -71,9 +68,6 @@ public class DurableConfigurationStoreTe
private VirtualHost _virtualHost;
private ConfigurationRecoveryHandler _recoveryHandler;
- private QueueRecoveryHandler _queueRecoveryHandler;
- private ExchangeRecoveryHandler _exchangeRecoveryHandler;
- private BindingRecoveryHandler _bindingRecoveryHandler;
private MessageStoreRecoveryHandler _messageStoreRecoveryHandler;
private StoredMessageRecoveryHandler _storedMessageRecoveryHandler;
private TransactionLogRecoveryHandler _logRecoveryHandler;
@@ -101,9 +95,6 @@ public class DurableConfigurationStoreTe
setTestSystemProperty("QPID_WORK", TMP_FOLDER);
_configuration = mock(Configuration.class);
_recoveryHandler = mock(ConfigurationRecoveryHandler.class);
- _queueRecoveryHandler = mock(QueueRecoveryHandler.class);
- _exchangeRecoveryHandler = mock(ExchangeRecoveryHandler.class);
- _bindingRecoveryHandler = mock(BindingRecoveryHandler.class);
_storedMessageRecoveryHandler = mock(StoredMessageRecoveryHandler.class);
_logRecoveryHandler = mock(TransactionLogRecoveryHandler.class);
_messageStoreRecoveryHandler = mock(MessageStoreRecoveryHandler.class);
@@ -112,9 +103,6 @@ public class DurableConfigurationStoreTe
_virtualHost = mock(VirtualHost.class);
when(_messageStoreRecoveryHandler.begin()).thenReturn(_storedMessageRecoveryHandler);
- when(_recoveryHandler.begin(isA(MessageStore.class))).thenReturn(_exchangeRecoveryHandler);
- when(_exchangeRecoveryHandler.completeExchangeRecovery()).thenReturn(_queueRecoveryHandler);
- when(_queueRecoveryHandler.completeQueueRecovery()).thenReturn(_bindingRecoveryHandler);
when(_logRecoveryHandler.begin(any(MessageStore.class))).thenReturn(_queueEntryRecoveryHandler);
when(_queueEntryRecoveryHandler.completeQueueEntryRecovery()).thenReturn(_dtxRecordRecoveryHandler);
when(_exchange.getNameShortString()).thenReturn(AMQShortString.valueOf(EXCHANGE_NAME));
@@ -140,21 +128,44 @@ public class DurableConfigurationStoreTe
public void testCreateExchange() throws Exception
{
Exchange exchange = createTestExchange();
- _configStore.createExchange(exchange);
+ DurableConfigurationStoreHelper.createExchange(_configStore, exchange);
reopenStore();
- verify(_exchangeRecoveryHandler).exchange(_exchangeId, getName(), getName() + "Type", true);
+ verify(_recoveryHandler).configuredObject(eq(_exchangeId), eq(org.apache.qpid.server.model.Exchange.class.getName()),
+ eq(map( org.apache.qpid.server.model.Exchange.NAME, getName(),
+ org.apache.qpid.server.model.Exchange.TYPE, getName()+"Type",
+ org.apache.qpid.server.model.Exchange.LIFETIME_POLICY, LifetimePolicy.AUTO_DELETE.toString())));
+ }
+
+ private Map<String,Object> map(Object... vals)
+ {
+ Map<String,Object> map = new HashMap<String, Object>();
+ boolean isValue = false;
+ String key = null;
+ for(Object obj : vals)
+ {
+ if(isValue)
+ {
+ map.put(key,obj);
+ }
+ else
+ {
+ key = (String) obj;
+ }
+ isValue = !isValue;
+ }
+ return map;
}
public void testRemoveExchange() throws Exception
{
Exchange exchange = createTestExchange();
- _configStore.createExchange(exchange);
+ DurableConfigurationStoreHelper.createExchange(_configStore, exchange);
- _configStore.removeExchange(exchange);
+ DurableConfigurationStoreHelper.removeExchange(_configStore, exchange);
reopenStore();
- verify(_exchangeRecoveryHandler, never()).exchange(any(UUID.class), anyString(), anyString(), anyBoolean());
+ verify(_recoveryHandler, never()).configuredObject(any(UUID.class), anyString(), anyMap());
}
public void testBindQueue() throws Exception
@@ -162,13 +173,18 @@ public class DurableConfigurationStoreTe
AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false);
Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
_exchange, FieldTable.convertToMap(_bindingArgs));
- _configStore.bindQueue(binding);
+ DurableConfigurationStoreHelper.createBinding(_configStore, binding);
reopenStore();
- ByteBuffer argsAsBytes = ByteBuffer.wrap(_bindingArgs.getDataAsBytes());
+ Map<String,Object> map = new HashMap<String, Object>();
+ map.put(org.apache.qpid.server.model.Binding.EXCHANGE, _exchange.getId().toString());
+ map.put(org.apache.qpid.server.model.Binding.QUEUE, queue.getId().toString());
+ map.put(org.apache.qpid.server.model.Binding.NAME, ROUTING_KEY);
+ map.put(org.apache.qpid.server.model.Binding.ARGUMENTS,FieldTable.convertToMap(_bindingArgs));
- verify(_bindingRecoveryHandler).binding(binding.getId(), _exchange.getId(), queue.getId(), ROUTING_KEY, argsAsBytes);
+ verify(_recoveryHandler).configuredObject(eq(binding.getId()), eq(org.apache.qpid.server.model.Binding.class.getName()),
+ eq(map));
}
public void testUnbindQueue() throws Exception
@@ -176,22 +192,27 @@ public class DurableConfigurationStoreTe
AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false);
Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
_exchange, FieldTable.convertToMap(_bindingArgs));
- _configStore.bindQueue(binding);
+ DurableConfigurationStoreHelper.createBinding(_configStore, binding);
- _configStore.unbindQueue(binding);
+ DurableConfigurationStoreHelper.removeBinding(_configStore, binding);
reopenStore();
- verify(_bindingRecoveryHandler, never()).binding(any(UUID.class), any(UUID.class), any(UUID.class), anyString(),
- isA(ByteBuffer.class));
+ verify(_recoveryHandler, never()).configuredObject(any(UUID.class),
+ eq(org.apache.qpid.server.model.Binding.class.getName()),
+ anyMap());
}
public void testCreateQueueAMQQueue() throws Exception
{
AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true);
- _configStore.createQueue(queue);
+ DurableConfigurationStoreHelper.createQueue(_configStore, queue, null);
reopenStore();
- verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", true, null, null);
+ Map<String, Object> queueAttributes = new HashMap<String, Object>();
+ queueAttributes.put(Queue.NAME, getName());
+ queueAttributes.put(Queue.OWNER, getName()+"Owner");
+ queueAttributes.put(Queue.EXCLUSIVE, Boolean.TRUE);
+ verify(_recoveryHandler).configuredObject(eq(_queueId), eq(Queue.class.getName()), eq(queueAttributes));
}
public void testCreateQueueAMQQueueFieldTable() throws Exception
@@ -202,10 +223,19 @@ public class DurableConfigurationStoreTe
attributes.put("x-qpid-maximum-delivery-count", new Integer(10));
FieldTable arguments = FieldTable.convertToFieldTable(attributes);
- _configStore.createQueue(queue, arguments);
+ DurableConfigurationStoreHelper.createQueue(_configStore, queue, arguments);
reopenStore();
- verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", true, arguments, null);
+
+
+ Map<String,Object> queueAttributes = new HashMap<String, Object>();
+
+ queueAttributes.put(Queue.NAME, getName());
+ queueAttributes.put(Queue.OWNER, getName()+"Owner");
+ queueAttributes.put(Queue.EXCLUSIVE, Boolean.TRUE);
+ queueAttributes.put(Queue.ARGUMENTS, attributes);
+
+ verify(_recoveryHandler).configuredObject(eq(_queueId), eq(Queue.class.getName()), eq(queueAttributes));
}
public void testCreateQueueAMQQueueWithAlternateExchange() throws Exception
@@ -213,10 +243,17 @@ public class DurableConfigurationStoreTe
Exchange alternateExchange = createTestAlternateExchange();
AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, alternateExchange);
- _configStore.createQueue(queue);
+ DurableConfigurationStoreHelper.createQueue(_configStore, queue, null);
reopenStore();
- verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", true, null, alternateExchange.getId());
+
+ Map<String, Object> queueAttributes = new HashMap<String, Object>();
+ queueAttributes.put(Queue.NAME, getName());
+ queueAttributes.put(Queue.OWNER, getName()+"Owner");
+ queueAttributes.put(Queue.EXCLUSIVE, Boolean.TRUE);
+ queueAttributes.put(Queue.ALTERNATE_EXCHANGE, alternateExchange.getId().toString());
+
+ verify(_recoveryHandler).configuredObject(eq(_queueId), eq(Queue.class.getName()), eq(queueAttributes));
}
private Exchange createTestAlternateExchange()
@@ -235,14 +272,25 @@ public class DurableConfigurationStoreTe
attributes.put("x-qpid-dlq-enabled", Boolean.TRUE);
attributes.put("x-qpid-maximum-delivery-count", new Integer(10));
FieldTable arguments = FieldTable.convertToFieldTable(attributes);
- _configStore.createQueue(queue, arguments);
+ DurableConfigurationStoreHelper.createQueue(_configStore, queue, arguments);
// update the queue to have exclusive=false
queue = createTestQueue(getName(), getName() + "Owner", false);
- _configStore.updateQueue(queue);
+ when(queue.getArguments()).thenReturn(attributes);
+
+ DurableConfigurationStoreHelper.updateQueue(_configStore, queue);
reopenStore();
- verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", false, arguments, null);
+
+ Map<String,Object> queueAttributes = new HashMap<String, Object>();
+
+ queueAttributes.put(Queue.NAME, getName());
+ queueAttributes.put(Queue.OWNER, getName()+"Owner");
+ queueAttributes.put(Queue.EXCLUSIVE, Boolean.FALSE);
+ queueAttributes.put(Queue.ARGUMENTS, attributes);
+
+ verify(_recoveryHandler).configuredObject(eq(_queueId), eq(Queue.class.getName()), eq(queueAttributes));
+
}
public void testUpdateQueueAlternateExchange() throws Exception
@@ -253,15 +301,26 @@ public class DurableConfigurationStoreTe
attributes.put("x-qpid-dlq-enabled", Boolean.TRUE);
attributes.put("x-qpid-maximum-delivery-count", new Integer(10));
FieldTable arguments = FieldTable.convertToFieldTable(attributes);
- _configStore.createQueue(queue, arguments);
+ DurableConfigurationStoreHelper.createQueue(_configStore, queue, arguments);
// update the queue to have exclusive=false
Exchange alternateExchange = createTestAlternateExchange();
queue = createTestQueue(getName(), getName() + "Owner", false, alternateExchange);
- _configStore.updateQueue(queue);
+ when(queue.getArguments()).thenReturn(attributes);
+
+ DurableConfigurationStoreHelper.updateQueue(_configStore, queue);
reopenStore();
- verify(_queueRecoveryHandler).queue(_queueId, getName(), getName() + "Owner", false, arguments, alternateExchange.getId());
+
+ Map<String,Object> queueAttributes = new HashMap<String, Object>();
+
+ queueAttributes.put(Queue.NAME, getName());
+ queueAttributes.put(Queue.OWNER, getName()+"Owner");
+ queueAttributes.put(Queue.EXCLUSIVE, Boolean.FALSE);
+ queueAttributes.put(Queue.ARGUMENTS, attributes);
+ queueAttributes.put(Queue.ALTERNATE_EXCHANGE, alternateExchange.getId().toString());
+
+ verify(_recoveryHandler).configuredObject(eq(_queueId), eq(Queue.class.getName()), eq(queueAttributes));
}
public void testRemoveQueue() throws Exception
@@ -272,13 +331,14 @@ public class DurableConfigurationStoreTe
attributes.put("x-qpid-dlq-enabled", Boolean.TRUE);
attributes.put("x-qpid-maximum-delivery-count", new Integer(10));
FieldTable arguments = FieldTable.convertToFieldTable(attributes);
- _configStore.createQueue(queue, arguments);
+ DurableConfigurationStoreHelper.createQueue(_configStore, queue, arguments);
// remove queue
- _configStore.removeQueue(queue);
+ DurableConfigurationStoreHelper.removeQueue(_configStore,queue);
reopenStore();
- verify(_queueRecoveryHandler, never()).queue(any(UUID.class), anyString(), anyString(), anyBoolean(),
- any(FieldTable.class), any(UUID.class));
+ verify(_recoveryHandler, never()).configuredObject(any(UUID.class),
+ eq(org.apache.qpid.server.model.Queue.class.getName()),
+ anyMap());
}
private AMQQueue createTestQueue(String queueName, String queueOwner, boolean exclusive) throws AMQStoreException
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=1498976&r1=1498975&r2=1498976&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java Tue Jul 2 15:26:42 2013
@@ -346,7 +346,8 @@ public class MessageStoreTest extends Qp
1, queueRegistry.getQueues().size());
//test that removing the queue means it is not recovered next time
- getVirtualHost().getDurableConfigurationStore().removeQueue(queueRegistry.getQueue(durableQueueName));
+ final AMQQueue queue = queueRegistry.getQueue(durableQueueName);
+ DurableConfigurationStoreHelper.removeQueue(getVirtualHost().getDurableConfigurationStore(),queue);
reloadVirtualHost();
@@ -399,7 +400,8 @@ public class MessageStoreTest extends Qp
origExchangeCount + 1, exchangeRegistry.getExchangeNames().size());
//test that removing the exchange means it is not recovered next time
- getVirtualHost().getDurableConfigurationStore().removeExchange(exchangeRegistry.getExchange(directExchangeName));
+ final Exchange exchange = exchangeRegistry.getExchange(directExchangeName);
+ DurableConfigurationStoreHelper.removeExchange(getVirtualHost().getDurableConfigurationStore(), exchange);
reloadVirtualHost();
@@ -755,7 +757,9 @@ public class MessageStoreTest extends Qp
if (queue.isDurable() && !queue.isAutoDelete())
{
- getVirtualHost().getDurableConfigurationStore().createQueue(queue, queueArguments);
+ DurableConfigurationStoreHelper.createQueue(getVirtualHost().getDurableConfigurationStore(),
+ queue,
+ queueArguments);
}
}
catch (AMQException e)
@@ -799,7 +803,8 @@ public class MessageStoreTest extends Qp
getVirtualHost().getExchangeRegistry().registerExchange(exchange);
if (durable)
{
- getVirtualHost().getDurableConfigurationStore().createExchange(exchange);
+ DurableConfigurationStoreHelper.createExchange(getVirtualHost().getDurableConfigurationStore(),
+ exchange);
}
}
catch (AMQException e)
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java?rev=1498976&r1=1498975&r2=1498976&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java Tue Jul 2 15:26:42 2013
@@ -26,18 +26,12 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.store.ConfigurationRecoveryHandler.BindingRecoveryHandler;
-import org.apache.qpid.server.store.ConfigurationRecoveryHandler.ExchangeRecoveryHandler;
-import org.apache.qpid.server.store.ConfigurationRecoveryHandler.QueueRecoveryHandler;
import org.apache.qpid.server.store.MessageStoreRecoveryHandler.StoredMessageRecoveryHandler;
import org.apache.qpid.test.utils.QpidTestCase;
public abstract class MessageStoreTestCase extends QpidTestCase
{
private ConfigurationRecoveryHandler _recoveryHandler;
- private QueueRecoveryHandler _queueRecoveryHandler;
- private ExchangeRecoveryHandler _exchangeRecoveryHandler;
- private BindingRecoveryHandler _bindingRecoveryHandler;
private MessageStoreRecoveryHandler _messageStoreRecoveryHandler;
private StoredMessageRecoveryHandler _storedMessageRecoveryHandler;
private TransactionLogRecoveryHandler _logRecoveryHandler;
@@ -52,9 +46,6 @@ public abstract class MessageStoreTestCa
super.setUp();
_recoveryHandler = mock(ConfigurationRecoveryHandler.class);
- _queueRecoveryHandler = mock(QueueRecoveryHandler.class);
- _exchangeRecoveryHandler = mock(ExchangeRecoveryHandler.class);
- _bindingRecoveryHandler = mock(BindingRecoveryHandler.class);
_storedMessageRecoveryHandler = mock(StoredMessageRecoveryHandler.class);
_logRecoveryHandler = mock(TransactionLogRecoveryHandler.class);
_messageStoreRecoveryHandler = mock(MessageStoreRecoveryHandler.class);
@@ -63,9 +54,6 @@ public abstract class MessageStoreTestCa
_virtualHost = mock(VirtualHost.class);
when(_messageStoreRecoveryHandler.begin()).thenReturn(_storedMessageRecoveryHandler);
- when(_recoveryHandler.begin(isA(MessageStore.class))).thenReturn(_exchangeRecoveryHandler);
- when(_exchangeRecoveryHandler.completeExchangeRecovery()).thenReturn(_queueRecoveryHandler);
- when(_queueRecoveryHandler.completeQueueRecovery()).thenReturn(_bindingRecoveryHandler);
when(_logRecoveryHandler.begin(any(MessageStore.class))).thenReturn(_queueEntryRecoveryHandler);
when(_queueEntryRecoveryHandler.completeQueueEntryRecovery()).thenReturn(_dtxRecordRecoveryHandler);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java?rev=1498976&r1=1498975&r2=1498976&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/QuotaMessageStore.java Tue Jul 2 15:26:42 2013
@@ -28,7 +28,8 @@ import org.apache.qpid.server.message.En
import org.apache.qpid.server.message.MessageContentSource;
import org.apache.qpid.server.model.VirtualHost;
-public class QuotaMessageStore extends NullMessageStore
+public class
+ QuotaMessageStore extends NullMessageStore
{
private final AtomicLong _messageId = new AtomicLong(1);
private final AtomicBoolean _closed = new AtomicBoolean(false);
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=1498976&r1=1498975&r2=1498976&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java Tue Jul 2 15:26:42 2013
@@ -22,16 +22,13 @@ package org.apache.qpid.server.store;
import java.util.Collections;
import java.util.Map;
+import java.util.UUID;
import org.apache.log4j.Logger;
import org.apache.qpid.AMQStoreException;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.binding.Binding;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.message.EnqueableMessage;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.queue.AMQQueue;
import java.nio.ByteBuffer;
import java.util.HashMap;
@@ -176,51 +173,28 @@ public class SlowMessageStore implements
}
- public void createExchange(Exchange exchange) throws AMQStoreException
- {
- doPreDelay("createExchange");
- _durableConfigurationStore.createExchange(exchange);
- doPostDelay("createExchange");
- }
-
- public void removeExchange(Exchange exchange) throws AMQStoreException
- {
- doPreDelay("removeExchange");
- _durableConfigurationStore.removeExchange(exchange);
- doPostDelay("removeExchange");
- }
-
- public void bindQueue(Binding binding) throws AMQStoreException
- {
- doPreDelay("bindQueue");
- _durableConfigurationStore.bindQueue(binding);
- doPostDelay("bindQueue");
- }
-
- public void unbindQueue(Binding binding) throws AMQStoreException
- {
- doPreDelay("unbindQueue");
- _durableConfigurationStore.unbindQueue(binding);
- doPostDelay("unbindQueue");
- }
-
- public void createQueue(AMQQueue queue) throws AMQStoreException
+ @Override
+ public void create(UUID id, String type, Map<String, Object> attributes) throws AMQStoreException
{
- createQueue(queue, null);
+ doPreDelay("create");
+ _durableConfigurationStore.create(id, type, attributes);
+ doPostDelay("create");
}
- public void createQueue(AMQQueue queue, FieldTable arguments) throws AMQStoreException
+ @Override
+ public void remove(UUID id, String type) throws AMQStoreException
{
- doPreDelay("createQueue");
- _durableConfigurationStore.createQueue(queue, arguments);
- doPostDelay("createQueue");
+ doPreDelay("remove");
+ _durableConfigurationStore.remove(id, type);
+ doPostDelay("remove");
}
- public void removeQueue(AMQQueue queue) throws AMQStoreException
+ @Override
+ public void update(UUID id, String type, Map<String, Object> attributes) throws AMQStoreException
{
- doPreDelay("removeQueue");
- _durableConfigurationStore.removeQueue(queue);
- doPostDelay("removeQueue");
+ doPreDelay("update");
+ _durableConfigurationStore.update(id, type, attributes);
+ doPostDelay("update");
}
public Transaction newTransaction()
@@ -314,13 +288,6 @@ public class SlowMessageStore implements
}
}
- public void updateQueue(AMQQueue queue) throws AMQStoreException
- {
- doPreDelay("updateQueue");
- _durableConfigurationStore.updateQueue(queue);
- doPostDelay("updateQueue");
- }
-
@Override
public void activate() throws Exception
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org