From b31f10c4ccfc7e495a8d697e3b66ccc8e96486fc Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Mon, 3 Mar 2014 16:15:56 +0000
Subject: QPID-5578 : Addressed review comments from Robbie Gemmell

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1573593 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/server/model/Queue.java   | 14 +----------
 .../model/adapter/AbstractConfiguredObject.java    |  2 +-
 .../qpid/server/model/adapter/AmqpPortAdapter.java | 29 ----------------------
 .../apache/qpid/server/queue/AbstractQueue.java    | 27 ++------------------
 4 files changed, 4 insertions(+), 68 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index 1a10537d7b..f056937b1b 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -84,7 +84,7 @@ public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>
 
     // TODO - this should either be a boolean or maybe an enum
     @ManagedAttribute
-    int getMessageGroupSharedGroups();
+    boolean isMessageGroupSharedGroups();
 
 
     @ManagedAttribute
@@ -131,18 +131,6 @@ public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>
 
     void setNotificationListener(QueueNotificationListener listener);
 
-    @ManagedStatistic
-    long getBytesIn();
-
-    @ManagedStatistic
-    long getBytesOut();
-
-    @ManagedStatistic
-    long getMessagesIn();
-
-    @ManagedStatistic
-    long getMessagesOut();
-
     @ManagedStatistic
     int getBindingCount();
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java
index 0f14c033e2..af71da3775 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java
@@ -934,7 +934,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
             }
             else
             {
-                throw new IllegalArgumentException("Cannot convert type " + value.getClass() + " to an Integer");
+                throw new IllegalArgumentException("Cannot convert type " + value.getClass() + " to a Short");
             }
         }
     };
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
index 1e1a9ba4ec..097c179514 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
@@ -202,33 +202,4 @@ public class AmqpPortAdapter extends PortAdapter<AmqpPortAdapter>
         return null;
     }
 
-    @Override
-    public boolean isTcpNoDelay()
-    {
-        return false;
-    }
-
-    @Override
-    public int getSendBufferSize()
-    {
-        return 0;
-    }
-
-    @Override
-    public int getReceiveBufferSize()
-    {
-        return 0;
-    }
-
-    @Override
-    public boolean getNeedClientAuth()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean getWantClientAuth()
-    {
-        return false;
-    }
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 3ba1003531..f7362e18c8 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -2775,9 +2775,9 @@ public abstract class AbstractQueue
     }
 
     @Override
-    public int getMessageGroupSharedGroups()
+    public boolean isMessageGroupSharedGroups()
     {
-        return (Integer) getAttribute(MESSAGE_GROUP_SHARED_GROUPS);
+        return (Boolean) getAttribute(MESSAGE_GROUP_SHARED_GROUPS);
     }
 
 
@@ -2793,29 +2793,6 @@ public abstract class AbstractQueue
         return 0;
     }
 
-    @Override
-    public long getBytesIn()
-    {
-        return 0;
-    }
-
-    @Override
-    public long getBytesOut()
-    {
-        return 0;
-    }
-
-    @Override
-    public long getMessagesIn()
-    {
-        return 0;
-    }
-
-    @Override
-    public long getMessagesOut()
-    {
-        return 0;
-    }
 
     @Override
     public String setName(final String currentName, final String desiredName)
-- 
cgit v1.2.1