QPID-2857 : Address issues found by running FindBugs against the Java codebase

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@996393 13f79535-47bb-0310-9956-ffa450edef68

18 files changed, 121 insertions, 106 deletions

diff --git a/java/management/client/src/main/java/org/apache/qpid/management/Names.java b/java/management/client/src/main/java/org/apache/qpid/management/Names.java
index d3ce711d5d..b60867d9ff 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/Names.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/Names.java
@@ -28,39 +28,39 @@ import javax.xml.namespace.QName;
  */
 public abstract class Names
 {
-    public static String MANAGEMENT_EXCHANGE = "qpid.management";    
-    public static String MANAGEMENT_ROUTING_KEY = "console.#";
+    public static final String MANAGEMENT_EXCHANGE = "qpid.management";
+    public static final String MANAGEMENT_ROUTING_KEY = "console.#";
    
-    public static String MANAGEMENT_QUEUE_PREFIX = "management.";
-    public static String METHOD_REPLY_QUEUE_PREFIX = "reply.";
+    public static final String MANAGEMENT_QUEUE_PREFIX = "management.";
+    public static final String METHOD_REPLY_QUEUE_PREFIX = "reply.";
    
-    public static String AMQ_DIRECT_QUEUE = "amq.direct";
-    public static String AGENT_ROUTING_KEY_PREFIX = "agent.";
-    public static String AGENT_ROUTING_KEY = AGENT_ROUTING_KEY_PREFIX+"1.0";
+    public static final String AMQ_DIRECT_QUEUE = "amq.direct";
+    public static final String AGENT_ROUTING_KEY_PREFIX = "agent.";
+    public static final String AGENT_ROUTING_KEY = AGENT_ROUTING_KEY_PREFIX+"1.0";
 
-    public static String APPLICATION_NAME ="Q-Man";
+    public static final String APPLICATION_NAME ="Q-Man";
     
     // Attributes
-    public static String PACKAGE = "package";
-    public static String CLASS = "class";
-    public static String EVENT = "event";
-    public static String OBJECT_ID="objectId";    
-    public static String BROKER_ID = "brokerId";
-    public static String DOMAIN_NAME = "Q-MAN";
+    public static final String PACKAGE = "package";
+    public static final String CLASS = "class";
+    public static final String EVENT = "event";
+    public static final String OBJECT_ID="objectId";
+    public static final String BROKER_ID = "brokerId";
+    public static final String DOMAIN_NAME = "Q-MAN";
         
-    public static String ARG_COUNT_PARAM_NAME = "argCount";
-    public static String DEFAULT_PARAM_NAME ="default";
+    public static final String ARG_COUNT_PARAM_NAME = "argCount";
+    public static final String DEFAULT_PARAM_NAME ="default";
     
-    public static String NUMBER_VALIDATOR = "org.apache.qpid.management.domain.model.QpidProperty$NumberValidator";
-    public static String STRING_VALIDATOR = "org.apache.qpid.management.domain.model.QpidProperty$StringValidator";
+    public static final String NUMBER_VALIDATOR = "org.apache.qpid.management.domain.model.QpidProperty$NumberValidator";
+    public static final String STRING_VALIDATOR = "org.apache.qpid.management.domain.model.QpidProperty$StringValidator";
     
-    public static String QMAN_CONFIG_OPTION_NAME = "qman-config";
+    public static final String QMAN_CONFIG_OPTION_NAME = "qman-config";
     
-    public static String ADD_BROKER_OPERATION_NAME = "addBroker";
+    public static final String ADD_BROKER_OPERATION_NAME = "addBroker";
     
-    public static String NOT_AVAILABLE = "N.A.";
+    public static final String NOT_AVAILABLE = "N.A.";
     
-    public static ObjectName QPID_EMULATOR_OBJECT_NAME;
+    public static final ObjectName QPID_EMULATOR_OBJECT_NAME;
     static 
     {
 	    try 
@@ -77,7 +77,7 @@ public abstract class Names
 	    }
     }    
     
-    public static ObjectName QMAN_OBJECT_NAME;
+    public static final ObjectName QMAN_OBJECT_NAME;
     static 
     {
 	    try 
@@ -95,11 +95,11 @@ public abstract class Names
     }
     
     // WSDM Stuff
-    public static String NAMESPACE_URI = "http://amqp.apache.org/qpid/management/qman";
+    public static final String NAMESPACE_URI = "http://amqp.apache.org/qpid/management/qman";
     public final static String PREFIX = "qman";
 
-    public static String ADDRESSING_URI = "http://amqp.apache.org/qpid/management/qman/addressing";
-    public static String ADDRESSING_PREFIX = "qman-wsa";
+    public static final String ADDRESSING_URI = "http://amqp.apache.org/qpid/management/qman/addressing";
+    public static final String ADDRESSING_PREFIX = "qman-wsa";
     
     public static final QName RESOURCE_ID_QNAME = new QName(
     		ADDRESSING_URI, 
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java
index b796620747..a64659b17c 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/BrokerConnectionData.java
@@ -251,16 +251,26 @@ public class BrokerConnectionData
     }
     
     @Override
-    public boolean equals(Object object) {
-    	try 
-    	{
-			BrokerConnectionData connectionData = (BrokerConnectionData) object;
-			return (_host.equals(connectionData._host) )
-					&& (_port == connectionData._port)
-					&& (_virtualHost.equals(connectionData._virtualHost));
-		} catch (Exception exception) {
-			return false;
-		}
+    public boolean equals(Object object)
+    {
+    	if(object instanceof BrokerConnectionData)
+        {
+            try
+            {
+                BrokerConnectionData connectionData = (BrokerConnectionData) object;
+                return (_host.equals(connectionData._host) )
+                        && (_port == connectionData._port)
+                        && (_virtualHost.equals(connectionData._virtualHost));
+            }
+            catch (Exception exception)
+            {
+                return false;
+            }
+        }
+        else
+        {
+            return false;    
+        }
     }
     
     @Override
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java
index 51dc62f4fa..ab90ec294b 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/Configuration.java
@@ -88,10 +88,6 @@ public final class Configuration
         addTypeMappings();
     }
 
-    void clean()
-    {
-    	INSTANCE = new Configuration();
-    }
     
     /**
      * Returns the singleton instance.
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/configuration/WorkerManagerConfigurationParser.java b/java/management/client/src/main/java/org/apache/qpid/management/configuration/WorkerManagerConfigurationParser.java
index b99f272053..4e68b54b12 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/configuration/WorkerManagerConfigurationParser.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/configuration/WorkerManagerConfigurationParser.java
@@ -71,6 +71,7 @@ class WorkerManagerConfigurationParser implements IParser
             case MAX_POOL_CAPACITY : 
             {
             	_maxPoolSizeAsString = _currentValue;
+                break;
             }
             case KEEP_ALIVE_TIME: 
             {
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java
index e9799cb147..c25a5d7d1c 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/QpidPackage.java
@@ -71,8 +71,15 @@ final class QpidPackage
         @Override
         public boolean equals (Object obj)
         {
-            QpidClassIdentity identity = (QpidClassIdentity) obj;
-            return name.equals(identity.name) && hash.equals(identity.hash);
+            if(obj instanceof QpidClassIdentity)
+            {
+                QpidClassIdentity identity = (QpidClassIdentity) obj;
+                return name.equals(identity.name) && hash.equals(identity.hash);
+            }
+            else
+            {
+                return false;
+            }
         }
     }
     
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
index 343280ca4b..95cb03b04b 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Binary.java
@@ -102,11 +102,18 @@ public final class Binary implements Serializable
     @Override
     public boolean equals (Object obj)
     {
-        try
+        if(obj instanceof Binary)
         {
-            Binary binary = (Binary)obj;
-            return Arrays.equals(_bytes, binary._bytes);
-        } catch (Exception exception)
+            try
+            {
+                Binary binary = (Binary)obj;
+                return Arrays.equals(_bytes, binary._bytes);
+            } catch (Exception exception)
+            {
+                return false;
+            }
+        }
+        else
         {
             return false;
         }
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
index c455faaf2c..7f92ec82b0 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Type.java
@@ -82,13 +82,13 @@ public abstract class Type
     @Override
     public boolean equals (Object obj)
     {
-        return getClass() == obj.getClass();
+        return (obj instanceof Type) && getJavaType() == ((Type)obj).getJavaType();
     }
     
     @Override
     public int hashCode ()
     {
-        return getClass().hashCode();
+        return getJavaType().hashCode();
     }
 
     /**
diff --git a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
index 20e97adf8c..7d61d32f71 100644
--- a/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
+++ b/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
@@ -21,6 +21,7 @@
 package org.apache.qpid.management.common.mbeans;
 
 import java.io.IOException;
+import java.util.*;
 
 import javax.management.JMException;
 import javax.management.MBeanOperationInfo;
@@ -54,45 +55,48 @@ public interface ManagedQueue
     String[] VIEW_MSG_CONTENT_COMPOSITE_ITEM_DESCRIPTIONS = { "AMQ MessageId", "MimeType", "Encoding", "Content" };
     
     //Individual attribute name constants
-    String ATTR_NAME = "Name";
-    String ATTR_OWNER = "Owner";
-    String ATTR_MAX_MSG_AGE = "MaximumMessageAge";
-    String ATTR_MAX_MSG_COUNT = "MaximumMessageCount";
-    String ATTR_MAX_QUEUE_DEPTH = "MaximumQueueDepth";
-    String ATTR_MAX_MSG_SIZE = "MaximumMessageSize";
-    String ATTR_DURABLE = "Durable";
-    String ATTR_AUTODELETE = "AutoDelete";
-    String ATTR_CONSUMER_COUNT = "ConsumerCount";
-    String ATTR_ACTIVE_CONSUMER_COUNT = "ActiveConsumerCount";
-    String ATTR_MSG_COUNT = "MessageCount";
-    String ATTR_QUEUE_DEPTH = "QueueDepth";
-    String ATTR_RCVD_MSG_COUNT = "ReceivedMessageCount";
-    String ATTR_CAPACITY = "Capacity";
-    String ATTR_FLOW_OVERFULL = "FlowOverfull";
-    String ATTR_FLOW_RESUME_CAPACITY = "FlowResumeCapacity";
-    String ATTR_EXCLUSIVE = "Exclusive";
+    static final String ATTR_NAME = "Name";
+    static final String ATTR_OWNER = "Owner";
+    static final String ATTR_MAX_MSG_AGE = "MaximumMessageAge";
+    static final String ATTR_MAX_MSG_COUNT = "MaximumMessageCount";
+    static final String ATTR_MAX_QUEUE_DEPTH = "MaximumQueueDepth";
+    static final String ATTR_MAX_MSG_SIZE = "MaximumMessageSize";
+    static final String ATTR_DURABLE = "Durable";
+    static final String ATTR_AUTODELETE = "AutoDelete";
+    static final String ATTR_CONSUMER_COUNT = "ConsumerCount";
+    static final String ATTR_ACTIVE_CONSUMER_COUNT = "ActiveConsumerCount";
+    static final String ATTR_MSG_COUNT = "MessageCount";
+    static final String ATTR_QUEUE_DEPTH = "QueueDepth";
+    static final String ATTR_RCVD_MSG_COUNT = "ReceivedMessageCount";
+    static final String ATTR_CAPACITY = "Capacity";
+    static final String ATTR_FLOW_OVERFULL = "FlowOverfull";
+    static final String ATTR_FLOW_RESUME_CAPACITY = "FlowResumeCapacity";
+    static final String ATTR_EXCLUSIVE = "Exclusive";
     
     //All attribute names constant
-    String[] QUEUE_ATTRIBUTES = new String[]{
-            ATTR_NAME,
-            ATTR_OWNER,
-            ATTR_MAX_MSG_AGE,
-            ATTR_MAX_MSG_COUNT,
-            ATTR_MAX_QUEUE_DEPTH,
-            ATTR_MAX_MSG_SIZE,
-            ATTR_DURABLE,
-            ATTR_AUTODELETE,
-            ATTR_CONSUMER_COUNT,
-            ATTR_ACTIVE_CONSUMER_COUNT,
-            ATTR_MSG_COUNT,
-            ATTR_QUEUE_DEPTH,
-            ATTR_RCVD_MSG_COUNT,
-            ATTR_CAPACITY,
-            ATTR_FLOW_OVERFULL,
-            ATTR_FLOW_RESUME_CAPACITY,
-            ATTR_EXCLUSIVE
-    };
-    
+    static final List<String> QUEUE_ATTRIBUTES
+            = Collections.unmodifiableList(
+                new ArrayList<String>(
+                        new HashSet<String>(
+                                Arrays.asList(
+                                    ATTR_NAME,
+                                    ATTR_OWNER,
+                                    ATTR_MAX_MSG_AGE,
+                                    ATTR_MAX_MSG_COUNT,
+                                    ATTR_MAX_QUEUE_DEPTH,
+                                    ATTR_MAX_MSG_SIZE,
+                                    ATTR_DURABLE,
+                                    ATTR_AUTODELETE,
+                                    ATTR_CONSUMER_COUNT,
+                                    ATTR_ACTIVE_CONSUMER_COUNT,
+                                    ATTR_MSG_COUNT,
+                                    ATTR_QUEUE_DEPTH,
+                                    ATTR_RCVD_MSG_COUNT,
+                                    ATTR_CAPACITY,
+                                    ATTR_FLOW_OVERFULL,
+                                    ATTR_FLOW_RESUME_CAPACITY,
+                                    ATTR_EXCLUSIVE))));
+
     /**
      * Returns the Name of the ManagedQueue.
      * @return the name of the managedQueue.
diff --git a/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java b/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
index f449ecb7e5..1a4a73f207 100644
--- a/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
+++ b/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
@@ -48,12 +48,8 @@ public class ManagedQueueTest extends TestCase
         {
             StandardMBean mbean = new StandardMBean(impl, ManagedQueue.class);
             
-            List<String> attributeList = new ArrayList<String>();
-            for(String attr : ManagedQueue.QUEUE_ATTRIBUTES)
-            {
-                attributeList.add(attr);
-            }
-            
+            List<String> attributeList = ManagedQueue.QUEUE_ATTRIBUTES;
+
             //retrieve the attributes from the constructed MBeanInfo
             MBeanAttributeInfo[] attributes = mbean.getMBeanInfo().getAttributes();
 
diff --git a/java/management/console/src/main/java/org/apache/qpid/console/Session.java b/java/management/console/src/main/java/org/apache/qpid/console/Session.java
index 822f215f4d..3bbc8ecdad 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/Session.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/Session.java
@@ -477,7 +477,7 @@ public class Session
                 Object sClass = args.get("_schema");

                 Object oid = args.get("_objectID");

                 long[] hash = (long[]) args.get("_hash");

-                if ((className == null) && (oid == null) && (oid == null))

+                if ((className == null) && (oid == null))

                 {

                     throw new ConsoleException(

                             "No class supplied, use '_schema', '_key', '_class', or '_objectId' argument");

diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
index fc17538cf9..c3c0277f7d 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
@@ -135,7 +135,7 @@ public abstract class ServerRegistry
     
     protected void removeVirtualHostManagerMBean(ManagedBean mbean)
     {
-        _vhostManagers.remove(mbean);
+        _vhostManagers.remove(mbean.getVirtualHostName());
     }
     
     public ManagedBean getVirtualHostManagerMBean(String virtualHost)
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
index 655718c098..d95ca8b2e4 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
@@ -271,7 +271,7 @@ public class ViewUtility
         List objectData = (List)compositeHolder.getData();
         if (objectData == null || objectData.isEmpty())
         {
-            //          TODO
+           //          TODO
         }
 
         // Get the index of record to be shown.
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
index c5ab5184ee..285dcfc0ee 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
@@ -650,7 +650,6 @@ public class QueueTypeTabControl extends MBeanTypeTabControl
     private class QueueLabelProviderImpl extends LabelProvider implements ITableLabelProvider
     {
         @SuppressWarnings("unchecked")
-        @Override
         public String getColumnText(Object element, int columnIndex)
         {
             List<Object> attributes = (List<Object>) element;
@@ -677,8 +676,7 @@ public class QueueTypeTabControl extends MBeanTypeTabControl
                     return String.valueOf(attributes.get(columnIndex));
             }
         }
-        
-        @Override
+
         public Image getColumnImage(Object element, int columnIndex)
         {
             return null;
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/ReportGenerator.java b/java/management/tools/qpid-cli/src/org/apache/qpid/ReportGenerator.java
index cc8c16f8b0..9d14f78b42 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/ReportGenerator.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/ReportGenerator.java
@@ -48,7 +48,7 @@ public class ReportGenerator implements Runnable
             generatereport();
             try
             {
-                Thread.sleep(this.interval * 60000);
+                Thread.sleep((long)this.interval * 60000L);
             }
             catch (Exception ex)
             {
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
index 8d690ac7f7..cb67edeb34 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandget.java
@@ -34,7 +34,7 @@ public class Commandget extends CommandImpl
 
     private String _attributeName;
     private String _value;
-    public static String COMMAND_NAME = "get";
+    public static final String COMMAND_NAME = "get";
 
     public Commandget(JMXinfo info)
     {
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
index b5cc9e6090..e70b7b17ad 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandset.java
@@ -34,7 +34,7 @@ public class Commandset extends CommandImpl
 {
     private String _attributeName;
     private String _value;
-    public static String COMMAND_NAME = "set";
+    public static final String COMMAND_NAME = "set";
 
     public Commandset(JMXinfo info)
     {
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java
index e98cb336d8..e3bcc7e543 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandview.java
@@ -58,10 +58,8 @@ public class Commandview extends CommandImpl
 
     public void viewmessages()
     {
-        Set set = null;
-        Object temp[] = { null };
         objname.setQueryString(this.getObject(), this.getName(), this.getVirtualhost());
-        set = objname.returnObjects();
+        Set set = objname.returnObjects();
         String header = "", temp_header = "", message_data = "", outline = "";
 
         if (objname.getSet().size() != 0)
diff --git a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java
index 0c8a4b62b4..d1ae1c1893 100644
--- a/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java
+++ b/java/management/tools/qpid-cli/src/org/apache/qpid/commands/Commandviewcontent.java
@@ -56,10 +56,8 @@ public class Commandviewcontent extends CommandImpl
 
     public void viewcontent()
     {
-        Set set = null;
-        Object temp[] = { null };
         objname.setQueryString(getObject(), getName(), getVirtualhost());
-        set = objname.returnObjects();
+        Set set = objname.returnObjects();
         String temp_header = "", header = "", message_data = "", encoding = null;
 
         if (objname.getSet().size() != 0)