Merge branch '1.X' of https://github.com/apache/commons-beanutils.git into 1.X

Author: garydgregory

src/conf/checkstyle.xml

@@ -60,7 +60,9 @@ limitations under the License.
       <property name="scope" value="protected" />
     </module>
     <module name="NeedBraces" />
+    <module name="ParenPad" />
     <module name="RedundantImport" />
+    <module name="TypecastParenPad" />    
     <module name="UnusedImports" />
   </module>
   <property name="localeLanguage" value="en" />

src/main/java/org/apache/commons/beanutils/BeanComparator.java

@@ -71,7 +71,7 @@ public class BeanComparator<T> implements Comparator<T>, Serializable {
      * </p>
      */
     public BeanComparator() {
-        this( null );
+        this(null);
     }
 
     /**
@@ -232,7 +232,7 @@ private int internalCompare(final Object val1, final Object val2) {
      * @param property String method name to call to compare
      * If the property passed in is null then the actual objects will be compared
      */
-    public void setProperty( final String property ) {
+    public void setProperty(final String property) {
         this.property = property;
     }
 }

src/main/java/org/apache/commons/beanutils/BeanMap.java

@@ -65,7 +65,7 @@ public boolean evaluate(final Object object) {
         boolean evaluation = false;
 
         try {
-            final Object propValue = PropertyUtils.getProperty( object, propertyName );
+            final Object propValue = PropertyUtils.getProperty(object, propertyName);
             evaluation = predicate.evaluate(propValue);
         } catch (final IllegalArgumentException e) {
             final String errorMsg = "Problem during evaluation.";

src/main/java/org/apache/commons/beanutils/BeanPredicate.java

@@ -514,10 +514,10 @@ public void setElementType(final Class<?> elementType) {
         this.elementDynaBeanType = dynaBean.getClass();
 
         // Re-calculate the type
-        if (WrapDynaBean.class.isAssignableFrom(elementDynaBeanType )) {
-            this.elementType = ((WrapDynaBean)dynaBean).getInstance().getClass();
-        } else if (LazyDynaMap.class.isAssignableFrom(elementDynaBeanType )) {
-            this.elementType = ((LazyDynaMap)dynaBean).getMap().getClass();
+        if (WrapDynaBean.class.isAssignableFrom(elementDynaBeanType)) {
+            this.elementType = ((WrapDynaBean) dynaBean).getInstance().getClass();
+        } else if (LazyDynaMap.class.isAssignableFrom(elementDynaBeanType)) {
+            this.elementType = ((LazyDynaMap) dynaBean).getMap().getClass();
         }
 
     }

src/main/java/org/apache/commons/beanutils/LazyDynaList.java

@@ -521,9 +521,9 @@ public static Method getMatchingAccessibleMethod(
                             }
                             setMethodAccessible(method); // Default access superclass workaround
                             myCost = getTotalTransformationCost(parameterTypes,method.getParameterTypes());
-                            if ( myCost < bestMatchCost ) {
-                               bestMatch = method;
-                               bestMatchCost = myCost;
+                            if (myCost < bestMatchCost) {
+                                bestMatch = method;
+                                bestMatchCost = myCost;
                             }
                         }
 
@@ -532,11 +532,11 @@ public static Method getMatchingAccessibleMethod(
                 }
             }
         }
-        if ( bestMatch != null ){
-                 cacheMethod(md, bestMatch);
+        if (bestMatch != null) {
+            cacheMethod(md, bestMatch);
         } else {
-        // didn't find a match
-               log.trace("No match found.");
+            // didn't find a match
+            log.trace("No match found.");
         }
 
         return bestMatch;

src/main/java/org/apache/commons/beanutils/MethodUtils.java

@@ -1197,58 +1197,43 @@ public Resolver getResolver() {
      * @throws NoSuchMethodException if an accessor method for this
      *  propety cannot be found
      */
-    public Object getSimpleProperty(final Object bean, final String name)
-            throws IllegalAccessException, InvocationTargetException,
-            NoSuchMethodException {
+    public Object getSimpleProperty(final Object bean, final String name) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
 
         if (bean == null) {
             throw new IllegalArgumentException("No bean specified");
         }
         if (name == null) {
-            throw new IllegalArgumentException("No name specified for bean class '" +
-                    bean.getClass() + "'");
+            throw new IllegalArgumentException("No name specified for bean class '" + bean.getClass() + "'");
         }
 
         // Validate the syntax of the property name
         if (resolver.hasNested(name)) {
-            throw new IllegalArgumentException
-                    ("Nested property names are not allowed: Property '" +
-                    name + "' on bean class '" + bean.getClass() + "'");
+            throw new IllegalArgumentException("Nested property names are not allowed: Property '" + name + "' on bean class '" + bean.getClass() + "'");
         }
         if (resolver.isIndexed(name)) {
-            throw new IllegalArgumentException
-                    ("Indexed property names are not allowed: Property '" +
-                    name + "' on bean class '" + bean.getClass() + "'");
+            throw new IllegalArgumentException("Indexed property names are not allowed: Property '" + name + "' on bean class '" + bean.getClass() + "'");
         }
         if (resolver.isMapped(name)) {
-            throw new IllegalArgumentException
-                    ("Mapped property names are not allowed: Property '" +
-                    name + "' on bean class '" + bean.getClass() + "'");
+            throw new IllegalArgumentException("Mapped property names are not allowed: Property '" + name + "' on bean class '" + bean.getClass() + "'");
         }
 
         // Handle DynaBean instances specially
         if (bean instanceof DynaBean) {
-            final DynaProperty descriptor =
-                    ((DynaBean) bean).getDynaClass().getDynaProperty(name);
+            final DynaProperty descriptor = ((DynaBean) bean).getDynaClass().getDynaProperty(name);
             if (descriptor == null) {
-                throw new NoSuchMethodException("Unknown property '" +
-                        name + "' on dynaclass '" +
-                        ((DynaBean) bean).getDynaClass() + "'" );
+                throw new NoSuchMethodException("Unknown property '" + name + "' on dynaclass '" + ((DynaBean) bean).getDynaClass() + "'");
             }
             return ((DynaBean) bean).get(name);
         }
 
         // Retrieve the property getter method for the specified property
-        final PropertyDescriptor descriptor =
-                getPropertyDescriptor(bean, name);
+        final PropertyDescriptor descriptor = getPropertyDescriptor(bean, name);
         if (descriptor == null) {
-            throw new NoSuchMethodException("Unknown property '" +
-                    name + "' on class '" + bean.getClass() + "'" );
+            throw new NoSuchMethodException("Unknown property '" + name + "' on class '" + bean.getClass() + "'");
         }
         final Method readMethod = getReadMethod(bean.getClass(), descriptor);
         if (readMethod == null) {
-            throw new NoSuchMethodException("Property '" + name +
-                    "' has no getter method in class '" + bean.getClass() + "'");
+            throw new NoSuchMethodException("Property '" + name + "' has no getter method in class '" + bean.getClass() + "'");
         }
 
         return invokeMethod(readMethod, bean, EMPTY_OBJECT_ARRAY);

src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java

@@ -243,7 +243,7 @@ public RowSetDynaClass(final ResultSet resultSet, final int limit) throws SQLExc
     protected void copy(final ResultSet resultSet) throws SQLException {
 
         int cnt = 0;
-        while (resultSet.next() && (limit < 0  || cnt++ < limit) ) {
+        while (resultSet.next() && (limit < 0 || cnt++ < limit)) {
             final DynaBean bean = createDynaBean();
             for (final DynaProperty propertie : properties) {
                 final String name = propertie.getName();

src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java

@@ -316,7 +316,6 @@ protected K iteratorNext(final Map.Entry<K, V> entry) {
     }
 
     // Constructors
-    // ----------------------------------------------------------------------
 
     /**
      * Collection implementation over the values of the FastHashMap
@@ -347,7 +346,6 @@ protected V iteratorNext(final Map.Entry<K, V> entry) {
     private boolean fast;
 
     // Property access
-    // ----------------------------------------------------------------------
 
     /**
      * Construct an empty map.
@@ -366,7 +364,6 @@ public WeakFastHashMap(final int capacity) {
     }
 
     // Map access
-    // ----------------------------------------------------------------------
     // These methods can forward straight to the wrapped Map in 'fast' mode.
     // (because they are query methods)
 
@@ -430,7 +427,6 @@ protected Map<K, V> cloneMap(final Map<? extends K, ? extends V> map) {
     }
 
     // Map modification
-    // ----------------------------------------------------------------------
     // These methods perform special behaviour in 'fast' mode.
     // The map is cloned, updated and then assigned back.
     // See the comments at the top as to why this won't always work.
@@ -478,7 +474,6 @@ protected Map<K, V> createMap(final int capacity) {
     }
 
     // Basic object methods
-    // ----------------------------------------------------------------------
 
     protected Map<K, V> createMap(final int capacity, final float factor) {
         return new WeakHashMap<>(capacity, factor);
@@ -499,7 +494,6 @@ public Set<Map.Entry<K, V>> entrySet() {
     }
 
     // Map views
-    // ----------------------------------------------------------------------
 
     /**
      * Compare the specified object with this list for equality.  This
@@ -588,7 +582,6 @@ public boolean getFast() {
     }
 
     // Abstractions on Map creations (for subclasses such as WeakFastHashMap)
-    // ----------------------------------------------------------------------
 
     /**
      * Return the hash code value for this map.  This implementation uses
@@ -685,7 +678,6 @@ public void putAll(final Map<? extends K, ? extends V> in) {
     }
 
     // Map view inner classes
-    // ----------------------------------------------------------------------
 
     /**
      * Remove any mapping for this key, and return any previously

src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java

@@ -417,9 +417,7 @@ protected FastHashMap create(final Locale locale) {
         // behaviour of toString and valueOf methods of these classes
         converter.put(java.sql.Date.class, new SqlDateLocaleConverter(locale, "yyyy-MM-dd"));
         converter.put(java.sql.Time.class, new SqlTimeLocaleConverter(locale, "HH:mm:ss"));
-        converter.put( java.sql.Timestamp.class,
-                       new SqlTimestampLocaleConverter(locale, "yyyy-MM-dd HH:mm:ss.S")
-                     );
+        converter.put(java.sql.Timestamp.class, new SqlTimestampLocaleConverter(locale, "yyyy-MM-dd HH:mm:ss.S"));
 
         converter.setFast(true);