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/06 01:55:58 UTC
svn commit: r1565027 - in
/qpid/branches/java-broker-amqp-1-0-management/java:
broker-core/src/main/java/org/apache/qpid/server/consumer/
broker-core/src/main/java/org/apache/qpid/server/queue/
broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/...
Author: rgodfrey
Date: Thu Feb 6 00:55:58 2014
New Revision: 1565027
URL: http://svn.apache.org/r1565027
Log:
hide some methods from the public interface of Consumer
Modified:
qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java
qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java?rev=1565027&r1=1565026&r2=1565027&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java Thu Feb 6 00:55:58 2014
@@ -42,8 +42,6 @@ public interface Consumer
NO_LOCAL
}
- LogActor getLogActor();
-
long getBytesOut();
long getMessagesOut();
@@ -52,13 +50,6 @@ public interface Consumer
long getUnacknowledgedMessages();
- public static enum State
- {
- ACTIVE,
- SUSPENDED,
- CLOSED
- }
-
AMQSessionModel getSessionModel();
void setNoLocal(boolean noLocal);
@@ -82,10 +73,6 @@ public interface Consumer
void releaseSendLock();
- void setStateListener(final StateChangeListener<? extends Consumer, State> listener);
-
- public State getState();
-
boolean isActive();
String getName();
Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java?rev=1565027&r1=1565026&r2=1565027&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java Thu Feb 6 00:55:58 2014
@@ -49,6 +49,14 @@ import static org.apache.qpid.server.log
class QueueConsumer<T extends ConsumerTarget> implements Consumer
{
+
+ public static enum State
+ {
+ ACTIVE,
+ SUSPENDED,
+ CLOSED
+ }
+
private static final Logger _logger = Logger.getLogger(QueueConsumer.class);
private final AtomicBoolean _targetClosed = new AtomicBoolean(false);
private final AtomicBoolean _closed = new AtomicBoolean(false);
@@ -238,8 +246,7 @@ class QueueConsumer<T extends ConsumerTa
_target.queueEmpty();
}
- @Override
- public State getState()
+ State getState()
{
return STATE_MAP.get(_target.getState());
}
@@ -281,7 +288,7 @@ class QueueConsumer<T extends ConsumerTa
return _logActor.getLogSubject();
}
- public final LogActor getLogActor()
+ final LogActor getLogActor()
{
return _logActor;
}
Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=1565027&r1=1565026&r2=1565027&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Thu Feb 6 00:55:58 2014
@@ -57,7 +57,7 @@ import org.apache.qpid.server.util.State
import org.apache.qpid.server.virtualhost.VirtualHost;
public class SimpleAMQQueue implements AMQQueue<QueueConsumer>,
- StateChangeListener<QueueConsumer, Consumer.State>,
+ StateChangeListener<QueueConsumer, QueueConsumer.State>,
MessageGroupManager.ConsumerResetHelper
{
@@ -1026,16 +1026,16 @@ public class SimpleAMQQueue implements A
}
- public void stateChanged(QueueConsumer sub, Consumer.State oldState, Consumer.State newState)
+ public void stateChanged(QueueConsumer sub, QueueConsumer.State oldState, QueueConsumer.State newState)
{
- if (oldState == Consumer.State.ACTIVE && newState != Consumer.State.ACTIVE)
+ if (oldState == QueueConsumer.State.ACTIVE && newState != QueueConsumer.State.ACTIVE)
{
_activeSubscriberCount.decrementAndGet();
}
- else if (newState == Consumer.State.ACTIVE)
+ else if (newState == QueueConsumer.State.ACTIVE)
{
- if (oldState != Consumer.State.ACTIVE)
+ if (oldState != QueueConsumer.State.ACTIVE)
{
_activeSubscriberCount.incrementAndGet();
Modified: qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java?rev=1565027&r1=1565026&r2=1565027&view=diff
==============================================================================
--- qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java (original)
+++ qpid/branches/java-broker-amqp-1-0-management/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java Thu Feb 6 00:55:58 2014
@@ -130,8 +130,7 @@ public class QueueBrowserUsesNoAckTest e
//Check the process didn't suspend the subscription as this would
// indicate we are using the prefetch credit. i.e. using acks not No-Ack
assertTrue("The subscription has been suspended",
- !getChannel().getSubscription(browser).getState()
- .equals(Consumer.State.SUSPENDED));
+ !getChannel().getSubscription(browser).isSuspended());
}
private void checkStoreContents(int messageCount)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org