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 2014/02/27 00:27:43 UTC
svn commit: r1572343 [6/7] - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/binding/
broker-core/src/main/java/org/apache/qpid/server/consumer/
broker-core/src/main/java/org/apache/qpid/server/exchange/
broker-core/src/main/...
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java Wed Feb 26 23:27:39 2014
@@ -32,6 +32,7 @@ import static org.mockito.Mockito.when;
import java.util.*;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
@@ -41,6 +42,7 @@ import org.apache.qpid.server.message.AM
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.model.QueueNotificationListener;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.queue.AbstractQueue.QueueEntryFilter;
import org.apache.qpid.server.consumer.MockConsumer;
@@ -50,19 +52,19 @@ import org.apache.qpid.server.util.Broke
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.test.utils.QpidTestCase;
-abstract class AbstractQueueTestBase<E extends QueueEntryImpl<E,Q,L>, Q extends AbstractQueue<E,Q,L>, L extends QueueEntryListBase<E,Q,L>> extends QpidTestCase
+abstract class AbstractQueueTestBase extends QpidTestCase
{
private static final Logger _logger = Logger.getLogger(AbstractQueueTestBase.class);
- private Q _queue;
+ private AMQQueue<?> _queue;
private VirtualHost _virtualHost;
private String _qname = "qname";
private String _owner = "owner";
private String _routingKey = "routing key";
private DirectExchange _exchange;
private MockConsumer _consumerTarget = new MockConsumer();
- private QueueConsumer _consumer;
+ private QueueConsumer<?> _consumer;
private Map<String,Object> _arguments = Collections.emptyMap();
@Override
@@ -78,7 +80,7 @@ abstract class AbstractQueueTestBase<E e
attributes.put(Queue.NAME, _qname);
attributes.put(Queue.OWNER, _owner);
- _queue = (Q) _virtualHost.createQueue(attributes);
+ _queue = _virtualHost.createQueue(attributes);
_exchange = (DirectExchange) _virtualHost.getExchange(ExchangeDefaults.DIRECT_EXCHANGE_NAME);
}
@@ -106,7 +108,7 @@ abstract class AbstractQueueTestBase<E e
Map<String,Object> attributes = new HashMap<String, Object>(_arguments);
attributes.put(Queue.ID, UUIDGenerator.generateRandomUUID());
- _queue = (Q) _virtualHost.createQueue(attributes);
+ _queue = _virtualHost.createQueue(attributes);
assertNull("Queue was created", _queue);
}
catch (IllegalArgumentException e)
@@ -118,7 +120,7 @@ abstract class AbstractQueueTestBase<E e
Map<String,Object> attributes = new HashMap<String, Object>(_arguments);
attributes.put(Queue.ID, UUIDGenerator.generateRandomUUID());
attributes.put(Queue.NAME, "differentName");
- _queue = (Q) _virtualHost.createQueue(attributes);
+ _queue = _virtualHost.createQueue(attributes);
assertNotNull("Queue was not created", _queue);
}
@@ -138,12 +140,13 @@ abstract class AbstractQueueTestBase<E e
_exchange.isBound(_routingKey,_queue));
assertEquals("Exchange binding count", 1,
_queue.getBindings().size());
+ final BindingImpl firstBinding = _queue.getBindings().iterator().next();
assertEquals("Wrong exchange bound", _routingKey,
- _queue.getBindings().get(0).getBindingKey());
+ firstBinding.getBindingKey());
assertEquals("Wrong exchange bound", _exchange,
- _queue.getBindings().get(0).getExchangeImpl());
+ firstBinding.getExchange());
- _exchange.getBinding(_routingKey, _queue).delete();
+ _exchange.deleteBinding(_routingKey, _queue);
assertFalse("Routing key was still bound",
_exchange.isBound(_routingKey));
@@ -154,13 +157,13 @@ abstract class AbstractQueueTestBase<E e
ServerMessage messageA = createMessage(new Long(24));
// Check adding a consumer adds it to the queue
- _consumer = _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
+ _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
EnumSet.of(Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
assertEquals("Queue does not have consumer", 1,
_queue.getConsumerCount());
assertEquals("Queue does not have active consumer", 1,
- _queue.getActiveConsumerCount());
+ _queue.getConsumerCountWithCredit());
// Check sending a message ends up with the subscriber
_queue.enqueue(messageA, null);
@@ -179,7 +182,7 @@ abstract class AbstractQueueTestBase<E e
assertTrue("Consumer still had queue", _consumerTarget.isClosed());
assertFalse("Queue still has consumer", 1 == _queue.getConsumerCount());
assertFalse("Queue still has active consumer",
- 1 == _queue.getActiveConsumerCount());
+ 1 == _queue.getConsumerCountWithCredit());
ServerMessage messageB = createMessage(new Long (25));
_queue.enqueue(messageB, null);
@@ -191,7 +194,7 @@ abstract class AbstractQueueTestBase<E e
{
ServerMessage messageA = createMessage(new Long(24));
_queue.enqueue(messageA, null);
- _consumer = _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
+ _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
EnumSet.of(Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
Thread.sleep(150);
@@ -209,7 +212,7 @@ abstract class AbstractQueueTestBase<E e
ServerMessage messageB = createMessage(new Long(25));
_queue.enqueue(messageA, null);
_queue.enqueue(messageB, null);
- _consumer = _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
+ _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
EnumSet.of(Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
Thread.sleep(150);
@@ -230,7 +233,7 @@ abstract class AbstractQueueTestBase<E e
ServerMessage messageC = createMessage(new Long(26));
- _consumer = _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
+ _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
EnumSet.of(Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
@@ -270,14 +273,14 @@ abstract class AbstractQueueTestBase<E e
/**
* Tests that a released message that becomes expired is not resent to the subscriber.
- * This tests ensures that SimpleAMQQueueEntry.getNextAvailableEntry avoids expired entries.
+ * This tests ensures that SimpleAMQQueue<?>Entry.getNextAvailableEntry avoids expired entries.
* Verifies also that the QueueContext._releasedEntry is reset to null after the entry has been reset.
*/
public void testReleaseMessageThatBecomesExpiredIsNotRedelivered() throws Exception
{
ServerMessage messageA = createMessage(new Long(24));
- _consumer = _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
+ _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
EnumSet.of(Consumer.Option.SEES_REQUEUES,
Consumer.Option.ACQUIRES));
@@ -329,7 +332,7 @@ abstract class AbstractQueueTestBase<E e
ServerMessage messageB = createMessage(new Long(25));
ServerMessage messageC = createMessage(new Long(26));
- _consumer = _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
+ _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
EnumSet.of(Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
@@ -382,11 +385,11 @@ abstract class AbstractQueueTestBase<E e
MockConsumer target2 = new MockConsumer();
- QueueConsumer consumer1 = _queue.addConsumer(target1, null, messageA.getClass(), "test",
+ QueueConsumer consumer1 = (QueueConsumer) _queue.addConsumer(target1, null, messageA.getClass(), "test",
EnumSet.of(Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
- QueueConsumer consumer2 = _queue.addConsumer(target2, null, messageA.getClass(), "test",
+ QueueConsumer consumer2 = (QueueConsumer) _queue.addConsumer(target2, null, messageA.getClass(), "test",
EnumSet.of(Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
@@ -424,14 +427,14 @@ abstract class AbstractQueueTestBase<E e
ServerMessage messageA = createMessage(new Long(24));
// Check adding an exclusive consumer adds it to the queue
- _consumer = _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
+ _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
EnumSet.of(Consumer.Option.EXCLUSIVE, Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
assertEquals("Queue does not have consumer", 1,
_queue.getConsumerCount());
assertEquals("Queue does not have active consumer", 1,
- _queue.getActiveConsumerCount());
+ _queue.getConsumerCountWithCredit());
// Check sending a message ends up with the subscriber
_queue.enqueue(messageA, null);
@@ -464,14 +467,14 @@ abstract class AbstractQueueTestBase<E e
// Check we cannot add an exclusive subscriber to a queue with an
// existing consumer
_consumer.close();
- _consumer = _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
+ _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test",
EnumSet.of(Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
try
{
- _consumer = _queue.addConsumer(subB, null, messageA.getClass(), "test",
+ _consumer = (QueueConsumer<?>) _queue.addConsumer(subB, null, messageA.getClass(), "test",
EnumSet.of(Consumer.Option.EXCLUSIVE));
}
@@ -488,13 +491,13 @@ abstract class AbstractQueueTestBase<E e
Long id = new Long(26);
ServerMessage message = createMessage(id);
- _consumer = _queue.addConsumer(_consumerTarget, null, message.getClass(), "test",
+ _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, message.getClass(), "test",
EnumSet.of(Consumer.Option.ACQUIRES, Consumer.Option.SEES_REQUEUES));
- _queue.enqueue(message, new Action<MessageInstance<?,? extends Consumer>>()
+ _queue.enqueue(message, new Action<MessageInstance>()
{
@Override
- public void performAction(final MessageInstance<?,? extends Consumer> object)
+ public void performAction(final MessageInstance object)
{
QueueEntryImpl entry = (QueueEntryImpl) object;
entry.setRedelivered();
@@ -577,7 +580,7 @@ abstract class AbstractQueueTestBase<E e
// Get non-existent 0th QueueEntry & check returned list was empty
// (the position parameters in this method are indexed from 1)
- List<E> entries = _queue.getMessagesRangeOnTheQueue(0, 0);
+ List<? extends QueueEntry> entries = _queue.getMessagesRangeOnTheQueue(0, 0);
assertTrue(entries.size() == 0);
// Check that when 'from' is 0 it is ignored and the range continues from 1
@@ -725,7 +728,7 @@ abstract class AbstractQueueTestBase<E e
dequeueMessage(_queue, dequeueMessageIndex);
// get messages on the queue
- List<E> entries = _queue.getMessagesOnTheQueue();
+ List<? extends QueueEntry> entries = _queue.getMessagesOnTheQueue();
// assert queue entries
assertEquals(messageNumber - 1, entries.size());
@@ -762,9 +765,9 @@ abstract class AbstractQueueTestBase<E e
dequeueMessage(_queue, dequeueMessageIndex);
// get messages on the queue with filter accepting all available messages
- List<E> entries = _queue.getMessagesOnTheQueue(new QueueEntryFilter<E>()
+ List<? extends QueueEntry> entries = ((AbstractQueue)_queue).getMessagesOnTheQueue(new QueueEntryFilter()
{
- public boolean accept(E entry)
+ public boolean accept(QueueEntry entry)
{
return true;
}
@@ -813,7 +816,7 @@ abstract class AbstractQueueTestBase<E e
_queue.clearQueue();
// get queue entries
- List<E> entries = _queue.getMessagesOnTheQueue();
+ List<? extends QueueEntry> entries = _queue.getMessagesOnTheQueue();
// assert queue entries
assertNotNull(entries);
@@ -823,7 +826,7 @@ abstract class AbstractQueueTestBase<E e
public void testNotificationFiredOnEnqueue() throws Exception
{
- AMQQueue.NotificationListener listener = mock(AMQQueue.NotificationListener.class);
+ QueueNotificationListener listener = mock(QueueNotificationListener .class);
_queue.setNotificationListener(listener);
_queue.setMaximumMessageCount(2);
@@ -838,7 +841,7 @@ abstract class AbstractQueueTestBase<E e
public void testNotificationFiredAsync() throws Exception
{
- AMQQueue.NotificationListener listener = mock(AMQQueue.NotificationListener.class);
+ QueueNotificationListener listener = mock(QueueNotificationListener .class);
_queue.enqueue(createMessage(new Long(24)), null);
_queue.enqueue(createMessage(new Long(25)), null);
@@ -864,12 +867,12 @@ abstract class AbstractQueueTestBase<E e
* @param messageNumber
* number of messages to put into queue
*/
- protected List<E> enqueueGivenNumberOfMessages(Q queue, int messageNumber)
+ protected List<? extends QueueEntry> enqueueGivenNumberOfMessages(AMQQueue<?> queue, int messageNumber)
{
putGivenNumberOfMessages(queue, messageNumber);
// make sure that all enqueued messages are on the queue
- List<E> entries = queue.getMessagesOnTheQueue();
+ List<? extends QueueEntry> entries = queue.getMessagesOnTheQueue();
assertEquals(messageNumber, entries.size());
for (int i = 0; i < messageNumber; i++)
{
@@ -890,7 +893,7 @@ abstract class AbstractQueueTestBase<E e
* @param queue
* @param messageNumber
*/
- protected <T extends AbstractQueue> void putGivenNumberOfMessages(T queue, int messageNumber)
+ protected void putGivenNumberOfMessages(AMQQueue<?> queue, int messageNumber)
{
for (int i = 0; i < messageNumber; i++)
{
@@ -920,9 +923,9 @@ abstract class AbstractQueueTestBase<E e
* @param dequeueMessageIndex
* entry index to dequeue.
*/
- protected QueueEntry dequeueMessage(AMQQueue queue, int dequeueMessageIndex)
+ protected QueueEntry dequeueMessage(AMQQueue<?> queue, int dequeueMessageIndex)
{
- List<QueueEntry> entries = queue.getMessagesOnTheQueue();
+ List<? extends QueueEntry> entries = queue.getMessagesOnTheQueue();
QueueEntry entry = entries.get(dequeueMessageIndex);
entry.acquire();
entry.delete();
@@ -953,12 +956,12 @@ abstract class AbstractQueueTestBase<E e
}
}
- public Q getQueue()
+ public AMQQueue<?> getQueue()
{
return _queue;
}
- protected void setQueue(Q queue)
+ protected void setQueue(AMQQueue<?> queue)
{
_queue = queue;
}
@@ -996,7 +999,7 @@ abstract class AbstractQueueTestBase<E e
return message;
}
- private static class EntryListAddingAction implements Action<MessageInstance<?,? extends Consumer>>
+ private static class EntryListAddingAction implements Action<MessageInstance>
{
private final ArrayList<QueueEntry> _queueEntries;
@@ -1005,7 +1008,7 @@ abstract class AbstractQueueTestBase<E e
_queueEntries = queueEntries;
}
- public void performAction(MessageInstance<?,? extends Consumer> entry)
+ public void performAction(MessageInstance entry)
{
_queueEntries.add((QueueEntry) entry);
}
@@ -1043,17 +1046,17 @@ abstract class AbstractQueueTestBase<E e
}
- static class TestSimpleQueueEntryListFactory implements QueueEntryListFactory<NonAsyncDeliverEntry, NonAsyncDeliverQueue, NonAsyncDeliverList>
+ static class TestSimpleQueueEntryListFactory implements QueueEntryListFactory
{
@Override
- public NonAsyncDeliverList createQueueEntryList(final NonAsyncDeliverQueue queue)
+ public NonAsyncDeliverList createQueueEntryList(final AMQQueue<?> queue)
{
- return new NonAsyncDeliverList(queue);
+ return new NonAsyncDeliverList((NonAsyncDeliverQueue) queue);
}
}
- private static class NonAsyncDeliverEntry extends OrderedQueueEntry<NonAsyncDeliverEntry, NonAsyncDeliverQueue, NonAsyncDeliverList>
+ private static class NonAsyncDeliverEntry extends OrderedQueueEntry
{
public NonAsyncDeliverEntry(final NonAsyncDeliverList queueEntryList)
@@ -1074,17 +1077,17 @@ abstract class AbstractQueueTestBase<E e
}
}
- private static class NonAsyncDeliverList extends OrderedQueueEntryList<NonAsyncDeliverEntry, NonAsyncDeliverQueue, NonAsyncDeliverList>
+ private static class NonAsyncDeliverList extends OrderedQueueEntryList
{
- private static final HeadCreator<NonAsyncDeliverEntry, NonAsyncDeliverQueue, NonAsyncDeliverList> HEAD_CREATOR =
- new HeadCreator<NonAsyncDeliverEntry, NonAsyncDeliverQueue, NonAsyncDeliverList>()
+ private static final HeadCreator HEAD_CREATOR =
+ new HeadCreator()
{
@Override
- public NonAsyncDeliverEntry createHead(final NonAsyncDeliverList list)
+ public NonAsyncDeliverEntry createHead(final QueueEntryList list)
{
- return new NonAsyncDeliverEntry(list);
+ return new NonAsyncDeliverEntry((NonAsyncDeliverList) list);
}
};
@@ -1101,7 +1104,7 @@ abstract class AbstractQueueTestBase<E e
}
- private static class NonAsyncDeliverQueue extends AbstractQueue<NonAsyncDeliverEntry, NonAsyncDeliverQueue, NonAsyncDeliverList>
+ private static class NonAsyncDeliverQueue extends AbstractQueue
{
public NonAsyncDeliverQueue(final TestSimpleQueueEntryListFactory factory, VirtualHost vhost)
{
@@ -1119,7 +1122,7 @@ abstract class AbstractQueueTestBase<E e
}
@Override
- public void deliverAsync(QueueConsumer sub)
+ public void deliverAsync(QueueConsumer<?> sub)
{
// do nothing, i.e prevent deliveries by the SubFlushRunner
// when registering the new consumers
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java Wed Feb 26 23:27:39 2014
@@ -58,7 +58,7 @@ public class ConflationQueueListTest ext
when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
_queue = new ConflationQueue(virtualHost, queueAttributes);
- _list = _queue.getEntries();
+ _list = (ConflationQueueList) _queue.getEntries();
}
public void testListHasNoEntries()
@@ -190,7 +190,7 @@ public class ConflationQueueListTest ext
private int countEntries(ConflationQueueList list)
{
- QueueEntryIterator<ConflationQueueList.ConflationQueueEntry, ConflationQueue, ConflationQueueList,QueueConsumer<?,ConflationQueueList.ConflationQueueEntry, ConflationQueue, ConflationQueueList>> iterator =
+ QueueEntryIterator iterator =
list.iterator();
int count = 0;
while(iterator.advance())
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConsumerListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConsumerListTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConsumerListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConsumerListTest.java Wed Feb 26 23:27:39 2014
@@ -22,9 +22,7 @@ package org.apache.qpid.server.queue;
import org.apache.qpid.server.message.MessageInstance;
-import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.consumer.Consumer;
-import org.apache.qpid.server.consumer.ConsumerTarget;
import org.apache.qpid.test.utils.QpidTestCase;
import static org.mockito.Mockito.mock;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java Wed Feb 26 23:27:39 2014
@@ -31,7 +31,7 @@ import org.apache.qpid.server.txn.Server
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.StateChangeListener;
-public class MockMessageInstance implements MessageInstance<MockMessageInstance,Consumer>
+public class MockMessageInstance implements MessageInstance
{
private ServerMessage _message;
@@ -48,7 +48,7 @@ public class MockMessageInstance impleme
}
@Override
- public int routeToAlternate(final Action<? super MessageInstance<?, ? extends Consumer>> action,
+ public int routeToAlternate(final Action<? super MessageInstance> action,
final ServerTransaction txn)
{
return 0;
@@ -178,13 +178,13 @@ public class MockMessageInstance impleme
}
@Override
- public void addStateChangeListener(final StateChangeListener<? super MockMessageInstance, State> listener)
+ public void addStateChangeListener(final StateChangeListener<? super MessageInstance, State> listener)
{
}
@Override
- public boolean removeStateChangeListener(final StateChangeListener<? super MockMessageInstance, State> listener)
+ public boolean removeStateChangeListener(final StateChangeListener<? super MessageInstance, State> listener)
{
return false;
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java Wed Feb 26 23:27:39 2014
@@ -36,19 +36,19 @@ import static org.apache.qpid.server.que
import junit.framework.TestCase;
import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.queue.AMQQueue.NotificationListener;
+import org.apache.qpid.server.model.QueueNotificationListener;
public class NotificationCheckTest extends TestCase
{
private ServerMessage<?> _message = mock(ServerMessage.class);
private AMQQueue _queue = mock(AMQQueue.class);
- private NotificationListener _listener = mock(NotificationListener.class);
+ private QueueNotificationListener _listener = mock(QueueNotificationListener .class);
public void testMessageCountAlertFires() throws Exception
{
- when(_queue.getMaximumMessageCount()).thenReturn(1000l);
- when(_queue.getMessageCount()).thenReturn(999, 1000, 1001);
+ when(_queue.getAlertThresholdQueueDepthMessages()).thenReturn(1000l);
+ when(_queue.getQueueDepthMessages()).thenReturn(999, 1000, 1001);
MESSAGE_COUNT_ALERT.notifyIfNecessary(_message, _queue, _listener);
verifyZeroInteractions(_listener);
@@ -62,7 +62,7 @@ public class NotificationCheckTest exten
public void testMessageSizeAlertFires() throws Exception
{
- when(_queue.getMaximumMessageSize()).thenReturn(1024l);
+ when(_queue.getAlertThresholdMessageSize()).thenReturn(1024l);
when(_message.getSize()).thenReturn(1023l, 1024l, 1025l);
MESSAGE_SIZE_ALERT.notifyIfNecessary(_message, _queue, _listener);
@@ -78,7 +78,7 @@ public class NotificationCheckTest exten
public void testMessageAgeAlertFires() throws Exception
{
long now = System.currentTimeMillis();
- when(_queue.getMaximumMessageAge()).thenReturn(1000l);
+ when(_queue.getAlertThresholdMessageAge()).thenReturn(1000l);
when(_queue.getOldestMessageArrivalTime()).thenReturn(now, now - 15000);
MESSAGE_AGE_ALERT.notifyIfNecessary(_message, _queue, _listener);
@@ -91,8 +91,8 @@ public class NotificationCheckTest exten
public void testQueueDepthAlertFires() throws Exception
{
- when(_queue.getMaximumQueueDepth()).thenReturn(1024l);
- when(_queue.getQueueDepth()).thenReturn(1023l, 1024l, 2048l);
+ when(_queue.getAlertThresholdQueueDepthBytes()).thenReturn(1024l);
+ when(_queue.getQueueDepthBytes()).thenReturn(1023l, 1024l, 2048l);
QUEUE_DEPTH_ALERT.notifyIfNecessary(_message, _queue, _listener);
verifyZeroInteractions(_listener);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java Wed Feb 26 23:27:39 2014
@@ -56,7 +56,7 @@ public class PriorityQueueListTest exten
final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
PriorityQueue queue = new PriorityQueue(virtualHost, queueAttributes);
- _list = queue.getEntries();
+ _list = (PriorityQueueList) queue.getEntries();
for (int i = 0; i < PRIORITIES.length; i++)
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java Wed Feb 26 23:27:39 2014
@@ -49,7 +49,7 @@ public class PriorityQueueTest extends A
{
// Enqueue messages in order
- AbstractQueue queue = getQueue();
+ AbstractQueue queue = (AbstractQueue) getQueue();
queue.enqueue(createMessage(1L, (byte) 10), null);
queue.enqueue(createMessage(2L, (byte) 4), null);
queue.enqueue(createMessage(3L, (byte) 0), null);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java Wed Feb 26 23:27:39 2014
@@ -20,7 +20,6 @@ package org.apache.qpid.server.queue;
import junit.framework.TestCase;
-import org.apache.qpid.server.consumer.ConsumerTarget;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.RootMessageLogger;
import org.apache.qpid.server.logging.actors.CurrentActor;
@@ -29,8 +28,6 @@ import org.apache.qpid.server.message.Me
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.message.MessageInstance.EntryState;
import org.apache.qpid.server.model.Queue;
-import org.apache.qpid.server.protocol.AMQSessionModel;
-import org.apache.qpid.server.security.*;
import org.apache.qpid.server.virtualhost.VirtualHost;
import java.lang.reflect.Field;
@@ -143,7 +140,7 @@ public abstract class QueueEntryImplTest
MessageInstance.ConsumerAcquiredState owningState = new QueueEntryImpl.ConsumerAcquiredState(consumer);
when(consumer.getOwningState()).thenReturn(owningState);
- when(consumer.getId()).thenReturn(_consumerId++);
+ when(consumer.getConsumerNumber()).thenReturn(_consumerId++);
return consumer;
}
@@ -213,7 +210,7 @@ public abstract class QueueEntryImplTest
when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
StandardQueue queue = new StandardQueue(virtualHost, queueAttributes);
- OrderedQueueEntryList queueEntryList = queue.getEntries();
+ OrderedQueueEntryList queueEntryList = (OrderedQueueEntryList) queue.getEntries();
// create test entries
for(int i = 0; i < numberOfEntries ; i++)
@@ -223,7 +220,7 @@ public abstract class QueueEntryImplTest
final MessageReference reference = mock(MessageReference.class);
when(reference.getMessage()).thenReturn(message);
when(message.newReference()).thenReturn(reference);
- QueueEntryImpl entry = queueEntryList.add(message);
+ QueueEntryImpl entry = (QueueEntryImpl) queueEntryList.add(message);
entries[i] = entry;
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java Wed Feb 26 23:27:39 2014
@@ -32,10 +32,10 @@ import static org.mockito.Mockito.when;
/**
* Abstract test class for QueueEntryList implementations.
*/
-public abstract class QueueEntryListTestBase<E extends QueueEntry<E,Q,C>, Q extends AMQQueue<E,Q,C>, L extends QueueEntryList<E,Q,L,C>, C extends Consumer> extends TestCase
+public abstract class QueueEntryListTestBase extends TestCase
{
- public abstract L getTestList();
- public abstract L getTestList(boolean newList);
+ public abstract QueueEntryList getTestList();
+ public abstract QueueEntryList getTestList(boolean newList);
public abstract long getExpectedFirstMsgId();
public abstract int getExpectedListLength();
public abstract ServerMessage getTestMessageToAdd();
@@ -45,7 +45,7 @@ public abstract class QueueEntryListTest
assertEquals("Unexpected head entry returned by getHead()", getTestList().getQueue(), getTestQueue());
}
- protected abstract Q getTestQueue();
+ protected abstract AMQQueue getTestQueue();
/**
* Test to add a message with properties specific to the queue type.
@@ -54,10 +54,10 @@ public abstract class QueueEntryListTest
*/
public void testAddSpecificMessage()
{
- final L list = getTestList();
+ final QueueEntryList list = getTestList();
list.add(getTestMessageToAdd());
- final QueueEntryIterator<E,Q,L,C> iter = list.iterator();
+ final QueueEntryIterator iter = list.iterator();
int count = 0;
while(iter.advance())
{
@@ -74,11 +74,11 @@ public abstract class QueueEntryListTest
*/
public void testAddGenericMessage()
{
- final L list = getTestList();
+ final QueueEntryList list = getTestList();
final ServerMessage message = createServerMessage(666l);
list.add(message);
- final QueueEntryIterator<E,Q,L,C> iter = list.iterator();
+ final QueueEntryIterator iter = list.iterator();
int count = 0;
while(iter.advance())
{
@@ -108,8 +108,8 @@ public abstract class QueueEntryListTest
*/
public void testListNext()
{
- final L entryList = getTestList();
- E entry = entryList.getHead();
+ final QueueEntryList entryList = getTestList();
+ QueueEntry entry = entryList.getHead();
int count = 0;
while(entryList.next(entry) != null)
{
@@ -126,7 +126,7 @@ public abstract class QueueEntryListTest
*/
public void testIterator()
{
- final QueueEntryIterator<E,Q,L,C> iter = getTestList().iterator();
+ final QueueEntryIterator iter = getTestList().iterator();
int count = 0;
while(iter.advance())
{
@@ -144,10 +144,10 @@ public abstract class QueueEntryListTest
public void testDequeuedMessagedNotPresentInIterator() throws Exception
{
final int numberOfMessages = getExpectedListLength();
- final L entryList = getTestList();
+ final QueueEntryList entryList = getTestList();
// dequeue all even messages
- final QueueEntryIterator<E,Q,L,C> it1 = entryList.iterator();
+ final QueueEntryIterator it1 = entryList.iterator();
int counter = 0;
while (it1.advance())
{
@@ -160,7 +160,7 @@ public abstract class QueueEntryListTest
}
// iterate and check that dequeued messages are not returned by iterator
- final QueueEntryIterator<E,Q,L,C> it2 = entryList.iterator();
+ final QueueEntryIterator it2 = entryList.iterator();
int counter2 = 0;
while(it2.advance())
{
@@ -179,7 +179,7 @@ public abstract class QueueEntryListTest
*/
public void testGetHead()
{
- final E head = getTestList().getHead();
+ final QueueEntry head = getTestList().getHead();
assertNull("Head entry should not contain an actual message", head.getMessage());
assertEquals("Unexpected message id for first list entry", getExpectedFirstMsgId(), getTestList().next(head)
.getMessage().getMessageNumber());
@@ -191,16 +191,16 @@ public abstract class QueueEntryListTest
*/
public void testEntryDeleted()
{
- final E head = getTestList().getHead();
+ final QueueEntry head = getTestList().getHead();
- final E first = getTestList().next(head);
+ final QueueEntry first = getTestList().next(head);
first.delete();
- final E second = getTestList().next(head);
+ final QueueEntry second = getTestList().next(head);
assertNotSame("After deletion the next entry should be different", first.getMessage().getMessageNumber(), second
.getMessage().getMessageNumber());
- final E third = getTestList().next(first);
+ final QueueEntry third = getTestList().next(first);
assertEquals("After deletion the deleted nodes next node should be the same as the next from head", second
.getMessage().getMessageNumber(), third.getMessage().getMessageNumber());
}
@@ -214,11 +214,11 @@ public abstract class QueueEntryListTest
*/
public void testIteratorIgnoresDeletedFinalNode() throws Exception
{
- L list = getTestList(true);
+ QueueEntryList list = getTestList(true);
int i = 0;
- E queueEntry1 = list.add(createServerMessage(i++));
- E queueEntry2 = list.add(createServerMessage(i++));
+ QueueEntry queueEntry1 = list.add(createServerMessage(i++));
+ QueueEntry queueEntry2 = list.add(createServerMessage(i++));
assertSame(queueEntry2, list.next(queueEntry1));
assertNull(list.next(queueEntry2));
@@ -227,7 +227,7 @@ public abstract class QueueEntryListTest
queueEntry2.delete();
assertTrue("Deleting node should have succeeded", queueEntry2.isDeleted());
- QueueEntryIterator<E,Q,L,C> iter = list.iterator();
+ QueueEntryIterator iter = list.iterator();
//verify the iterator isn't 'atTail', can advance, and returns the 1st QueueEntry
assertFalse("Iterator should not have been 'atTail'", iter.atTail());
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java Wed Feb 26 23:27:39 2014
@@ -51,7 +51,7 @@ public class SelfValidatingSortedQueueEn
}
@Override /** Overridden to automatically check queue properties before and after. */
- public void entryDeleted(SortedQueueEntry entry)
+ public void entryDeleted(QueueEntry entry)
{
assertQueueProperties(); //before delete
super.entryDeleted(entry);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java Wed Feb 26 23:27:39 2014
@@ -50,7 +50,7 @@ public class SimpleQueueEntryImplTest ex
StandardQueue queue = new StandardQueue(virtualHost, queueAttributes);
- queueEntryList = queue.getEntries();
+ queueEntryList = (OrderedQueueEntryList) queue.getEntries();
super.setUp();
}
@@ -63,7 +63,7 @@ public class SimpleQueueEntryImplTest ex
final MessageReference reference = mock(MessageReference.class);
when(reference.getMessage()).thenReturn(message);
when(message.newReference()).thenReturn(reference);
- return queueEntryList.add(message);
+ return (QueueEntryImpl) queueEntryList.add(message);
}
public void testCompareTo()
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java Wed Feb 26 23:27:39 2014
@@ -40,7 +40,7 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class SortedQueueEntryListTest extends QueueEntryListTestBase<SortedQueueEntry, SortedQueue, SortedQueueEntryList, QueueConsumer<?,SortedQueueEntry, SortedQueue, SortedQueueEntryList>>
+public class SortedQueueEntryListTest extends QueueEntryListTestBase
{
private static SelfValidatingSortedQueueEntryList _sqel;
@@ -90,13 +90,13 @@ public class SortedQueueEntryListTest ex
final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
- _testQueue = new SortedQueue(virtualHost, attributes, new QueueEntryListFactory<SortedQueueEntry,SortedQueue,SortedQueueEntryList>()
+ _testQueue = new SortedQueue(virtualHost, attributes, new QueueEntryListFactory()
{
@Override
- public SortedQueueEntryList createQueueEntryList(final SortedQueue queue)
+ public SortedQueueEntryList createQueueEntryList(final AMQQueue queue)
{
- return new SelfValidatingSortedQueueEntryList(queue, "KEY");
+ return new SelfValidatingSortedQueueEntryList((SortedQueue) queue, "KEY");
}
});
_sqel = (SelfValidatingSortedQueueEntryList) _testQueue.getEntries();
@@ -186,7 +186,7 @@ public class SortedQueueEntryListTest ex
super.testIterator();
// Test sorted order of list
- final QueueEntryIterator<SortedQueueEntry, SortedQueue, SortedQueueEntryList, QueueConsumer<?,SortedQueueEntry, SortedQueue, SortedQueueEntryList>> iter = getTestList().iterator();
+ final QueueEntryIterator iter = getTestList().iterator();
int count = 0;
while(iter.advance())
{
@@ -195,12 +195,12 @@ public class SortedQueueEntryListTest ex
}
}
- private Object getSortedKeyValue(QueueEntryIterator<SortedQueueEntry, SortedQueue, SortedQueueEntryList, QueueConsumer<?,SortedQueueEntry, SortedQueue, SortedQueueEntryList>> iter)
+ private Object getSortedKeyValue(QueueEntryIterator iter)
{
return (iter.getNode()).getMessage().getMessageHeader().getHeader("KEY");
}
- private Long getMessageId(QueueEntryIterator<SortedQueueEntry, SortedQueue, SortedQueueEntryList, QueueConsumer<?,SortedQueueEntry, SortedQueue, SortedQueueEntryList>> iter)
+ private Long getMessageId(QueueEntryIterator iter)
{
return (iter.getNode()).getMessage().getMessageNumber();
}
@@ -217,7 +217,7 @@ public class SortedQueueEntryListTest ex
_sqel.add(msg);
}
- final QueueEntryIterator<SortedQueueEntry, SortedQueue, SortedQueueEntryList, QueueConsumer<?,SortedQueueEntry, SortedQueue, SortedQueueEntryList>> iter = getTestList().iterator();
+ final QueueEntryIterator iter = getTestList().iterator();
int count=0;
while(iter.advance())
{
@@ -238,7 +238,7 @@ public class SortedQueueEntryListTest ex
_sqel.add(msg);
}
- final QueueEntryIterator<SortedQueueEntry, SortedQueue, SortedQueueEntryList, QueueConsumer<?,SortedQueueEntry, SortedQueue, SortedQueueEntryList>> iter = getTestList().iterator();
+ final QueueEntryIterator iter = getTestList().iterator();
int count=0;
while(iter.advance())
{
@@ -260,7 +260,7 @@ public class SortedQueueEntryListTest ex
_sqel.add(msg);
}
- final QueueEntryIterator<SortedQueueEntry, SortedQueue, SortedQueueEntryList, QueueConsumer<?,SortedQueueEntry, SortedQueue, SortedQueueEntryList>> iter = getTestList().iterator();
+ final QueueEntryIterator iter = getTestList().iterator();
int count=0;
while(iter.advance())
{
@@ -283,7 +283,7 @@ public class SortedQueueEntryListTest ex
_sqel.add(msg);
}
- final QueueEntryIterator<SortedQueueEntry, SortedQueue, SortedQueueEntryList, QueueConsumer<?,SortedQueueEntry, SortedQueue, SortedQueueEntryList>> iter = getTestList().iterator();
+ final QueueEntryIterator iter = getTestList().iterator();
int count=0;
while(iter.advance())
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java Wed Feb 26 23:27:39 2014
@@ -58,13 +58,13 @@ public class SortedQueueEntryTest extend
final VirtualHost virtualHost = mock(VirtualHost.class);
when(virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class));
- SortedQueue queue = new SortedQueue(virtualHost, attributes, new QueueEntryListFactory<SortedQueueEntry,SortedQueue,SortedQueueEntryList>()
+ SortedQueue queue = new SortedQueue(virtualHost, attributes, new QueueEntryListFactory()
{
@Override
- public SortedQueueEntryList createQueueEntryList(final SortedQueue queue)
+ public SortedQueueEntryList createQueueEntryList(final AMQQueue queue)
{
- return new SelfValidatingSortedQueueEntryList(queue, "KEY");
+ return new SelfValidatingSortedQueueEntryList((SortedQueue) queue, "KEY");
}
});
_queueEntryList = (SelfValidatingSortedQueueEntryList) queue.getEntries();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java Wed Feb 26 23:27:39 2014
@@ -38,7 +38,7 @@ import java.util.concurrent.ConcurrentHa
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class StandardQueueEntryListTest extends QueueEntryListTestBase<StandardQueueEntry, StandardQueue, StandardQueueEntryList, QueueConsumer<?,StandardQueueEntry, StandardQueue, StandardQueueEntryList>>
+public class StandardQueueEntryListTest extends QueueEntryListTestBase
{
private StandardQueue _testQueue;
@@ -62,7 +62,7 @@ public class StandardQueueEntryListTest
CurrentActor.set(logActor);
_testQueue = new StandardQueue(virtualHost, queueAttributes);
- _sqel = _testQueue.getEntries();
+ _sqel = (StandardQueueEntryList) _testQueue.getEntries();
for(int i = 1; i <= 100; i++)
{
final ServerMessage message = mock(ServerMessage.class);
@@ -107,7 +107,7 @@ public class StandardQueueEntryListTest
when(virtualHost.getSecurityManager()).thenReturn(mock(SecurityManager.class));
StandardQueue queue = new StandardQueue(virtualHost, queueAttributes);
- return queue.getEntries();
+ return (StandardQueueEntryList) queue.getEntries();
}
else
{
@@ -160,7 +160,7 @@ public class StandardQueueEntryListTest
entriesMap.put(i,bleh);
}
- OrderedQueueEntry head = sqel.getHead();
+ OrderedQueueEntry head = (OrderedQueueEntry) sqel.getHead();
//We shall now delete some specific messages mid-queue that will lead to
//requiring a scavenge once the requested threshold of 9 deletes is passed
@@ -256,7 +256,7 @@ public class StandardQueueEntryListTest
final MessageReference reference = mock(MessageReference.class);
when(reference.getMessage()).thenReturn(message);
when(message.newReference()).thenReturn(reference);
- entries[i] = queueEntryList.add(message);
+ entries[i] = (OrderedQueueEntry) queueEntryList.add(message);
}
// test getNext for not acquired entries
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java Wed Feb 26 23:27:39 2014
@@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit;
import static org.mockito.Mockito.mock;
-public class StandardQueueTest extends AbstractQueueTestBase<StandardQueueEntry, StandardQueue, StandardQueueEntryList>
+public class StandardQueueTest extends AbstractQueueTestBase
{
public void testCreationFailsWithNoVhost()
@@ -60,6 +60,10 @@ public class StandardQueueTest extends A
assertTrue("Exception was not about missing vhost",
e.getMessage().contains("Host"));
}
+ catch(NullPointerException e)
+ {
+
+ }
}
@@ -76,7 +80,7 @@ public class StandardQueueTest extends A
ServerMessage message = createMessage(25l);
QueueConsumer consumer =
- getQueue().addConsumer(getConsumerTarget(), null, message.getClass(), "test",
+ (QueueConsumer) getQueue().addConsumer(getConsumerTarget(), null, message.getClass(), "test",
EnumSet.of(Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
@@ -99,59 +103,59 @@ public class StandardQueueTest extends A
final MockConsumer consumer1 = new MockConsumer();
consumer1.setActive(true);
consumer1.setState(ConsumerTarget.State.ACTIVE);
- assertEquals("Unexpected active consumer count", 0, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 0, queue.getConsumerCountWithCredit());
queue.addConsumer(consumer1,
null,
createMessage(-1l).getClass(),
"test",
EnumSet.of(Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
- assertEquals("Unexpected active consumer count", 1, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 1, queue.getConsumerCountWithCredit());
//verify adding an inactive consumer doesn't increase the count
final MockConsumer consumer2 = new MockConsumer();
consumer2.setActive(false);
consumer2.setState(ConsumerTarget.State.SUSPENDED);
- assertEquals("Unexpected active consumer count", 1, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 1, queue.getConsumerCountWithCredit());
queue.addConsumer(consumer2,
null,
createMessage(-1l).getClass(),
"test",
EnumSet.of(Consumer.Option.ACQUIRES,
Consumer.Option.SEES_REQUEUES));
- assertEquals("Unexpected active consumer count", 1, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 1, queue.getConsumerCountWithCredit());
//verify behaviour in face of expected state changes:
//verify a consumer going suspended->active increases the count
consumer2.setState(ConsumerTarget.State.ACTIVE);
- assertEquals("Unexpected active consumer count", 2, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 2, queue.getConsumerCountWithCredit());
//verify a consumer going active->suspended decreases the count
consumer2.setState(ConsumerTarget.State.SUSPENDED);
- assertEquals("Unexpected active consumer count", 1, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 1, queue.getConsumerCountWithCredit());
//verify a consumer going suspended->closed doesn't change the count
consumer2.setState(ConsumerTarget.State.CLOSED);
- assertEquals("Unexpected active consumer count", 1, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 1, queue.getConsumerCountWithCredit());
//verify a consumer going active->active doesn't change the count
consumer1.setState(ConsumerTarget.State.ACTIVE);
- assertEquals("Unexpected active consumer count", 1, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 1, queue.getConsumerCountWithCredit());
consumer1.setState(ConsumerTarget.State.SUSPENDED);
- assertEquals("Unexpected active consumer count", 0, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 0, queue.getConsumerCountWithCredit());
//verify a consumer going suspended->suspended doesn't change the count
consumer1.setState(ConsumerTarget.State.SUSPENDED);
- assertEquals("Unexpected active consumer count", 0, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 0, queue.getConsumerCountWithCredit());
consumer1.setState(ConsumerTarget.State.ACTIVE);
- assertEquals("Unexpected active consumer count", 1, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 1, queue.getConsumerCountWithCredit());
//verify a consumer going active->closed decreases the count
consumer1.setState(ConsumerTarget.State.CLOSED);
- assertEquals("Unexpected active consumer count", 0, queue.getActiveConsumerCount());
+ assertEquals("Unexpected active consumer count", 0, queue.getConsumerCountWithCredit());
}
@@ -210,7 +214,8 @@ public class StandardQueueTest extends A
};
// put messages
- List<StandardQueueEntry> entries = enqueueGivenNumberOfMessages(testQueue, messageNumber);
+ List<StandardQueueEntry> entries =
+ (List<StandardQueueEntry>) enqueueGivenNumberOfMessages(testQueue, messageNumber);
// dequeue message
dequeueMessage(testQueue, dequeueMessageIndex);
@@ -264,7 +269,7 @@ public class StandardQueueTest extends A
}
- private static class DequeuedQueue extends AbstractQueue<DequeuedQueueEntry, DequeuedQueue, DequeuedQueueEntryList>
+ private static class DequeuedQueue extends AbstractQueue
{
public DequeuedQueue(VirtualHost virtualHost)
@@ -282,30 +287,30 @@ public class StandardQueueTest extends A
return attributes;
}
}
- private static class DequeuedQueueEntryListFactory implements QueueEntryListFactory<DequeuedQueueEntry, DequeuedQueue, DequeuedQueueEntryList>
+ private static class DequeuedQueueEntryListFactory implements QueueEntryListFactory
{
- public DequeuedQueueEntryList createQueueEntryList(DequeuedQueue queue)
+ public DequeuedQueueEntryList createQueueEntryList(AMQQueue queue)
{
/**
* Override SimpleQueueEntryList to create a dequeued
* entries for messages with even id
*/
- return new DequeuedQueueEntryList(queue);
+ return new DequeuedQueueEntryList((DequeuedQueue) queue);
}
}
- private static class DequeuedQueueEntryList extends OrderedQueueEntryList<DequeuedQueueEntry, DequeuedQueue, DequeuedQueueEntryList>
+ private static class DequeuedQueueEntryList extends OrderedQueueEntryList
{
- private static final HeadCreator<DequeuedQueueEntry,DequeuedQueue,DequeuedQueueEntryList> HEAD_CREATOR =
- new HeadCreator<DequeuedQueueEntry,DequeuedQueue,DequeuedQueueEntryList>()
+ private static final HeadCreator HEAD_CREATOR =
+ new HeadCreator()
{
@Override
- public DequeuedQueueEntry createHead(final DequeuedQueueEntryList list)
+ public DequeuedQueueEntry createHead(final QueueEntryList list)
{
- return new DequeuedQueueEntry(list);
+ return new DequeuedQueueEntry((DequeuedQueueEntryList) list);
}
};
@@ -326,7 +331,7 @@ public class StandardQueueTest extends A
}
- private static class DequeuedQueueEntry extends OrderedQueueEntry<DequeuedQueueEntry,DequeuedQueue,DequeuedQueueEntryList>
+ private static class DequeuedQueueEntry extends OrderedQueueEntry
{
private final ServerMessage _message;
@@ -354,7 +359,7 @@ public class StandardQueueTest extends A
}
@Override
- public boolean acquire(QueueConsumer<?,DequeuedQueueEntry,DequeuedQueue,DequeuedQueueEntryList> sub)
+ public boolean acquire(Consumer sub)
{
if(_message.getMessageNumber() % 2 == 0)
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Wed Feb 26 23:27:39 2014
@@ -38,8 +38,9 @@ import java.util.UUID;
import org.apache.commons.configuration.Configuration;
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.binding.BindingImpl;
+import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.exchange.NonDefaultExchange;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.message.EnqueueableMessage;
@@ -80,7 +81,7 @@ public abstract class AbstractDurableCon
private TransactionLogRecoveryHandler.QueueEntryRecoveryHandler _queueEntryRecoveryHandler;
private TransactionLogRecoveryHandler.DtxRecordRecoveryHandler _dtxRecordRecoveryHandler;
- private Exchange _exchange = mock(Exchange.class);
+ private NonDefaultExchange _exchange = mock(NonDefaultExchange.class);
private static final String ROUTING_KEY = "routingKey";
private static final String QUEUE_NAME = "queueName";
private Map<String,Object> _bindingArgs;
@@ -145,7 +146,7 @@ public abstract class AbstractDurableCon
public void testCreateExchange() throws Exception
{
- Exchange exchange = createTestExchange();
+ ExchangeImpl exchange = createTestExchange();
DurableConfigurationStoreHelper.createExchange(_configStore, exchange);
reopenStore();
@@ -177,7 +178,7 @@ public abstract class AbstractDurableCon
public void testRemoveExchange() throws Exception
{
- Exchange exchange = createTestExchange();
+ ExchangeImpl exchange = createTestExchange();
DurableConfigurationStoreHelper.createExchange(_configStore, exchange);
DurableConfigurationStoreHelper.removeExchange(_configStore, exchange);
@@ -189,7 +190,7 @@ public abstract class AbstractDurableCon
public void testBindQueue() throws Exception
{
AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false, null);
- Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
+ BindingImpl binding = new BindingImpl(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
_exchange, _bindingArgs);
DurableConfigurationStoreHelper.createBinding(_configStore, binding);
@@ -208,7 +209,7 @@ public abstract class AbstractDurableCon
public void testUnbindQueue() throws Exception
{
AMQQueue queue = createTestQueue(QUEUE_NAME, "queueOwner", false, null);
- Binding binding = new Binding(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
+ BindingImpl binding = new BindingImpl(UUIDGenerator.generateRandomUUID(), ROUTING_KEY, queue,
_exchange, _bindingArgs);
DurableConfigurationStoreHelper.createBinding(_configStore, binding);
@@ -257,7 +258,7 @@ public abstract class AbstractDurableCon
public void testCreateQueueAMQQueueWithAlternateExchange() throws Exception
{
- Exchange alternateExchange = createTestAlternateExchange();
+ NonDefaultExchange alternateExchange = createTestAlternateExchange();
AMQQueue queue = createTestQueue(getName(), getName() + "Owner", true, alternateExchange, null);
DurableConfigurationStoreHelper.createQueue(_configStore, queue);
@@ -273,10 +274,10 @@ public abstract class AbstractDurableCon
verify(_recoveryHandler).configuredObject(eq(_queueId), eq(QUEUE), eq(queueAttributes));
}
- private Exchange createTestAlternateExchange()
+ private NonDefaultExchange createTestAlternateExchange()
{
UUID exchUuid = UUID.randomUUID();
- Exchange alternateExchange = mock(Exchange.class);
+ NonDefaultExchange alternateExchange = mock(NonDefaultExchange.class);
when(alternateExchange.getId()).thenReturn(exchUuid);
return alternateExchange;
}
@@ -317,7 +318,7 @@ public abstract class AbstractDurableCon
DurableConfigurationStoreHelper.createQueue(_configStore, queue);
// update the queue to have exclusive=false
- Exchange alternateExchange = createTestAlternateExchange();
+ NonDefaultExchange alternateExchange = createTestAlternateExchange();
queue = createTestQueue(getName(), getName() + "Owner", false, alternateExchange, attributes);
DurableConfigurationStoreHelper.updateQueue(_configStore, queue);
@@ -361,10 +362,10 @@ public abstract class AbstractDurableCon
private AMQQueue createTestQueue(String queueName,
String queueOwner,
boolean exclusive,
- Exchange alternateExchange,
+ NonDefaultExchange alternateExchange,
final Map<String, Object> arguments) throws StoreException
{
- AMQQueue queue = mock(AMQQueue.class);
+ AMQQueue<?> queue = mock(AMQQueue.class);
when(queue.getName()).thenReturn(queueName);
when(queue.isExclusive()).thenReturn(exclusive);
when(queue.getId()).thenReturn(_queueId);
@@ -398,9 +399,9 @@ public abstract class AbstractDurableCon
return queue;
}
- private Exchange createTestExchange()
+ private ExchangeImpl createTestExchange()
{
- Exchange exchange = mock(Exchange.class);
+ ExchangeImpl exchange = mock(ExchangeImpl.class);
when(exchange.getName()).thenReturn(getName());
when(exchange.getTypeName()).thenReturn(getName() + "Type");
when(exchange.isAutoDelete()).thenReturn(true);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java Wed Feb 26 23:27:39 2014
@@ -22,7 +22,6 @@ package org.apache.qpid.server.util;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.only;
import static org.mockito.Mockito.when;
import java.net.SocketAddress;
@@ -32,13 +31,13 @@ import java.util.UUID;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.configuration.store.JsonConfigurationEntryStore;
import org.apache.qpid.server.exchange.DefaultExchangeFactory;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.logging.RootMessageLogger;
import org.apache.qpid.server.logging.SystemOutMessageLogger;
import org.apache.qpid.server.logging.actors.CurrentActor;
@@ -171,7 +170,7 @@ public class BrokerTestHelper
return connection;
}
- public static Exchange createExchange(String hostName) throws Exception
+ public static ExchangeImpl createExchange(String hostName) throws Exception
{
SecurityManager securityManager = new SecurityManager(mock(Broker.class), false);
VirtualHost virtualHost = mock(VirtualHost.class);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java Wed Feb 26 23:27:39 2014
@@ -27,10 +27,11 @@ import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.UUID;
+
+import org.apache.qpid.server.exchange.NonDefaultExchange;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.exchange.DirectExchange;
-import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.exchange.ExchangeFactory;
import org.apache.qpid.server.exchange.ExchangeRegistry;
import org.apache.qpid.server.exchange.HeadersExchange;
@@ -69,8 +70,8 @@ public class DurableConfigurationRecover
private static final String CUSTOM_EXCHANGE_NAME = "customExchange";
private DurableConfigurationRecoverer _durableConfigurationRecoverer;
- private Exchange _directExchange;
- private Exchange _topicExchange;
+ private NonDefaultExchange _directExchange;
+ private NonDefaultExchange _topicExchange;
private VirtualHost _vhost;
private DurableConfigurationStore _store;
private ExchangeFactory _exchangeFactory;
@@ -83,11 +84,11 @@ public class DurableConfigurationRecover
super.setUp();
- _directExchange = mock(Exchange.class);
+ _directExchange = mock(NonDefaultExchange.class);
when(_directExchange.getExchangeType()).thenReturn(DirectExchange.TYPE);
- _topicExchange = mock(Exchange.class);
+ _topicExchange = mock(NonDefaultExchange.class);
when(_topicExchange.getExchangeType()).thenReturn(TopicExchange.TYPE);
AMQQueue queue = mock(AMQQueue.class);
@@ -100,14 +101,14 @@ public class DurableConfigurationRecover
when(_vhost.getQueue(eq(QUEUE_ID))).thenReturn(queue);
- final ArgumentCaptor<Exchange> registeredExchange = ArgumentCaptor.forClass(Exchange.class);
+ final ArgumentCaptor<NonDefaultExchange> registeredExchange = ArgumentCaptor.forClass(NonDefaultExchange.class);
doAnswer(new Answer()
{
@Override
public Object answer(final InvocationOnMock invocation) throws Throwable
{
- Exchange exchange = registeredExchange.getValue();
+ NonDefaultExchange exchange = registeredExchange.getValue();
when(_exchangeRegistry.getExchange(eq(exchange.getId()))).thenReturn(exchange);
when(_exchangeRegistry.getExchange(eq(exchange.getName()))).thenReturn(exchange);
return null;
@@ -138,14 +139,14 @@ public class DurableConfigurationRecover
when(_vhost.getQueue(eq(queueName))).thenReturn(queue);
when(_vhost.getQueue(eq(queueId))).thenReturn(queue);
- final ArgumentCaptor<Exchange> altExchangeArg = ArgumentCaptor.forClass(Exchange.class);
+ final ArgumentCaptor<NonDefaultExchange> altExchangeArg = ArgumentCaptor.forClass(NonDefaultExchange.class);
doAnswer(
new Answer()
{
@Override
public Object answer(InvocationOnMock invocation) throws Throwable
{
- final Exchange value = altExchangeArg.getValue();
+ final NonDefaultExchange value = altExchangeArg.getValue();
when(queue.getAlternateExchange()).thenReturn(value);
return null;
}
@@ -156,7 +157,8 @@ public class DurableConfigurationRecover
if (args.containsKey(Queue.ALTERNATE_EXCHANGE))
{
final UUID exchangeId = UUID.fromString(args.get(Queue.ALTERNATE_EXCHANGE).toString());
- final Exchange exchange = _exchangeRegistry.getExchange(exchangeId);
+ final NonDefaultExchange exchange =
+ (NonDefaultExchange) _exchangeRegistry.getExchange(exchangeId);
queue.setAlternateExchange(exchange);
}
return queue;
@@ -265,13 +267,13 @@ public class DurableConfigurationRecover
"org.apache.qpid.server.model.Exchange",
createExchange(CUSTOM_EXCHANGE_NAME, HeadersExchange.TYPE));
- final Exchange customExchange = mock(Exchange.class);
+ final NonDefaultExchange customExchange = mock(NonDefaultExchange.class);
final ArgumentCaptor<Map> attributesCaptor = ArgumentCaptor.forClass(Map.class);
- when(_exchangeFactory.restoreExchange(attributesCaptor.capture())).thenAnswer(new Answer<Exchange>()
+ when(_exchangeFactory.restoreExchange(attributesCaptor.capture())).thenAnswer(new Answer<NonDefaultExchange>()
{
@Override
- public Exchange answer(final InvocationOnMock invocation) throws Throwable
+ public NonDefaultExchange answer(final InvocationOnMock invocation) throws Throwable
{
Map arguments = attributesCaptor.getValue();
if(CUSTOM_EXCHANGE_NAME.equals(arguments.get(org.apache.qpid.server.model.Exchange.NAME))
@@ -395,17 +397,17 @@ public class DurableConfigurationRecover
final UUID queueId = new UUID(1, 0);
final UUID exchangeId = new UUID(2, 0);
- final Exchange customExchange = mock(Exchange.class);
+ final NonDefaultExchange customExchange = mock(NonDefaultExchange.class);
when(customExchange.getId()).thenReturn(exchangeId);
when(customExchange.getName()).thenReturn(CUSTOM_EXCHANGE_NAME);
final ArgumentCaptor<Map> attributesCaptor = ArgumentCaptor.forClass(Map.class);
- when(_exchangeFactory.restoreExchange(attributesCaptor.capture())).thenAnswer(new Answer<Exchange>()
+ when(_exchangeFactory.restoreExchange(attributesCaptor.capture())).thenAnswer(new Answer<NonDefaultExchange>()
{
@Override
- public Exchange answer(final InvocationOnMock invocation) throws Throwable
+ public NonDefaultExchange answer(final InvocationOnMock invocation) throws Throwable
{
Map arguments = attributesCaptor.getValue();
if(CUSTOM_EXCHANGE_NAME.equals(arguments.get(org.apache.qpid.server.model.Exchange.NAME))
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Wed Feb 26 23:27:39 2014
@@ -24,8 +24,10 @@ import java.util.Collection;
import java.util.Map;
import java.util.concurrent.ScheduledFuture;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
+import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.connection.IConnectionRegistry;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
+import org.apache.qpid.server.exchange.NonDefaultExchange;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.message.MessageSource;
import org.apache.qpid.server.plugin.ExchangeType;
@@ -158,13 +160,13 @@ public class MockVirtualHost implements
}
@Override
- public Exchange createExchange(Map<String,Object> attributes)
+ public NonDefaultExchange createExchange(Map<String,Object> attributes)
{
return null;
}
@Override
- public void removeExchange(Exchange exchange, boolean force)
+ public void removeExchange(ExchangeImpl exchange, boolean force)
{
}
@@ -175,31 +177,31 @@ public class MockVirtualHost implements
}
@Override
- public Exchange getExchange(String name)
+ public ExchangeImpl getExchange(String name)
{
return null;
}
@Override
- public Exchange getExchange(UUID id)
+ public ExchangeImpl getExchange(UUID id)
{
return null;
}
@Override
- public Exchange getDefaultExchange()
+ public ExchangeImpl getDefaultExchange()
{
return null;
}
@Override
- public Collection<Exchange> getExchanges()
+ public Collection<ExchangeImpl> getExchanges()
{
return null;
}
@Override
- public Collection<ExchangeType<? extends Exchange>> getExchangeTypes()
+ public Collection<ExchangeType<? extends ExchangeImpl>> getExchangeTypes()
{
return null;
}
@@ -350,4 +352,22 @@ public class MockVirtualHost implements
{
return 0;
}
+
+ @Override
+ public TaskExecutor getTaskExecutor()
+ {
+ return null;
+ }
+
+ @Override
+ public Collection<NonDefaultExchange> getExchangesExceptDefault()
+ {
+ return null;
+ }
+
+ @Override
+ public org.apache.qpid.server.model.VirtualHost getModel()
+ {
+ return null;
+ }
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java Wed Feb 26 23:27:39 2014
@@ -28,10 +28,11 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.qpid.server.binding.Binding;
+import org.apache.qpid.server.binding.BindingImpl;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.AbstractExchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.security.SecurityManager;
@@ -207,14 +208,14 @@ public class StandardVirtualHostTest ext
File config = writeConfigFile(vhostName, queueName, exchangeName, false, new String[]{"ping","pong"}, bindingArguments);
VirtualHost vhost = createVirtualHost(vhostName, config);
- Exchange exch = vhost.getExchange(getName() +".direct");
- Collection<Binding> bindings = exch.getBindings();
+ ExchangeImpl exch = vhost.getExchange(getName() +".direct");
+ Collection<BindingImpl> bindings = ((AbstractExchange)exch).getBindings();
assertNotNull("Bindings cannot be null", bindings);
assertEquals("Unexpected number of bindings", 3, bindings.size());
boolean foundPong = false;
boolean foundPing = false;
- for (Binding binding : bindings)
+ for (BindingImpl binding : bindings)
{
String qn = binding.getAMQQueue().getName();
assertEquals("Unexpected queue name", getName(), qn);
@@ -252,10 +253,10 @@ public class StandardVirtualHostTest ext
AMQQueue queue = vhost.getQueue(queueName);
assertNotNull("queue should exist", queue);
- Exchange defaultExch = vhost.getDefaultExchange();
+ ExchangeImpl defaultExch = vhost.getDefaultExchange();
assertTrue("queue should have been bound to default exchange with its name", defaultExch.isBound(queueName, queue));
- Exchange exch = vhost.getExchange(exchangeName);
+ ExchangeImpl exch = vhost.getExchange(exchangeName);
assertTrue("queue should have been bound to " + exchangeName + " with its name", exch.isBound(queueName, queue));
for(String key: routingKeys)
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java Wed Feb 26 23:27:39 2014
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.protocol.v0_10;
-import org.apache.qpid.server.exchange.Exchange;
+import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.flow.FlowCreditManager;
import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.actors.CurrentActor;
@@ -406,7 +406,7 @@ public class ConsumerTarget_0_10 extends
if(owningResource instanceof AMQQueue)
{
final AMQQueue queue = (AMQQueue)owningResource;
- final Exchange alternateExchange = queue.getAlternateExchange();
+ final ExchangeImpl alternateExchange = queue.getAlternateExchange();
if(alternateExchange != null)
{
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1572343&r1=1572342&r2=1572343&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Wed Feb 26 23:27:39 2014
@@ -936,10 +936,10 @@ public class ServerSession extends Sessi
return getId().compareTo(o.getId());
}
- private class CheckCapacityAction<C extends Consumer> implements Action<MessageInstance<?,C>>
+ private class CheckCapacityAction implements Action<MessageInstance>
{
@Override
- public void performAction(final MessageInstance<?,C> entry)
+ public void performAction(final MessageInstance entry)
{
TransactionLogResource queue = entry.getOwningResource();
if(queue instanceof CapacityChecker)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org