svn commit: r1508291 - /commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/impl/MethodSignature.java

[jc...@apache.org]

Author: jcarman
Date: Tue Jul 30 03:55:49 2013
New Revision: 1508291

URL: http://svn.apache.org/r1508291
Log:
Fixing Sonar issues.

Modified:
    commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/impl/MethodSignature.java

Modified: commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/impl/MethodSignature.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/impl/MethodSignature.java?rev=1508291&r1=1508290&r2=1508291&view=diff
==============================================================================
--- commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/impl/MethodSignature.java (original)
+++ commons/proper/proxy/branches/version-2.0-work/core/src/main/java/org/apache/commons/proxy2/impl/MethodSignature.java Tue Jul 30 03:55:49 2013
@@ -17,6 +17,9 @@
 
 package org.apache.commons.proxy2.impl;
 
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
@@ -29,54 +32,55 @@ import java.util.List;
  */
 public class MethodSignature
 {
-//**********************************************************************************************************************
+//----------------------------------------------------------------------------------------------------------------------
 // Fields
-//**********************************************************************************************************************
+//----------------------------------------------------------------------------------------------------------------------
 
     private final String name;
     private final List<Class<?>> parameterTypes;
 
-  //**********************************************************************************************************************
- // Constructors
- //**********************************************************************************************************************
+//----------------------------------------------------------------------------------------------------------------------
+// Constructors
+//----------------------------------------------------------------------------------------------------------------------
 
     /**
      * Create a new MethodSignature instance.
+     *
      * @param method
      */
-    public MethodSignature( Method method )
+    public MethodSignature(Method method)
     {
         this.name = method.getName();
         this.parameterTypes = Arrays.asList(method.getParameterTypes());
     }
 
-  //**********************************************************************************************************************
- // Canonical Methods
- //**********************************************************************************************************************
+//----------------------------------------------------------------------------------------------------------------------
+// Canonical Methods
+//----------------------------------------------------------------------------------------------------------------------
 
     /**
      * {@inheritDoc}
      */
-    public boolean equals( Object o )
+    public boolean equals(Object o)
     {
-        if( this == o )
-        {
-            return true;
-        }
-        if( o == null || getClass() != o.getClass() )
+        if (o == null)
         {
             return false;
         }
-        final MethodSignature that = ( MethodSignature ) o;
-        if( !name.equals(that.name) )
+        if (o == this)
         {
-            return false;
+            return true;
         }
-        if( !parameterTypes.equals(that.parameterTypes) )
+        if (o.getClass() != getClass())
         {
             return false;
         }
-        return true;
+        MethodSignature other = (MethodSignature) o;
+        return new EqualsBuilder()
+                .appendSuper(super.equals(o))
+                .append(name, other.name)
+                .append(parameterTypes, other.parameterTypes)
+                .build();
     }
 
     /**
@@ -84,9 +88,6 @@ public class MethodSignature
      */
     public int hashCode()
     {
-        int result;
-        result = name.hashCode();
-        result = 29 * result + parameterTypes.hashCode();
-        return result;
+        return new HashCodeBuilder().append(name).append(parameterTypes).build();
     }
 }