Fix ParenPad

garydgregory · garydgregory · commit 74227b5c1ee8 · 2025-01-21T14:10:20.000-05:00
diff --git a/src/main/java/org/apache/commons/beanutils/BeanComparator.java b/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;
     }
 }
diff --git a/src/main/java/org/apache/commons/beanutils/BeanMap.java b/src/main/java/org/apache/commons/beanutils/BeanMap.java
diff --git a/src/main/java/org/apache/commons/beanutils/BeanPredicate.java b/src/main/java/org/apache/commons/beanutils/BeanPredicate.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.";
diff --git a/src/main/java/org/apache/commons/beanutils/LazyDynaList.java b/src/main/java/org/apache/commons/beanutils/LazyDynaList.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();
         }
 
     }
diff --git a/src/main/java/org/apache/commons/beanutils/MethodUtils.java b/src/main/java/org/apache/commons/beanutils/MethodUtils.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;
diff --git a/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.java b/src/main/java/org/apache/commons/beanutils/PropertyUtilsBean.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);
diff --git a/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.java b/src/main/java/org/apache/commons/beanutils/RowSetDynaClass.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();
diff --git a/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsBean.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);
 
diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.java
@@ -282,7 +282,7 @@ private String convertPattern(final String pattern, final String fromChars, fina
                quoted = true;
             } else if (thisChar >= 'a' && thisChar <= 'z' ||
                        thisChar >= 'A' && thisChar <= 'Z') {
-                final int index = fromChars.indexOf(thisChar );
+                final int index = fromChars.indexOf(thisChar);
                 if (index == -1) {
                     throw new IllegalArgumentException(
                         "Illegal pattern character '" + thisChar + "'");
diff --git a/src/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java b/src/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java
@@ -33,29 +33,25 @@ public BeanPredicateTestCase(final String name) {
     }
 
     public void testEqual() {
-        final BeanPredicate predicate =
-            new BeanPredicate("stringProperty",new EqualPredicate("foo"));
+        final BeanPredicate predicate = new BeanPredicate("stringProperty", new EqualPredicate("foo"));
         assertTrue(predicate.evaluate(new TestBean("foo")));
         assertTrue(!predicate.evaluate(new TestBean("bar")));
     }
 
     public void testInstanceOf() {
-        final BeanPredicate predicate =
-            new BeanPredicate("stringProperty",new InstanceofPredicate( String.class ));
+        final BeanPredicate predicate = new BeanPredicate("stringProperty", new InstanceofPredicate(String.class));
         assertTrue(predicate.evaluate(new TestBean("foo")));
         assertTrue(predicate.evaluate(new TestBean("bar")));
     }
 
     public void testNotEqual() {
-        final BeanPredicate predicate =
-            new BeanPredicate("stringProperty",new NotPredicate( new EqualPredicate("foo")));
+        final BeanPredicate predicate = new BeanPredicate("stringProperty", new NotPredicate(new EqualPredicate("foo")));
         assertTrue(!predicate.evaluate(new TestBean("foo")));
         assertTrue(predicate.evaluate(new TestBean("bar")));
     }
 
     public void testNull() {
-        final BeanPredicate predicate =
-            new BeanPredicate("stringProperty", NullPredicate.INSTANCE);
+        final BeanPredicate predicate = new BeanPredicate("stringProperty", NullPredicate.INSTANCE);
         final String nullString = null;
         assertTrue(predicate.evaluate(new TestBean(nullString)));
         assertTrue(!predicate.evaluate(new TestBean("bar")));
diff --git a/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java
@@ -479,8 +479,9 @@ public void testMemoryLeak2() throws Exception {
     public void testMemoryTestMethodology() throws Exception {
         // test methodology
         // many thanks to Juozas Baliuka for suggesting this method
-        ClassLoader loader = new ClassLoader(this.getClass().getClassLoader()) {};
-        final WeakReference<ClassLoader> reference = new  WeakReference<>(loader);
+        ClassLoader loader = new ClassLoader(this.getClass().getClassLoader()) {
+        };
+        final WeakReference<ClassLoader> reference = new WeakReference<>(loader);
         @SuppressWarnings("unused")
         Class<?> myClass = loader.loadClass("org.apache.commons.beanutils.BetaBean");
 
@@ -492,19 +493,18 @@ public void testMemoryTestMethodology() throws Exception {
 
         int iterations = 0;
         int bytz = 2;
-        while(true) {
+        while (true) {
             System.gc();
-            if(iterations++ > MAX_GC_ITERATIONS){
+            if (iterations++ > MAX_GC_ITERATIONS) {
                 fail("Max iterations reached before resource released.");
             }
-            if( reference.get() == null ) {
+            if (reference.get() == null) {
                 break;
 
             }
             // create garbage:
             @SuppressWarnings("unused")
-            final
-            byte[] b =  new byte[bytz];
+            final byte[] b = new byte[bytz];
             bytz = bytz * 2;
         }
     }
diff --git a/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/DynaPropertyUtilsTestCase.java
@@ -1424,8 +1424,7 @@ public void testGetSimpleUnknown() {
             fail("InvocationTargetException");
         } catch (final NoSuchMethodException e) {
             // Correct result for this test
-            assertEquals("Unknown property 'unknown' on dynaclass '" +
-                         bean.getDynaClass() + "'", e.getMessage() );
+            assertEquals("Unknown property 'unknown' on dynaclass '" + bean.getDynaClass() + "'", e.getMessage());
         }
 
     }
@@ -2513,12 +2512,8 @@ public void testSetSimpleString() {
         try {
             final String oldValue = (String) bean.get("stringProperty");
             final String newValue = oldValue + " Extra Value";
-            PropertyUtils.setSimpleProperty(bean,
-                    "stringProperty",
-                    newValue);
-            assertEquals("Matched new value",
-                    newValue,
-                    (String) bean.get("stringProperty"));
+            PropertyUtils.setSimpleProperty(bean, "stringProperty", newValue);
+            assertEquals("Matched new value", newValue, (String) bean.get("stringProperty"));
         } catch (final IllegalAccessException e) {
             fail("IllegalAccessException");
         } catch (final IllegalArgumentException e) {
@@ -2538,9 +2533,7 @@ public void testSetSimpleUnknown() {
 
         try {
             final String newValue = "New String Value";
-            PropertyUtils.setSimpleProperty(bean,
-                    "unknown",
-                    newValue);
+            PropertyUtils.setSimpleProperty(bean, "unknown", newValue);
             fail("Should have thrown NoSuchMethodException");
         } catch (final IllegalAccessException e) {
             fail("IllegalAccessException");
@@ -2550,8 +2543,7 @@ public void testSetSimpleUnknown() {
             fail("InvocationTargetException");
         } catch (final NoSuchMethodException e) {
             // Correct result for this test
-            assertEquals("Unknown property 'unknown' on dynaclass '" +
-                         bean.getDynaClass() + "'", e.getMessage() );
+            assertEquals("Unknown property 'unknown' on dynaclass '" + bean.getDynaClass() + "'", e.getMessage());
         }
 
     }
diff --git a/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java
@@ -599,14 +599,13 @@ public void testStaticInvokeMethod() throws Exception {
         value = MethodUtils.invokeStaticMethod(TestBean.class, "currentCounter", new Object[0]);
         assertEquals("currentCounter value", current, ((Integer) value).intValue());
 
-        MethodUtils.invokeStaticMethod(TestBean.class, "incrementCounter", new Object[] { Integer.valueOf(8) } );
+        MethodUtils.invokeStaticMethod(TestBean.class, "incrementCounter", new Object[] { Integer.valueOf(8) });
         current += 8;
 
         value = MethodUtils.invokeStaticMethod(TestBean.class, "currentCounter", new Object[0]);
         assertEquals("currentCounter value", current, ((Integer) value).intValue());
 
-        MethodUtils.invokeExactStaticMethod(TestBean.class, "incrementCounter",
-            new Object[] { Integer.valueOf(8) }, new Class[] { Number.class } );
+        MethodUtils.invokeExactStaticMethod(TestBean.class, "incrementCounter", new Object[] { Integer.valueOf(8) }, new Class[] { Number.class });
         current += 16;
 
         value = MethodUtils.invokeStaticMethod(TestBean.class, "currentCounter", new Object[0]);
diff --git a/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java
diff --git a/src/test/java/org/apache/commons/beanutils/TestBean.java b/src/test/java/org/apache/commons/beanutils/TestBean.java
diff --git a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public class BeanComparator<T> implements Comparator<T>, Serializable {`
`71`	`71`	`* </p>`
`72`	`72`	`*/`
`73`	`73`	`public BeanComparator() {`
`74`		`- this( null );`
	`74`	`+ this(null);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
`@@ -232,7 +232,7 @@ private int internalCompare(final Object val1, final Object val2) {`
`232`	`232`	`* @param property String method name to call to compare`
`233`	`233`	`* If the property passed in is null then the actual objects will be compared`
`234`	`234`	`*/`
`235`		`- public void setProperty( final String property ) {`
	`235`	`+ public void setProperty(final String property) {`
`236`	`236`	`this.property = property;`
`237`	`237`	`}`
`238`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -514,10 +514,10 @@ public void setElementType(final Class<?> elementType) {`
`514`	`514`	`this.elementDynaBeanType = dynaBean.getClass();`
`515`	`515`
`516`	`516`	`// Re-calculate the type`
`517`		`- if (WrapDynaBean.class.isAssignableFrom(elementDynaBeanType )) {`
`518`		`- this.elementType = ((WrapDynaBean)dynaBean).getInstance().getClass();`
`519`		`- } else if (LazyDynaMap.class.isAssignableFrom(elementDynaBeanType )) {`
`520`		`- this.elementType = ((LazyDynaMap)dynaBean).getMap().getClass();`
	`517`	`+ if (WrapDynaBean.class.isAssignableFrom(elementDynaBeanType)) {`
	`518`	`+ this.elementType = ((WrapDynaBean) dynaBean).getInstance().getClass();`
	`519`	`+ } else if (LazyDynaMap.class.isAssignableFrom(elementDynaBeanType)) {`
	`520`	`+ this.elementType = ((LazyDynaMap) dynaBean).getMap().getClass();`
`521`	`521`	`}`
`522`	`522`
`523`	`523`	`}`
Original file line number	Diff line number	Diff line change
`@@ -521,9 +521,9 @@ public static Method getMatchingAccessibleMethod(`
`521`	`521`	`}`
`522`	`522`	`setMethodAccessible(method); // Default access superclass workaround`
`523`	`523`	`myCost = getTotalTransformationCost(parameterTypes,method.getParameterTypes());`
`524`		`- if ( myCost < bestMatchCost ) {`
`525`		`- bestMatch = method;`
`526`		`- bestMatchCost = myCost;`
	`524`	`+ if (myCost < bestMatchCost) {`
	`525`	`+ bestMatch = method;`
	`526`	`+ bestMatchCost = myCost;`
`527`	`527`	`}`
`528`	`528`	`}`
`529`	`529`
`@@ -532,11 +532,11 @@ public static Method getMatchingAccessibleMethod(`
`532`	`532`	`}`
`533`	`533`	`}`
`534`	`534`	`}`
`535`		`- if ( bestMatch != null ){`
`536`		`- cacheMethod(md, bestMatch);`
	`535`	`+ if (bestMatch != null) {`
	`536`	`+ cacheMethod(md, bestMatch);`
`537`	`537`	`} else {`
`538`		`- // didn't find a match`
`539`		`- log.trace("No match found.");`
	`538`	`+ // didn't find a match`
	`539`	`+ log.trace("No match found.");`
`540`	`540`	`}`
`541`	`541`
`542`	`542`	`return bestMatch;`