svn commit: r1819412 - /commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java

[dbrosius]

Author: dbrosius
Date: Thu Dec 28 09:52:09 2017
New Revision: 1819412

URL: http://svn.apache.org/viewvc?rev=1819412&view=rev
Log:
remove unnecessary field masking from local variables

Modified:
    
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java

Modified: 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java?rev=1819412&r1=1819411&r2=1819412&view=diff
==============================================================================
--- 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java
 (original)
+++ 
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils2/BeanMap.java
 Thu Dec 28 09:52:09 2017
@@ -69,7 +69,7 @@ public class BeanMap extends AbstractMap
 
     /**
      * This HashMap has been made unmodifiable to prevent issues when
-     * loaded in a shared ClassLoader enviroment.
+     * loaded in a shared ClassLoader environment.
      *
      * @see "http://issues.apache.org/jira/browse/BEANUTILS-112";
      * @deprecated Use {@link BeanMap#getTypeTransformer(Class)} method
@@ -127,9 +127,9 @@ public class BeanMap extends AbstractMap
     };
 
     private static Map<Class<? extends Object>, Transformer> 
createTypeTransformers() {
-        final Map<Class<? extends Object>, Transformer> defaultTransformers =
+        final Map<Class<? extends Object>, Transformer> defTransformers =
                 new HashMap<>();
-        defaultTransformers.put(
+        defTransformers.put(
             Boolean.TYPE,
             new Transformer() {
                 @Override
@@ -138,7 +138,7 @@ public class BeanMap extends AbstractMap
                 }
             }
         );
-        defaultTransformers.put(
+        defTransformers.put(
             Character.TYPE,
             new Transformer() {
                 @Override
@@ -147,7 +147,7 @@ public class BeanMap extends AbstractMap
                 }
             }
         );
-        defaultTransformers.put(
+        defTransformers.put(
             Byte.TYPE,
             new Transformer() {
                 @Override
@@ -156,7 +156,7 @@ public class BeanMap extends AbstractMap
                 }
             }
         );
-        defaultTransformers.put(
+        defTransformers.put(
             Short.TYPE,
             new Transformer() {
                 @Override
@@ -165,7 +165,7 @@ public class BeanMap extends AbstractMap
                 }
             }
         );
-        defaultTransformers.put(
+        defTransformers.put(
             Integer.TYPE,
             new Transformer() {
                 @Override
@@ -174,7 +174,7 @@ public class BeanMap extends AbstractMap
                 }
             }
         );
-        defaultTransformers.put(
+        defTransformers.put(
             Long.TYPE,
             new Transformer() {
                 @Override
@@ -183,7 +183,7 @@ public class BeanMap extends AbstractMap
                 }
             }
         );
-        defaultTransformers.put(
+        defTransformers.put(
             Float.TYPE,
             new Transformer() {
                 @Override
@@ -192,7 +192,7 @@ public class BeanMap extends AbstractMap
                 }
             }
         );
-        defaultTransformers.put(
+        defTransformers.put(
             Double.TYPE,
             new Transformer() {
                 @Override
@@ -201,7 +201,7 @@ public class BeanMap extends AbstractMap
                 }
             }
         );
-        return defaultTransformers;
+        return defTransformers;
     }
 
 
@@ -763,7 +763,7 @@ public class BeanMap extends AbstractMap
     /**
      * Map entry used by {@link BeanMap}.
      */
-    protected static class Entry extends AbstractMapEntry {
+    protected static class Entry extends AbstractMapEntry<Object, Object> {
         private final BeanMap owner;
 
         /**
@@ -815,9 +815,9 @@ public class BeanMap extends AbstractMap
         throws IllegalAccessException, ClassCastException {
         try {
             if ( value != null ) {
-                final Class<? extends Object>[] types = 
method.getParameterTypes();
-                if ( types != null && types.length > 0 ) {
-                    final Class<? extends Object> paramType = types[0];
+                final Class<? extends Object>[] parmTypes = 
method.getParameterTypes();
+                if ( parmTypes != null && parmTypes.length > 0 ) {
+                    final Class<? extends Object> paramType = parmTypes[0];
                     if ( ! paramType.isAssignableFrom( value.getClass() ) ) {
                         value = convertType( paramType, value );
                     }
@@ -878,9 +878,8 @@ public class BeanMap extends AbstractMap
         throws InstantiationException, IllegalAccessException, 
IllegalArgumentException, InvocationTargetException {
 
         // try call constructor
-        final Class<?>[] types = { value.getClass() };
         try {
-            final Constructor<?> constructor = newType.getConstructor( types );
+            final Constructor<?> constructor = newType.getConstructor( 
value.getClass() );
             final Object[] arguments = { value };
             return constructor.newInstance( arguments );
         }