diff options
Diffstat (limited to 'qpid/java/broker-core')
17 files changed, 62 insertions, 61 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/EnqueueableMessage.java index 7be91ad0ca..ef1d12b46a 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/EnqueableMessage.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/EnqueueableMessage.java @@ -22,7 +22,7 @@ package org.apache.qpid.server.message; import org.apache.qpid.server.store.StoredMessage; -public interface EnqueableMessage +public interface EnqueueableMessage { long getMessageNumber(); boolean isPersistent(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java index a4c461570f..28491edaba 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/ServerMessage.java @@ -25,7 +25,7 @@ import org.apache.qpid.server.store.StoredMessage; import java.nio.ByteBuffer; -public interface ServerMessage<T extends StorableMessageMetaData> extends EnqueableMessage, MessageContentSource +public interface ServerMessage<T extends StorableMessageMetaData> extends EnqueueableMessage, MessageContentSource { String getRoutingKey(); 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 bc005b8de3..e490ac38c1 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 @@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.log4j.Logger; import org.apache.qpid.AMQException; import org.apache.qpid.AMQStoreException; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.plugin.MessageMetaDataType; import org.apache.qpid.server.queue.AMQQueue; @@ -1358,7 +1358,7 @@ abstract public class AbstractJDBCMessageStore implements MessageStore, DurableC } } - private static class RecordImpl implements Transaction.Record, TransactionLogResource, EnqueableMessage + private static class RecordImpl implements Transaction.Record, TransactionLogResource, EnqueueableMessage { private long _messageNumber; @@ -1377,7 +1377,7 @@ abstract public class AbstractJDBCMessageStore implements MessageStore, DurableC } @Override - public EnqueableMessage getMessage() + public EnqueueableMessage getMessage() { return this; } @@ -1655,7 +1655,7 @@ abstract public class AbstractJDBCMessageStore implements MessageStore, DurableC } @Override - public void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException + public void enqueueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException { final StoredMessage storedMessage = message.getStoredMessage(); if(storedMessage instanceof StoredJDBCMessage) @@ -1674,7 +1674,7 @@ abstract public class AbstractJDBCMessageStore implements MessageStore, DurableC } @Override - public void dequeueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException + public void dequeueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException { AbstractJDBCMessageStore.this.dequeueMessage(_connWrapper, queue, message.getMessageNumber()); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java index 3abf083026..8aead75c5b 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractMemoryMessageStore.java @@ -23,7 +23,7 @@ package org.apache.qpid.server.store; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import org.apache.qpid.AMQStoreException; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.model.VirtualHost; /** A simple message store that stores the messages in a thread-safe structure in memory. */ @@ -41,12 +41,12 @@ abstract public class AbstractMemoryMessageStore extends NullMessageStore } @Override - public void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException + public void enqueueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException { } @Override - public void dequeueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException + public void dequeueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException { } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java index ed6b89e373..66bcfff32b 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/Transaction.java @@ -21,7 +21,7 @@ package org.apache.qpid.server.store; import org.apache.qpid.AMQStoreException; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; public interface Transaction { @@ -34,7 +34,7 @@ public interface Transaction * @param message * @throws org.apache.qpid.AMQStoreException If the operation fails for any reason. */ - void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException; + void enqueueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException; /** * Extracts a message from a specified queue, in a given transactional context. @@ -43,7 +43,7 @@ public interface Transaction * @param message The message to dequeue. * @throws AMQStoreException If the operation fails for any reason, or if the specified message does not exist. */ - void dequeueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException; + void dequeueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException; /** @@ -71,7 +71,7 @@ public interface Transaction public static interface Record { TransactionLogResource getQueue(); - EnqueableMessage getMessage(); + EnqueueableMessage getMessage(); } void removeXid(long format, byte[] globalId, byte[] branchId) throws AMQStoreException; diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java index 31e4dc6def..8eb794c102 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java @@ -24,7 +24,7 @@ import org.apache.log4j.Logger; import org.apache.qpid.AMQException; import org.apache.qpid.AMQStoreException; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.queue.QueueEntry; @@ -88,7 +88,7 @@ public class AsyncAutoCommitTransaction implements ServerTransaction } - public void dequeue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction) + public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction) { Transaction txn = null; try @@ -210,7 +210,7 @@ public class AsyncAutoCommitTransaction implements ServerTransaction } - public void enqueue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction) + public void enqueue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction) { Transaction txn = null; try @@ -248,7 +248,7 @@ public class AsyncAutoCommitTransaction implements ServerTransaction } - public void enqueue(List<? extends BaseQueue> queues, EnqueableMessage message, Action postTransactionAction) + public void enqueue(List<? extends BaseQueue> queues, EnqueueableMessage message, Action postTransactionAction) { Transaction txn = null; try diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java index b081641f47..b057998456 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java @@ -24,7 +24,7 @@ import org.apache.log4j.Logger; import org.apache.qpid.AMQException; import org.apache.qpid.AMQStoreException; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.queue.QueueEntry; @@ -73,7 +73,7 @@ public class AutoCommitTransaction implements ServerTransaction immediateAction.postCommit(); } - public void dequeue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction) + public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction) { Transaction txn = null; try @@ -152,7 +152,7 @@ public class AutoCommitTransaction implements ServerTransaction } - public void enqueue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction) + public void enqueue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction) { Transaction txn = null; try @@ -185,7 +185,7 @@ public class AutoCommitTransaction implements ServerTransaction } - public void enqueue(List<? extends BaseQueue> queues, EnqueableMessage message, Action postTransactionAction) + public void enqueue(List<? extends BaseQueue> queues, EnqueueableMessage message, Action postTransactionAction) { Transaction txn = null; try diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java index ab987f0fb9..30a27c5049 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DistributedTransaction.java @@ -21,7 +21,7 @@ package org.apache.qpid.server.txn; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.queue.QueueEntry; @@ -74,7 +74,7 @@ public class DistributedTransaction implements ServerTransaction } } - public void dequeue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction) + public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction) { if(_branch != null) { @@ -103,7 +103,7 @@ public class DistributedTransaction implements ServerTransaction } } - public void enqueue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction) + public void enqueue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction) { if(_branch != null) { @@ -117,7 +117,7 @@ public class DistributedTransaction implements ServerTransaction } } - public void enqueue(List<? extends BaseQueue> queues, EnqueableMessage message, + public void enqueue(List<? extends BaseQueue> queues, EnqueueableMessage message, Action postTransactionAction) { if(_branch != null) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java index fb32b654ce..f3f18c7c5d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java @@ -29,7 +29,7 @@ import java.util.concurrent.ScheduledFuture; import org.apache.log4j.Logger; import org.apache.qpid.AMQStoreException; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.store.MessageStore; @@ -356,13 +356,13 @@ public class DtxBranch } - public void dequeue(BaseQueue queue, EnqueableMessage message) + public void dequeue(BaseQueue queue, EnqueueableMessage message) { _dequeueRecords.add(new Record(queue, message)); } - public void enqueue(BaseQueue queue, EnqueableMessage message) + public void enqueue(BaseQueue queue, EnqueueableMessage message) { _enqueueRecords.add(new Record(queue, message)); } @@ -370,9 +370,9 @@ public class DtxBranch private static final class Record implements Transaction.Record { private final BaseQueue _queue; - private final EnqueableMessage _message; + private final EnqueueableMessage _message; - public Record(BaseQueue queue, EnqueableMessage message) + public Record(BaseQueue queue, EnqueueableMessage message) { _queue = queue; _message = message; @@ -383,7 +383,7 @@ public class DtxBranch return _queue; } - public EnqueableMessage getMessage() + public EnqueueableMessage getMessage() { return _message; } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java index 23265199c7..81aabc6bd3 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/LocalTransaction.java @@ -20,12 +20,12 @@ */ package org.apache.qpid.server.txn; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.store.StoreFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.AMQException; -import org.apache.qpid.server.message.EnqueableMessage; import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.queue.QueueEntry; @@ -91,7 +91,7 @@ public class LocalTransaction implements ServerTransaction _postTransactionActions.add(postTransactionAction); } - public void dequeue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction) + public void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction) { sync(); _postTransactionActions.add(postTransactionAction); @@ -195,7 +195,7 @@ public class LocalTransaction implements ServerTransaction } } - public void enqueue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction) + public void enqueue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction) { sync(); _postTransactionActions.add(postTransactionAction); @@ -222,7 +222,7 @@ public class LocalTransaction implements ServerTransaction } } - public void enqueue(List<? extends BaseQueue> queues, EnqueableMessage message, Action postTransactionAction) + public void enqueue(List<? extends BaseQueue> queues, EnqueueableMessage message, Action postTransactionAction) { sync(); _postTransactionActions.add(postTransactionAction); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java index 8acac00479..240ad154ba 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/ServerTransaction.java @@ -22,7 +22,8 @@ package org.apache.qpid.server.txn; import java.util.Collection; import java.util.List; -import org.apache.qpid.server.message.EnqueableMessage; + +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.queue.QueueEntry; @@ -78,7 +79,7 @@ public interface ServerTransaction * * A store operation will result only for a persistent message on a durable queue. */ - void dequeue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction); + void dequeue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction); /** * Dequeue a message(s) from queue(s) registering a post transaction action. @@ -92,14 +93,14 @@ public interface ServerTransaction * * A store operation will result only for a persistent message on a durable queue. */ - void enqueue(BaseQueue queue, EnqueableMessage message, Action postTransactionAction); + void enqueue(BaseQueue queue, EnqueueableMessage message, Action postTransactionAction); /** * Enqueue a message(s) to queue(s) registering a post transaction action. * * Store operations will result only for a persistent messages on durable queues. */ - void enqueue(List<? extends BaseQueue> queues, EnqueableMessage message, Action postTransactionAction); + void enqueue(List<? extends BaseQueue> queues, EnqueueableMessage message, Action postTransactionAction); /** * Commit the transaction represented by this object. diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java index d345148e5e..21483e33cb 100755 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostConfigRecoveryHandler.java @@ -33,7 +33,7 @@ import org.apache.qpid.server.exchange.ExchangeRegistry; import org.apache.qpid.server.logging.actors.CurrentActor; import org.apache.qpid.server.logging.messages.TransactionLogMessages; import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.message.MessageReference; import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.queue.AMQQueue; @@ -343,7 +343,7 @@ public class VirtualHostConfigRecoveryHandler implements return this; } - private static class DummyMessage implements EnqueableMessage + private static class DummyMessage implements EnqueueableMessage { diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java index fd8148f2ce..3dfe057285 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java @@ -40,7 +40,7 @@ import org.apache.qpid.AMQStoreException; import org.apache.qpid.common.AMQPFilterTypes; 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.EnqueueableMessage; import org.apache.qpid.server.model.LifetimePolicy; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.UUIDGenerator; @@ -441,7 +441,7 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest UUID queueId1 = UUIDGenerator.generateRandomUUID(); TransactionLogResource queue1 = mock(TransactionLogResource.class); when(queue1.getId()).thenReturn(queueId1); - EnqueableMessage message1 = mock(EnqueableMessage.class); + EnqueueableMessage message1 = mock(EnqueueableMessage.class); when(message1.isPersistent()).thenReturn(true); when(message1.getMessageNumber()).thenReturn(messageNumber); final StoredMessage storedMessage = mock(StoredMessage.class); @@ -454,9 +454,9 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest private static class TestRecord implements Record { private TransactionLogResource _queue; - private EnqueableMessage _message; + private EnqueueableMessage _message; - public TestRecord(TransactionLogResource queue, EnqueableMessage message) + public TestRecord(TransactionLogResource queue, EnqueueableMessage message) { super(); _queue = queue; @@ -470,7 +470,7 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest } @Override - public EnqueableMessage getMessage() + public EnqueueableMessage getMessage() { return _message; } diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java index 6b6d62378e..121c380736 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.UUID; import org.apache.log4j.Logger; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.util.FileUtils; @@ -99,10 +99,10 @@ public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase imple { Transaction transaction = _store.newTransaction(); - List<EnqueableMessage> messages = new ArrayList<EnqueableMessage>(); + List<EnqueueableMessage> messages = new ArrayList<EnqueueableMessage>(); for (int i = 0; i < getNumberOfMessagesToFillStore(); i++) { - EnqueableMessage m = addMessage(i); + EnqueueableMessage m = addMessage(i); messages.add(m); transaction.enqueueMessage(this, m); } @@ -110,7 +110,7 @@ public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase imple assertEvent(1, Event.PERSISTENT_MESSAGE_SIZE_OVERFULL); - for (EnqueableMessage m : messages) + for (EnqueueableMessage m : messages) { m.getStoredMessage().remove(); } @@ -118,7 +118,7 @@ public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase imple assertEvent(2, Event.PERSISTENT_MESSAGE_SIZE_UNDERFULL); } - protected EnqueableMessage addMessage(long id) + protected EnqueueableMessage addMessage(long id) { StorableMessageMetaData metaData = createMetaData(id, MESSAGE_DATA.length); StoredMessage<?> handle = _store.addMessage(metaData); @@ -154,7 +154,7 @@ public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase imple return _transactionResource; } - private static class TestMessage implements EnqueableMessage + private static class TestMessage implements EnqueueableMessage { private final StoredMessage<?> _handle; private final long _messageId; diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java index bb3c0cf535..9dde7d26d0 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java @@ -21,7 +21,7 @@ package org.apache.qpid.server.store; import org.apache.qpid.AMQStoreException; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.queue.AMQQueue; import java.nio.ByteBuffer; @@ -56,13 +56,13 @@ public class TestableMemoryMessageStore extends TestMemoryMessageStore private class TestableTransaction implements Transaction { @Override - public void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException + public void enqueueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException { getMessages().put(message.getMessageNumber(), (AMQQueue)queue); } @Override - public void dequeueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException + public void dequeueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException { getMessages().remove(message.getMessageNumber()); } diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java index 5c1012d50b..693a1210e2 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.*; import java.util.Collections; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.queue.BaseQueue; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.StoreFuture; @@ -37,7 +37,7 @@ public class AsyncAutoCommitTransactionTest extends QpidTestCase private static final String STRICT_ORDER_SYSTEM_PROPERTY = AsyncAutoCommitTransaction.QPID_STRICT_ORDER_WITH_MIXED_DELIVERY_MODE; private FutureRecorder _futureRecorder = mock(FutureRecorder.class); - private EnqueableMessage _message = mock(EnqueableMessage.class); + private EnqueueableMessage _message = mock(EnqueueableMessage.class); private BaseQueue _queue = mock(BaseQueue.class); private MessageStore _messageStore = mock(MessageStore.class); private Transaction _storeTransaction = mock(Transaction.class); diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java index 0221f3d509..17955a8d52 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java @@ -22,7 +22,7 @@ package org.apache.qpid.server.txn; import org.apache.commons.lang.NotImplementedException; import org.apache.qpid.AMQStoreException; -import org.apache.qpid.server.message.EnqueableMessage; +import org.apache.qpid.server.message.EnqueueableMessage; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.NullMessageStore; import org.apache.qpid.server.store.StoreFuture; @@ -60,7 +60,7 @@ class MockStoreTransaction implements Transaction return _state; } - public void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException + public void enqueueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException { if (_throwExceptionOnQueueOp) { @@ -81,7 +81,7 @@ class MockStoreTransaction implements Transaction return _numberOfEnqueuedMessages; } - public void dequeueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException + public void dequeueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException { if (_throwExceptionOnQueueOp) { |