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/17 23:15:07 UTC
svn commit: r1569119 - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/qpid/server/message/
broker-core/src/main/java/org/apache/qpid/server/queue/
broker-core/src/test/java/org/apache/qpid/server/exchange/
broker-core/src/test/java/org/...
Author: rgodfrey
Date: Mon Feb 17 22:15:07 2014
New Revision: 1569119
URL: http://svn.apache.org/r1569119
Log:
QPID-5559 : [Java Broker] remove unused methods from AMQQueue interface
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java?rev=1569119&r1=1569118&r2=1569119&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/message/MessageSource.java Mon Feb 17 22:15:07 2014
@@ -45,8 +45,6 @@ public interface MessageSource<C extends
void removeConsumerRegistrationListener(ConsumerRegistrationListener<S> listener);
- boolean isExclusive();
-
boolean verifySessionAccess(AMQSessionModel<?,?> session);
interface ConsumerRegistrationListener<Q extends MessageSource<? extends Consumer,?>>
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java?rev=1569119&r1=1569118&r2=1569119&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AMQQueue.java Mon Feb 17 22:15:07 2014
@@ -52,9 +52,7 @@ public interface AMQQueue<E extends Queu
void notifyClients(NotificationCheck notification, AMQQueue queue, String notificationMsg);
}
- boolean getDeleteOnNoConsumers();
-
- void setDeleteOnNoConsumers(boolean b);
+ boolean isExclusive();
void addBinding(Binding binding);
@@ -166,8 +164,6 @@ public interface AMQQueue<E extends Queu
boolean isOverfull();
- void deleteMessageFromTop();
-
long clearQueue() throws QpidSecurityException;
/**
Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=1569119&r1=1569118&r2=1569119&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Mon Feb 17 22:15:07 2014
@@ -170,7 +170,6 @@ abstract class SimpleAMQQueue<E extends
private boolean _noLocal;
private final AtomicBoolean _overfull = new AtomicBoolean(false);
- private boolean _deleteOnNoConsumers;
private final CopyOnWriteArrayList<Binding> _bindings = new CopyOnWriteArrayList<Binding>();
private UUID _id;
private final Map<String, Object> _arguments;
@@ -846,16 +845,6 @@ abstract class SimpleAMQQueue<E extends
}
}
- public boolean getDeleteOnNoConsumers()
- {
- return _deleteOnNoConsumers;
- }
-
- public void setDeleteOnNoConsumers(boolean b)
- {
- _deleteOnNoConsumers = b;
- }
-
public void addBinding(final Binding binding)
{
_bindings.add(binding);
@@ -1458,24 +1447,6 @@ abstract class SimpleAMQQueue<E extends
// ------ Management functions
- // TODO - now only used by the tests
- public void deleteMessageFromTop()
- {
- QueueEntryIterator<E,Q,L,QueueConsumer<?,E,Q,L>> queueListIterator = _entries.iterator();
- boolean noDeletes = true;
-
- while (noDeletes && queueListIterator.advance())
- {
- E node = queueListIterator.getNode();
- if (node.acquire())
- {
- dequeueEntry(node);
- noDeletes = false;
- }
-
- }
- }
-
public long clearQueue() throws QpidSecurityException
{
return clear(0l);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?rev=1569119&r1=1569118&r2=1569119&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java Mon Feb 17 22:15:07 2014
@@ -107,7 +107,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
int queueCount = routeMessage("a.c",1l);
@@ -129,7 +129,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
@@ -139,7 +139,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
int queueCount = routeMessage("a",2l);
@@ -160,7 +160,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
routeMessage("a.b",1l);
@@ -169,7 +169,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
@@ -179,7 +179,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 2l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
routeMessage("a",3l);
@@ -188,7 +188,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 3l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
@@ -210,7 +210,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 0l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
routeMessage("a.c.b",1l);
@@ -219,7 +219,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
}
@@ -242,7 +242,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
queueCount = routeMessage("a.b.c.b",2l);
@@ -256,7 +256,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 3l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
}
@@ -278,7 +278,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
}
@@ -299,7 +299,7 @@ public class TopicExchangeTest extends Q
Assert.assertEquals("Wrong message received", 1l, queue.getMessagesOnTheQueue().get(0).getMessage().getMessageNumber());
- queue.deleteMessageFromTop();
+ queue.clearQueue();
Assert.assertEquals(0, queue.getMessageCount());
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java?rev=1569119&r1=1569118&r2=1569119&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java Mon Feb 17 22:15:07 2014
@@ -70,15 +70,6 @@ public class MockAMQQueue implements AMQ
}
- public boolean getDeleteOnNoConsumers()
- {
- return false;
- }
-
- public void setDeleteOnNoConsumers(boolean b)
- {
- }
-
public void addBinding(final Binding binding)
{
_bindings.add(binding);
@@ -448,11 +439,6 @@ public class MockAMQQueue implements AMQ
return 0;
}
- public void deleteMessageFromTop()
- {
-
- }
-
public long clearQueue()
{
return 0;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java?rev=1569119&r1=1569118&r2=1569119&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTestBase.java Mon Feb 17 22:15:07 2014
@@ -795,38 +795,6 @@ abstract class SimpleAMQQueueTestBase<E
}
}
-
-
- /**
- * Tests that dequeued message on the top is not accounted and next message
- * is deleted from the queue on invocation of
- * {@link SimpleAMQQueue#deleteMessageFromTop()}
- */
- public void testDeleteMessageFromTopWithDequeuedEntryOnTop()
- {
- int messageNumber = 4;
- int dequeueMessageIndex = 0;
-
- // put messages into a test queue
- enqueueGivenNumberOfMessages(_queue, messageNumber);
-
- // dequeue message on top
- dequeueMessage(_queue, dequeueMessageIndex);
-
- //delete message from top
- _queue.deleteMessageFromTop();
-
- //get queue entries
- List<E> entries = _queue.getMessagesOnTheQueue();
-
- // assert queue entries
- assertNotNull("Null is returned from getMessagesOnTheQueue", entries);
- assertEquals("Expected " + (messageNumber - 2) + " number of messages but recieved " + entries.size(),
- messageNumber - 2, entries.size());
- assertEquals("Expected first entry with id 2", 2l,
- (entries.get(0).getMessage()).getMessageNumber());
- }
-
/**
* Tests that all messages including dequeued one are deleted from the queue
* on invocation of {@link SimpleAMQQueue#clearQueue()}
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=1569119&r1=1569118&r2=1569119&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 Mon Feb 17 22:15:07 2014
@@ -73,7 +73,6 @@ public class StandardQueueTest extends S
final StandardQueue queue = new StandardQueue(getVirtualHost(), null, queueAttributes);
setQueue(queue);
- getQueue().setDeleteOnNoConsumers(true);
ServerMessage message = createMessage(25l);
QueueConsumer consumer =
Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1569119&r1=1569118&r2=1569119&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Mon Feb 17 22:15:07 2014
@@ -981,12 +981,6 @@ class ManagementNode implements MessageS
}
@Override
- public boolean isExclusive()
- {
- return false;
- }
-
- @Override
public boolean verifySessionAccess(final AMQSessionModel<?, ?> session)
{
return true;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org