hide some methods from the public interface of Consumer

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-amqp-1-0-management@1565027 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 16 insertions, 23 deletions

diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java b/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java
index 7f6f7f44e9..e082d6eee4 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java
+++ b/java/broker-core/src/main/java/org/apache/qpid/server/consumer/Consumer.java
@@ -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();
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java b/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
index f1b612a086..ff7840255a 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
+++ b/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumer.java
@@ -49,6 +49,14 @@ import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.SUBSCRIPT
 
 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 ConsumerTarget> implements Consumer
         _target.queueEmpty();
     }
 
-    @Override
-    public State getState()
+    State getState()
     {
         return STATE_MAP.get(_target.getState());
     }
@@ -281,7 +288,7 @@ class QueueConsumer<T extends ConsumerTarget> implements Consumer
         return _logActor.getLogSubject();
     }
 
-    public final LogActor getLogActor()
+    final LogActor getLogActor()
     {
         return _logActor;
     }
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index 9bf237660c..8fe9d31e3e 100644
--- a/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/java/broker-core/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -57,7 +57,7 @@ import org.apache.qpid.server.util.StateChangeListener;
 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 AMQQueue<QueueConsumer>,
 
     }
 
-    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();
 
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
index 479c715b2a..e895f81c44 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
@@ -130,8 +130,7 @@ public class QueueBrowserUsesNoAckTest extends QpidTestCase
         //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)