You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/05/30 14:45:29 UTC
[commons-beanutils] branch master updated: [BEANUTILS-537] fix
typos; fix error in javadoc; performance fix; fix code smells (#25)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
The following commit(s) were added to refs/heads/master by this push:
new b057bb3 [BEANUTILS-537] fix typos; fix error in javadoc; performance fix; fix code smells (#25)
b057bb3 is described below
commit b057bb3f33e349f88bf6713cdccbdcd328a1189f
Author: XenoAmess <xe...@gmail.com>
AuthorDate: Sat May 30 22:45:21 2020 +0800
[BEANUTILS-537] fix typos; fix error in javadoc; performance fix; fix code smells (#25)
* fix typos(might break BC because several public functions name contained typos)
* fix javadocs
* array
* static final function
* c style array
* unneeded String.valueOf
* unneeded public in interface
* simplify boolean
* `catch and rethrow` to `throw immediately`
* for
* that function can never throw ParseException sir.
* indexof to contains.
* Object.equals
* collapse error catch
* addAll instead of loop.
* String += to StringBuilder.append
* use min max in Math.
* use instanceof instead of isInstance
* I don't think the check is necessary here.
* useless cast
* fix typos about PropertyDescriptor
* Revert "static final function"
This reverts commit 949026c6
---
src/changes/changes.xml | 2 +-
.../beanutils2/BaseDynaBeanMapDecorator.java | 20 ++---
.../apache/commons/beanutils2/BasicDynaClass.java | 6 +-
.../org/apache/commons/beanutils2/BeanMap.java | 32 +++-----
.../BeanPropertyValueEqualsPredicate.java | 7 +-
.../beanutils2/BeanToPropertyValueTransformer.java | 2 +-
.../commons/beanutils2/ConstructorUtils.java | 4 +-
.../org/apache/commons/beanutils2/Converter.java | 2 +-
.../org/apache/commons/beanutils2/DynaBean.java | 18 ++---
.../org/apache/commons/beanutils2/DynaClass.java | 10 +--
.../apache/commons/beanutils2/DynaProperty.java | 7 +-
.../apache/commons/beanutils2/JDBCDynaClass.java | 6 +-
.../apache/commons/beanutils2/LazyDynaBean.java | 2 +-
.../apache/commons/beanutils2/LazyDynaClass.java | 10 +--
.../apache/commons/beanutils2/LazyDynaList.java | 11 ++-
.../org/apache/commons/beanutils2/LazyDynaMap.java | 16 ++--
.../beanutils2/MappedPropertyDescriptor.java | 56 +++++++-------
.../org/apache/commons/beanutils2/MethodUtils.java | 18 ++---
.../commons/beanutils2/MutableDynaClass.java | 14 ++--
.../commons/beanutils2/PropertyUtilsBean.java | 82 ++++----------------
.../apache/commons/beanutils2/RowSetDynaClass.java | 4 +-
.../apache/commons/beanutils2/WrapDynaClass.java | 2 +-
.../beanutils2/converters/AbstractConverter.java | 5 +-
.../beanutils2/converters/ArrayConverter.java | 2 +-
.../beanutils2/locale/BaseLocaleConverter.java | 2 +-
.../commons/beanutils2/locale/LocaleConverter.java | 2 +-
.../converters/BigDecimalLocaleConverter.java | 2 +-
.../converters/BigIntegerLocaleConverter.java | 2 +-
.../locale/converters/IntegerLocaleConverter.java | 2 +-
.../locale/converters/StringLocaleConverter.java | 2 +-
.../commons/beanutils2/BasicDynaBeanTestCase.java | 20 ++---
.../commons/beanutils2/BeanComparatorTestCase.java | 2 +-
.../commons/beanutils2/BeanUtilsTestCase.java | 42 +++++------
.../java/org/apache/commons/beanutils2/Child.java | 2 +-
.../commons/beanutils2/ConvertUtilsTestCase.java | 48 ++++++------
.../commons/beanutils2/DynaBeanUtilsTestCase.java | 62 +++++++--------
.../beanutils2/DynaPropertyUtilsTestCase.java | 22 +++---
.../commons/beanutils2/DynaResultSetTestCase.java | 6 +-
.../commons/beanutils2/DynaRowSetTestCase.java | 6 +-
.../beanutils2/IndexedPropertyTestCase.java | 10 +--
.../commons/beanutils2/LazyDynaBeanTestCase.java | 2 +-
.../commons/beanutils2/LazyDynaListTestCase.java | 6 +-
.../commons/beanutils2/LazyDynaMapTestCase.java | 2 +-
.../beanutils2/MappedPropertyTestInterface.java | 4 +-
.../apache/commons/beanutils2/NestedTestBean.java | 2 +-
.../commons/beanutils2/PropertyUtilsTestCase.java | 88 +++++++++++-----------
.../org/apache/commons/beanutils2/TestBean.java | 4 +-
.../apache/commons/beanutils2/TestResultSet.java | 4 +-
.../commons/beanutils2/TestResultSetMetaData.java | 2 +-
.../commons/beanutils2/bugs/Jira157TestCase.java | 2 +-
.../commons/beanutils2/bugs/Jira273TestCase.java | 60 +++++++--------
.../commons/beanutils2/bugs/Jira347TestCase.java | 2 +-
.../beanutils2/bugs/other/Jira273BeanFactory.java | 62 +++++++--------
.../beanutils2/bugs/other/Jira298BeanFactory.java | 4 +-
.../converters/DateConverterTestBase.java | 4 +-
.../beanutils2/converters/MemoryTestCase.java | 2 +-
.../locale/LocaleConvertUtilsTestCase.java | 50 ++++++------
.../converters/DateLocaleConverterTestCase.java | 2 +-
.../memoryleaktests/MemoryLeakTestCase.java | 2 +-
.../commons/beanutils2/priv/PrivateIndirect.java | 4 +-
60 files changed, 403 insertions(+), 475 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 16b9fd9..f0dbf07 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -458,7 +458,7 @@ src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java.">
Plugable Property Name Expression Resolver).
</action>
<action dev="niallp" type="fix" issue="BEANUTILS-273" due-to="Marcelo Liberato">
- Public methods overriden in anonymous or private subclasses are not recognized by PropertyUtils.
+ Public methods overridden in anonymous or private subclasses are not recognized by PropertyUtils.
</action>
<action dev="niallp" type="fix" issue="BEANUTILS-88" due-to="Chuck Daniels">
PropertyUtilsBean's isReadable() / isWriteable() always return false for mapped properties.
diff --git a/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java b/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
index e689bc7..5658b60 100644
--- a/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
+++ b/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
@@ -121,7 +121,7 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> {
public boolean containsKey(final Object key) {
final DynaClass dynaClass = getDynaBean().getDynaClass();
final DynaProperty dynaProperty = dynaClass.getDynaProperty(toString(key));
- return dynaProperty == null ? false : true;
+ return dynaProperty != null;
}
/**
@@ -136,8 +136,8 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> {
@Override
public boolean containsValue(final Object value) {
final DynaProperty[] properties = getDynaProperties();
- for (final DynaProperty propertie : properties) {
- final String key = propertie.getName();
+ for (final DynaProperty property : properties) {
+ final String key = property.getName();
final Object prop = getDynaBean().get(key);
if (value == null) {
if (prop == null) {
@@ -166,9 +166,9 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> {
public Set<Map.Entry<K, Object>> entrySet() {
final DynaProperty[] properties = getDynaProperties();
final Set<Map.Entry<K, Object>> set = new HashSet<>(properties.length);
- for (final DynaProperty propertie : properties) {
- final K key = convertKey(propertie.getName());
- final Object value = getDynaBean().get(propertie.getName());
+ for (final DynaProperty property : properties) {
+ final K key = convertKey(property.getName());
+ final Object value = getDynaBean().get(property.getName());
set.add(new MapEntry<>(key, value));
}
return Collections.unmodifiableSet(set);
@@ -218,8 +218,8 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> {
// Create a Set of the keys
final DynaProperty[] properties = getDynaProperties();
Set<K> set = new HashSet<>(properties.length);
- for (final DynaProperty propertie : properties) {
- set.add(convertKey(propertie.getName()));
+ for (final DynaProperty property : properties) {
+ set.add(convertKey(property.getName()));
}
set = Collections.unmodifiableSet(set);
@@ -303,8 +303,8 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> {
public Collection<Object> values() {
final DynaProperty[] properties = getDynaProperties();
final List<Object> values = new ArrayList<>(properties.length);
- for (final DynaProperty propertie : properties) {
- final String key = propertie.getName();
+ for (final DynaProperty property : properties) {
+ final String key = property.getName();
final Object value = getDynaBean().get(key);
values.add(value);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
index 7f9f71b..afb46a7 100644
--- a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
@@ -165,7 +165,7 @@ public class BasicDynaClass implements DynaClass, Serializable {
}
/**
- * <p>Return an array of {@code ProperyDescriptors} for the properties
+ * <p>Return an array of {@code PropertyDescriptor} for the properties
* currently defined in this DynaClass. If no properties are defined, a
* zero-length array will be returned.</p>
*
@@ -273,8 +273,8 @@ public class BasicDynaClass implements DynaClass, Serializable {
this.properties = properties;
propertiesMap.clear();
- for (final DynaProperty propertie : properties) {
- propertiesMap.put(propertie.getName(), propertie);
+ for (final DynaProperty property : properties) {
+ propertiesMap.put(property.getName(), property);
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanMap.java b/src/main/java/org/apache/commons/beanutils2/BeanMap.java
index d38937e..566f796 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanMap.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanMap.java
@@ -106,7 +106,7 @@ public class BeanMap extends AbstractMap<String, Object> implements Cloneable {
*/
@Override
public String toString() {
- return "BeanMap<" + String.valueOf(bean) + ">";
+ return "BeanMap<" + bean + ">";
}
/**
@@ -267,13 +267,7 @@ public class BeanMap extends AbstractMap<String, Object> implements Cloneable {
if (method != null) {
try {
return method.invoke(bean, NULL_ARGUMENTS);
- } catch (final IllegalAccessException e) {
- logWarn(e);
- } catch (final IllegalArgumentException e) {
- logWarn(e);
- } catch (final InvocationTargetException e) {
- logWarn(e);
- } catch (final NullPointerException e) {
+ } catch (final IllegalAccessException | NullPointerException | InvocationTargetException | IllegalArgumentException e) {
logWarn(e);
}
}
@@ -306,15 +300,9 @@ public class BeanMap extends AbstractMap<String, Object> implements Cloneable {
final Object newValue = get(name);
firePropertyChange(name, oldValue, newValue);
- } catch (final InvocationTargetException e) {
- final IllegalArgumentException iae = new IllegalArgumentException(e.getMessage());
- if (BeanUtils.initCause(iae, e) == false) {
- logInfo(e);
- }
- throw iae;
- } catch (final IllegalAccessException e) {
+ } catch (final InvocationTargetException | IllegalAccessException e) {
final IllegalArgumentException iae = new IllegalArgumentException(e.getMessage());
- if (BeanUtils.initCause(iae, e) == false) {
+ if (!BeanUtils.initCause(iae, e)) {
logInfo(e);
}
throw iae;
@@ -576,7 +564,7 @@ public class BeanMap extends AbstractMap<String, Object> implements Cloneable {
}
/**
- * Called during a successful {@link #put(Object,Object)} operation. Default implementation does nothing. Override
+ * Called during a successful {@link #put(String,Object)} operation. Default implementation does nothing. Override
* to be notified of property changes in the bean caused by this map.
*
* @param key the name of the property that changed
@@ -643,9 +631,9 @@ public class BeanMap extends AbstractMap<String, Object> implements Cloneable {
throws IllegalAccessException, ClassCastException {
try {
if (value != null) {
- final Class<? extends Object>[] parmTypes = method.getParameterTypes();
- if (parmTypes != null && parmTypes.length > 0) {
- final Class<? extends Object> paramType = parmTypes[0];
+ final Class<? extends Object>[] paramTypes = method.getParameterTypes();
+ if (paramTypes != null && paramTypes.length > 0) {
+ final Class<? extends Object> paramType = paramTypes[0];
if (!paramType.isAssignableFrom(value.getClass())) {
value = convertType(paramType, value);
}
@@ -655,13 +643,13 @@ public class BeanMap extends AbstractMap<String, Object> implements Cloneable {
return answer;
} catch (final InvocationTargetException e) {
final IllegalArgumentException iae = new IllegalArgumentException(e.getMessage());
- if (BeanUtils.initCause(iae, e) == false) {
+ if (!BeanUtils.initCause(iae, e)) {
logInfo(e);
}
throw iae;
} catch (final InstantiationException e) {
final IllegalArgumentException iae = new IllegalArgumentException(e.getMessage());
- if (BeanUtils.initCause(iae, e) == false) {
+ if (!BeanUtils.initCause(iae, e)) {
logInfo(e);
}
BeanUtils.initCause(iae, e);
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java
index 1f8f7ce..c376411 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java
@@ -18,6 +18,7 @@
package org.apache.commons.beanutils2;
import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
import java.util.function.Predicate;
import org.apache.commons.logging.Log;
@@ -69,7 +70,7 @@ import org.apache.commons.logging.LogFactory;
* </p>
* <ul>
* <li>
- * The top level object in the {@code peeopleCollection} is an object which represents a
+ * The top level object in the {@code peopleCollection} is an object which represents a
* person.
* </li>
* <li>
@@ -94,7 +95,7 @@ import org.apache.commons.logging.LogFactory;
* </p>
* <ul>
* <li>
- * The top level object in the {@code peeopleCollection} is an object which represents a
+ * The top level object in the {@code peopleCollection} is an object which represents a
* person.
* </li>
* <li>
@@ -248,7 +249,7 @@ public class BeanPropertyValueEqualsPredicate<T, V> implements Predicate<T> {
* @return True if they are equal; false otherwise.
*/
protected boolean evaluateValue(final V expected, final Object actual) {
- return expected == actual || expected != null && expected.equals(actual);
+ return Objects.equals(expected, actual);
}
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java b/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java
index 2785537..c4f0ca7 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java
@@ -52,7 +52,7 @@ import org.apache.commons.logging.LogFactory;
* of objects which represents the cities in which each person lived. Assuming...
* <ul>
* <li>
- * The top level object in the {@code peeopleCollection} is an object which represents a
+ * The top level object in the {@code peopleCollection} is an object which represents a
* person.
* </li>
* <li>
diff --git a/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java b/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java
index 499b705..574e79b 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java
@@ -107,7 +107,7 @@ public class ConstructorUtils {
args = EMPTY_OBJECT_ARRAY;
}
final int arguments = args.length;
- final Class<?> parameterTypes[] = new Class<?>[arguments];
+ final Class<?>[] parameterTypes = new Class<?>[arguments];
for (int i = 0; i < arguments; i++) {
parameterTypes[i] = args[i].getClass();
}
@@ -218,7 +218,7 @@ public class ConstructorUtils {
args = EMPTY_OBJECT_ARRAY;
}
final int arguments = args.length;
- final Class<?> parameterTypes[] = new Class[arguments];
+ final Class<?>[] parameterTypes = new Class[arguments];
for (int i = 0; i < arguments; i++) {
parameterTypes[i] = args[i].getClass();
}
diff --git a/src/main/java/org/apache/commons/beanutils2/Converter.java b/src/main/java/org/apache/commons/beanutils2/Converter.java
index 1b85b19..34e9ef0 100644
--- a/src/main/java/org/apache/commons/beanutils2/Converter.java
+++ b/src/main/java/org/apache/commons/beanutils2/Converter.java
@@ -46,6 +46,6 @@ public interface Converter {
* @throws ConversionException if conversion cannot be performed
* successfully
*/
- public <T> T convert(Class<T> type, Object value);
+ <T> T convert(Class<T> type, Object value);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/DynaBean.java b/src/main/java/org/apache/commons/beanutils2/DynaBean.java
index bf0dc96..c7ec3b4 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaBean.java
@@ -40,7 +40,7 @@ public interface DynaBean {
* @throws IllegalArgumentException if there is no property
* of the specified name
*/
- public boolean contains(String name, String key);
+ boolean contains(String name, String key);
/**
* Return the value of a simple property with the specified name.
@@ -51,7 +51,7 @@ public interface DynaBean {
* @throws IllegalArgumentException if there is no property
* of the specified name
*/
- public Object get(String name);
+ Object get(String name);
/**
* Return the value of an indexed property with the specified name.
@@ -69,7 +69,7 @@ public interface DynaBean {
* @throws NullPointerException if no array or List has been
* initialized for this property
*/
- public Object get(String name, int index);
+ Object get(String name, int index);
/**
* Return the value of a mapped property with the specified name,
@@ -84,7 +84,7 @@ public interface DynaBean {
* @throws IllegalArgumentException if the specified property
* exists, but is not mapped
*/
- public Object get(String name, String key);
+ Object get(String name, String key);
/**
* Return the {@code DynaClass} instance that describes the set of
@@ -92,7 +92,7 @@ public interface DynaBean {
*
* @return The associated DynaClass
*/
- public DynaClass getDynaClass();
+ DynaClass getDynaClass();
/**
* Remove any existing value for the specified key on the
@@ -105,7 +105,7 @@ public interface DynaBean {
* @throws IllegalArgumentException if there is no property
* of the specified name
*/
- public void remove(String name, String key);
+ void remove(String name, String key);
/**
* Set the value of a simple property with the specified name.
@@ -120,7 +120,7 @@ public interface DynaBean {
* @throws NullPointerException if an attempt is made to set a
* primitive property to null
*/
- public void set(String name, Object value);
+ void set(String name, Object value);
/**
* Set the value of an indexed property with the specified name.
@@ -138,7 +138,7 @@ public interface DynaBean {
* @throws IndexOutOfBoundsException if the specified index
* is outside the range of the underlying property
*/
- public void set(String name, int index, Object value);
+ void set(String name, int index, Object value);
/**
* Set the value of a mapped property with the specified name.
@@ -154,6 +154,6 @@ public interface DynaBean {
* @throws IllegalArgumentException if the specified property
* exists, but is not mapped
*/
- public void set(String name, String key, Object value);
+ void set(String name, String key, Object value);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/DynaClass.java b/src/main/java/org/apache/commons/beanutils2/DynaClass.java
index 4fd2e78..41336cc 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaClass.java
@@ -35,7 +35,7 @@ public interface DynaClass {
*
* @return the name of the DynaClass
*/
- public String getName();
+ String getName();
/**
* Returns a property descriptor for the specified property, if it exists;
@@ -47,10 +47,10 @@ public interface DynaClass {
*
* @throws IllegalArgumentException if no property name is specified
*/
- public DynaProperty getDynaProperty(String name);
+ DynaProperty getDynaProperty(String name);
/**
- * <p>Returns an array of {@code ProperyDescriptors} for the properties
+ * <p>Returns an array of {@code PropertyDescriptor} for the properties
* currently defined in this DynaClass. If no properties are defined, a
* zero-length array will be returned.</p>
*
@@ -60,7 +60,7 @@ public interface DynaClass {
*
* @return the set of properties for this DynaClass
*/
- public DynaProperty[] getDynaProperties();
+ DynaProperty[] getDynaProperties();
/**
* Instantiates and return a new DynaBean instance, associated
@@ -74,7 +74,7 @@ public interface DynaClass {
* class, an array class, a primitive type, or void; or if instantiation
* fails for some other reason
*/
- public DynaBean newInstance()
+ DynaBean newInstance()
throws IllegalAccessException, InstantiationException;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
index b6843ef..7434570 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
@@ -24,6 +24,7 @@ import java.io.Serializable;
import java.io.StreamCorruptedException;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* <p>The metadata describing an individual property of a DynaBean.</p>
@@ -208,9 +209,9 @@ public class DynaProperty implements Serializable {
if (!result && obj instanceof DynaProperty) {
final DynaProperty that = (DynaProperty) obj;
result =
- (this.name == null ? that.name == null : this.name.equals(that.name)) &&
- (this.type == null ? that.type == null : this.type.equals(that.type)) &&
- (this.contentType == null ? that.contentType == null : this.contentType.equals(that.contentType));
+ (Objects.equals(this.name, that.name)) &&
+ (Objects.equals(this.type, that.type)) &&
+ (Objects.equals(this.contentType, that.contentType));
}
return result;
diff --git a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
index 3f1f9b8..b3583cf 100644
--- a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
@@ -106,7 +106,7 @@ abstract class JDBCDynaClass implements DynaClass, Serializable {
}
/**
- * <p>Return an array of {@code ProperyDescriptors} for the properties
+ * <p>Return an array of {@code PropertyDescriptor} for the properties
* currently defined in this DynaClass. If no properties are defined, a
* zero-length array will be returned.</p>
*/
@@ -255,8 +255,8 @@ abstract class JDBCDynaClass implements DynaClass, Serializable {
// Convert this list into the internal data structures we need
properties =
list.toArray(new DynaProperty[list.size()]);
- for (final DynaProperty propertie : properties) {
- propertiesMap.put(propertie.getName(), propertie);
+ for (final DynaProperty property : properties) {
+ propertiesMap.put(property.getName(), property);
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
index 3965071..4bcd4e9 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
@@ -909,7 +909,7 @@ public class LazyDynaBean implements DynaBean, Serializable {
}
// Handle other MutableDynaClass
- return dynaClass.getDynaProperty(name) == null ? false : true;
+ return dynaClass.getDynaProperty(name) != null;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
index 97f171d..9c29af5 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
@@ -101,7 +101,7 @@ public class LazyDynaClass extends BasicDynaClass implements MutableDynaClass {
* @param dynaBeanClass The implementation class for new instances
* @param properties Property descriptors for the supported properties
*/
- public LazyDynaClass(final String name, final Class<?> dynaBeanClass, final DynaProperty properties[]) {
+ public LazyDynaClass(final String name, final Class<?> dynaBeanClass, final DynaProperty[] properties) {
super(name, dynaBeanClass, properties);
}
@@ -284,9 +284,9 @@ public class LazyDynaClass extends BasicDynaClass implements MutableDynaClass {
final DynaProperty[] oldProperties = getDynaProperties();
final DynaProperty[] newProperties = new DynaProperty[oldProperties.length-1];
int j = 0;
- for (int i = 0; i < oldProperties.length; i++) {
- if (!name.equals(oldProperties[i].getName())) {
- newProperties[j] = oldProperties[i];
+ for (DynaProperty oldProperty : oldProperties) {
+ if (!name.equals(oldProperty.getName())) {
+ newProperties[j] = oldProperty;
j++;
}
}
@@ -357,7 +357,7 @@ public class LazyDynaClass extends BasicDynaClass implements MutableDynaClass {
throw new IllegalArgumentException("Property name is missing.");
}
- return propertiesMap.get(name) == null ? false : true;
+ return propertiesMap.get(name) != null;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
index 7963dc5..7409ce4 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
@@ -18,6 +18,7 @@ package org.apache.commons.beanutils2;
import java.lang.reflect.Array;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Map;
@@ -170,7 +171,7 @@ public class LazyDynaList extends ArrayList<Object> {
* The WrapDynaClass if the List's contains
* POJO Bean elements.
*
- * N.B. WrapDynaClass isn't serlializable, which
+ * N.B. WrapDynaClass isn't serializable, which
* is why its stored separately in a
* transient instance variable.
*/
@@ -247,9 +248,7 @@ public class LazyDynaList extends ArrayList<Object> {
*/
public LazyDynaList(final Object[] array) {
super(array.length);
- for (final Object element : array) {
- add(element);
- }
+ this.addAll(Arrays.asList(array));
}
@@ -332,7 +331,7 @@ public class LazyDynaList extends ArrayList<Object> {
return false;
}
- ensureCapacity((index > size() ? index : size()) + collection.size());
+ ensureCapacity((Math.max(index, size())) + collection.size());
// Call "transform" with first element, before
// List is "grown" to ensure the correct DynaClass
@@ -625,7 +624,7 @@ public class LazyDynaList extends ArrayList<Object> {
* </li>
*
* @param element The element to transformed.
- * @param The DynaBean to store in the List.
+ * @return The DynaBean to store in the List.
*/
private DynaBean transform(final Object element) {
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
index 259db78..c710a73 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
@@ -124,8 +124,8 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
public LazyDynaMap(final String name, final DynaProperty[] properties) {
this(name, (Map<String, Object>)null);
if (properties != null) {
- for (final DynaProperty propertie : properties) {
- add(propertie);
+ for (final DynaProperty property : properties) {
+ add(property);
}
}
}
@@ -239,7 +239,7 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
}
/**
- * <p>Return an array of {@code ProperyDescriptors} for the properties
+ * <p>Return an array of {@code PropertyDescriptor} for the properties
* currently defined in this DynaClass. If no properties are defined, a
* zero-length array will be returned.</p>
*
@@ -287,8 +287,8 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
final LazyDynaMap lazyMap = new LazyDynaMap(newMap);
final DynaProperty[] properties = this.getDynaProperties();
if (properties != null) {
- for (final DynaProperty propertie : properties) {
- lazyMap.add(propertie);
+ for (final DynaProperty property : properties) {
+ lazyMap.add(property);
}
}
return lazyMap;
@@ -427,11 +427,7 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
throw new IllegalStateException("DynaClass is currently restricted. No properties can be removed.");
}
- // Remove, if property doesn't exist
- if (values.containsKey(name)) {
- values.remove(name);
- }
-
+ values.remove(name);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java b/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java
index 94db5ab..c204be0 100644
--- a/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java
+++ b/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java
@@ -280,40 +280,36 @@ public class MappedPropertyDescriptor extends PropertyDescriptor {
* and setter methods.
*/
private void findMappedPropertyType() throws IntrospectionException {
- try {
- final Method mappedReadMethod = getMappedReadMethod();
- final Method mappedWriteMethod = getMappedWriteMethod();
- Class<?> mappedPropertyType = null;
- if (mappedReadMethod != null) {
- if (mappedReadMethod.getParameterTypes().length != 1) {
- throw new IntrospectionException
- ("bad mapped read method arg count");
- }
- mappedPropertyType = mappedReadMethod.getReturnType();
- if (mappedPropertyType == Void.TYPE) {
- throw new IntrospectionException
- ("mapped read method " +
- mappedReadMethod.getName() + " returns void");
- }
+ final Method mappedReadMethod = getMappedReadMethod();
+ final Method mappedWriteMethod = getMappedWriteMethod();
+ Class<?> mappedPropertyType = null;
+ if (mappedReadMethod != null) {
+ if (mappedReadMethod.getParameterTypes().length != 1) {
+ throw new IntrospectionException
+ ("bad mapped read method arg count");
+ }
+ mappedPropertyType = mappedReadMethod.getReturnType();
+ if (mappedPropertyType == Void.TYPE) {
+ throw new IntrospectionException
+ ("mapped read method " +
+ mappedReadMethod.getName() + " returns void");
}
+ }
- if (mappedWriteMethod != null) {
- final Class<?>[] params = mappedWriteMethod.getParameterTypes();
- if (params.length != 2) {
- throw new IntrospectionException
- ("bad mapped write method arg count");
- }
- if (mappedPropertyType != null &&
- mappedPropertyType != params[1]) {
- throw new IntrospectionException
- ("type mismatch between mapped read and write methods");
- }
- mappedPropertyType = params[1];
+ if (mappedWriteMethod != null) {
+ final Class<?>[] params = mappedWriteMethod.getParameterTypes();
+ if (params.length != 2) {
+ throw new IntrospectionException
+ ("bad mapped write method arg count");
+ }
+ if (mappedPropertyType != null &&
+ mappedPropertyType != params[1]) {
+ throw new IntrospectionException
+ ("type mismatch between mapped read and write methods");
}
- mappedPropertyTypeRef = new SoftReference<>(mappedPropertyType);
- } catch (final IntrospectionException ex) {
- throw ex;
+ mappedPropertyType = params[1];
}
+ mappedPropertyTypeRef = new SoftReference<>(mappedPropertyType);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
index 2df184b..64b485d 100644
--- a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
@@ -183,7 +183,7 @@ public class MethodUtils {
* would match a {@code boolean} primitive.</p>
*
* <p> This is a convenient wrapper for
- * {@link #invokeMethod(Object object,String methodName,Object [] args,Class[] parameterTypes)}.
+ * {@link #invokeMethod(Object object, String methodName, Object[] args, Class[] parameterTypes)}.
* </p>
*
* @param object invoke method on this object
@@ -223,7 +223,7 @@ public class MethodUtils {
*
* <p>The behavior of this method is less deterministic
* than {@link
- * #invokeExactMethod(Object object,String methodName,Object [] args,Class[] parameterTypes)}.
+ * #invokeExactMethod(Object object, String methodName, Object[] args, Class[] parameterTypes)}.
* It loops through all methods with names that match
* and then executes the first it finds with compatible parameters.</p>
*
@@ -499,7 +499,7 @@ public class MethodUtils {
* would match a {@code boolean} primitive.</p>
*
* <p> This is a convenient wrapper for
- * {@link #invokeStaticMethod(Class objectClass,String methodName,Object [] args,Class[] parameterTypes)}.
+ * {@link #invokeStaticMethod(Class objectClass, String methodName, Object[] args, Class[] parameterTypes)}.
* </p>
*
* @param objectClass invoke static method on this class
@@ -540,7 +540,7 @@ public class MethodUtils {
*
* <p>The behavior of this method is less deterministic
* than {@link
- * #invokeExactStaticMethod(Class objectClass,String methodName,Object [] args,Class[] parameterTypes)}.
+ * #invokeExactStaticMethod(Class objectClass, String methodName, Object[] args, Class[] parameterTypes)}.
* It loops through all methods with names that match
* and then executes the first it finds with compatible parameters.</p>
*
@@ -858,16 +858,16 @@ public class MethodUtils {
// Check the implemented interfaces of the parent class
final Class<?>[] interfaces = clazz.getInterfaces();
- for (int i = 0; i < interfaces.length; i++) {
+ for (Class<?> anInterface : interfaces) {
// Is this interface public?
- if (!Modifier.isPublic(interfaces[i].getModifiers())) {
+ if (!Modifier.isPublic(anInterface.getModifiers())) {
continue;
}
// Does the method exist on this interface?
try {
- method = interfaces[i].getDeclaredMethod(methodName,
+ method = anInterface.getDeclaredMethod(methodName,
parameterTypes);
} catch (final NoSuchMethodException e) {
/* Swallow, if no method is found after the loop then this
@@ -880,7 +880,7 @@ public class MethodUtils {
// Recursively check our parent interfaces
method =
- getAccessibleMethodFromInterfaceNest(interfaces[i],
+ getAccessibleMethodFromInterfaceNest(anInterface,
methodName,
parameterTypes);
if (method != null) {
@@ -907,7 +907,7 @@ public class MethodUtils {
*
* <p>This method is used by
* {@link
- * #invokeMethod(Object object,String methodName,Object [] args,Class[] parameterTypes)}.
+ * #invokeMethod(Object object, String methodName, Object[] args, Class[] parameterTypes)}.
*
* <p>This method can match primitive parameter by passing in wrapper classes.
* For example, a {@code Boolean</code> will match a primitive <code>boolean}
diff --git a/src/main/java/org/apache/commons/beanutils2/MutableDynaClass.java b/src/main/java/org/apache/commons/beanutils2/MutableDynaClass.java
index c46341c..9380cac 100644
--- a/src/main/java/org/apache/commons/beanutils2/MutableDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/MutableDynaClass.java
@@ -39,7 +39,7 @@ public interface MutableDynaClass extends DynaClass {
* @throws IllegalStateException if this DynaClass is currently
* restricted, so no new properties can be added
*/
- public void add(String name);
+ void add(String name);
/**
* Add a new dynamic property with the specified data type, but with
@@ -53,7 +53,7 @@ public interface MutableDynaClass extends DynaClass {
* @throws IllegalStateException if this DynaClass is currently
* restricted, so no new properties can be added
*/
- public void add(String name, Class<?> type);
+ void add(String name, Class<?> type);
/**
* Add a new dynamic property with the specified data type, readability,
@@ -71,8 +71,8 @@ public interface MutableDynaClass extends DynaClass {
* @throws IllegalStateException if this DynaClass is currently
* restricted, so no new properties can be added
*/
- public void add(String name, Class<?> type, boolean readable,
- boolean writeable);
+ void add(String name, Class<?> type, boolean readable,
+ boolean writeable);
/**
* Is this DynaClass currently restricted, if so, no changes to the
@@ -82,7 +82,7 @@ public interface MutableDynaClass extends DynaClass {
* @return {@code true} if this Mutable {@link DynaClass} is restricted,
* otherwise {@code false}
*/
- public boolean isRestricted();
+ boolean isRestricted();
/**
* Remove the specified dynamic property, and any associated data type,
@@ -97,13 +97,13 @@ public interface MutableDynaClass extends DynaClass {
* @throws IllegalStateException if this DynaClass is currently
* restricted, so no properties can be removed
*/
- public void remove(String name);
+ void remove(String name);
/**
* Set the restricted state of this DynaClass to the specified value.
*
* @param restricted The new restricted state
*/
- public void setRestricted(boolean restricted);
+ void setRestricted(boolean restricted);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
index 9b44d41..fb12188 100644
--- a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
@@ -57,7 +57,7 @@ import org.apache.commons.logging.LogFactory;
* <li><strong>Simple ({@code name})</strong> - The specified
* {@code name} identifies an individual property of a particular
* JavaBean. The name of the actual getter or setter method to be used
- * is determined using standard JavaBeans instrospection, so that (unless
+ * is determined using standard JavaBeans introspection, so that (unless
* overridden by a {@code BeanInfo} class, a property named "xyz"
* will have a getter method named {@code getXyz()} or (for boolean
* properties only) {@code isXyz()}, and a setter method named
@@ -1060,7 +1060,7 @@ public class PropertyUtilsBean {
* Note that from Java 8 and newer, this method do not support
* such index types from items within an Collection, and will
* instead return the collection type (e.g. java.util.List) from the
- * getter mtethod.
+ * getter method.
*
* @param bean Bean for which a property descriptor is requested
* @param name Possibly indexed and/or nested name of the property for
@@ -1314,11 +1314,7 @@ public class PropertyUtilsBean {
Object nestedBean = null;
try {
nestedBean = getProperty(bean, next);
- } catch (final IllegalAccessException e) {
- return false;
- } catch (final InvocationTargetException e) {
- return false;
- } catch (final NoSuchMethodException e) {
+ } catch (final IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
return false;
}
if (nestedBean == null) {
@@ -1360,11 +1356,7 @@ public class PropertyUtilsBean {
return readMethod != null;
}
return false;
- } catch (final IllegalAccessException e) {
- return false;
- } catch (final InvocationTargetException e) {
- return false;
- } catch (final NoSuchMethodException e) {
+ } catch (final IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
return false;
}
@@ -1402,11 +1394,7 @@ public class PropertyUtilsBean {
Object nestedBean = null;
try {
nestedBean = getProperty(bean, next);
- } catch (final IllegalAccessException e) {
- return false;
- } catch (final InvocationTargetException e) {
- return false;
- } catch (final NoSuchMethodException e) {
+ } catch (final IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
return false;
}
if (nestedBean == null) {
@@ -1448,11 +1436,7 @@ public class PropertyUtilsBean {
return writeMethod != null;
}
return false;
- } catch (final IllegalAccessException e) {
- return false;
- } catch (final InvocationTargetException e) {
- return false;
- } catch (final NoSuchMethodException e) {
+ } catch (final IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
return false;
}
@@ -2074,67 +2058,30 @@ public class PropertyUtilsBean {
return method.invoke(bean, values);
- } catch (final NullPointerException cause) {
+ } catch (final NullPointerException | IllegalArgumentException cause) {
// JDK 1.3 and JDK 1.4 throw NullPointerException if an argument is
// null for a primitive value (JDK 1.5+ throw IllegalArgumentException)
- String valueString = "";
- if (values != null) {
- for (int i = 0; i < values.length; i++) {
- if (i>0) {
- valueString += ", " ;
- }
- if (values[i] == null) {
- valueString += "<null>";
- } else {
- valueString += values[i].getClass().getName();
- }
- }
- }
- String expectedString = "";
- final Class<?>[] parTypes = method.getParameterTypes();
- if (parTypes != null) {
- for (int i = 0; i < parTypes.length; i++) {
- if (i > 0) {
- expectedString += ", ";
- }
- expectedString += parTypes[i].getName();
- }
- }
- final IllegalArgumentException e = new IllegalArgumentException(
- "Cannot invoke " + method.getDeclaringClass().getName() + "."
- + method.getName() + " on bean class '" + bean.getClass() +
- "' - " + cause.getMessage()
- // as per https://issues.apache.org/jira/browse/BEANUTILS-224
- + " - had objects of type \"" + valueString
- + "\" but expected signature \""
- + expectedString + "\""
- );
- if (!BeanUtils.initCause(e, cause)) {
- log.error("Method invocation failed", cause);
- }
- throw e;
- } catch (final IllegalArgumentException cause) {
- String valueString = "";
+ StringBuilder valueString = new StringBuilder();
if (values != null) {
for (int i = 0; i < values.length; i++) {
if (i>0) {
- valueString += ", " ;
+ valueString.append(", ");
}
if (values[i] == null) {
- valueString += "<null>";
+ valueString.append("<null>");
} else {
- valueString += values[i].getClass().getName();
+ valueString.append(values[i].getClass().getName());
}
}
}
- String expectedString = "";
+ StringBuilder expectedString = new StringBuilder();
final Class<?>[] parTypes = method.getParameterTypes();
if (parTypes != null) {
for (int i = 0; i < parTypes.length; i++) {
if (i > 0) {
- expectedString += ", ";
+ expectedString.append(", ");
}
- expectedString += parTypes[i].getName();
+ expectedString.append(parTypes[i].getName());
}
}
final IllegalArgumentException e = new IllegalArgumentException(
@@ -2150,7 +2097,6 @@ public class PropertyUtilsBean {
log.error("Method invocation failed", cause);
}
throw e;
-
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java b/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
index ad7e333..10a4b1a 100644
--- a/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
@@ -277,8 +277,8 @@ public class RowSetDynaClass extends JDBCDynaClass {
int cnt = 0;
while (resultSet.next() && (limit < 0 || cnt++ < limit) ) {
final DynaBean bean = createDynaBean();
- for (final DynaProperty propertie : properties) {
- final String name = propertie.getName();
+ for (final DynaProperty property : properties) {
+ final String name = property.getName();
final Object value = getObject(resultSet, name);
bean.set(name, value);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
index 18d055f..f630842 100644
--- a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
@@ -184,7 +184,7 @@ public class WrapDynaClass implements DynaClass {
/**
- * <p>Return an array of {@code ProperyDescriptors} for the properties
+ * <p>Return an array of {@code PropertyDescriptor} for the properties
* currently defined in this DynaClass. If no properties are defined, a
* zero-length array will be returned.</p>
*
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java
index 037b8ab..dff8337 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java
@@ -423,10 +423,11 @@ public abstract class AbstractConverter implements Converter {
elementType = elementType .getComponentType();
count++;
}
- typeName = elementType.getName();
+ StringBuilder typeNameBuilder = new StringBuilder(elementType.getName());
for (int i = 0; i < count; i++) {
- typeName += "[]";
+ typeNameBuilder.append("[]");
}
+ typeName = typeNameBuilder.toString();
} else {
typeName = type.getName();
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
index 6eec128..34e6b2a 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
@@ -94,7 +94,7 @@ import org.apache.commons.beanutils2.Converter;
* </ul>
*
* <h3>Multi Dimensional Arrays</h3>
- * It is possible to convert a {@code String} to mulit-dimensional arrays by using
+ * It is possible to convert a {@code String} to multi-dimensional arrays by using
* {@link ArrayConverter} as the element {@link Converter}
* within another {@link ArrayConverter}.
* <p>
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java
index 047ffbf..3e4d725 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java
@@ -223,7 +223,7 @@ public abstract class BaseLocaleConverter implements LocaleConverter {
}
// symmetric beanutils function allows null
// so do not: throw new ConversionException("No value specified");
- log.debug("Null value specified for conversion, returing null");
+ log.debug("Null value specified for conversion, returning null");
return null;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConverter.java
index 789acbd..e35eb11 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConverter.java
@@ -41,5 +41,5 @@ public interface LocaleConverter extends Converter {
* @throws org.apache.commons.beanutils2.ConversionException if conversion
* cannot be performed successfully or if the target type is not supported
*/
- public <T> T convert(Class<T> type, Object value, String pattern);
+ <T> T convert(Class<T> type, Object value, String pattern);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java
index f0a7bd1..0cd6465 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverter.java
@@ -225,7 +225,7 @@ public class BigDecimalLocaleConverter extends DecimalLocaleConverter {
return new BigDecimal(result.toString());
}
catch (final NumberFormatException ex) {
- throw new ConversionException("Suplied number is not of type BigDecimal: " + result);
+ throw new ConversionException("Supplied number is not of type BigDecimal: " + result);
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java
index 89204bd..5bb1a02 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverter.java
@@ -229,7 +229,7 @@ public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
return new BigInteger(result.toString());
}
catch (final NumberFormatException ex) {
- throw new ConversionException("Suplied number is not of type BigInteger: " + result);
+ throw new ConversionException("Supplied number is not of type BigInteger: " + result);
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java
index 1e7a01b..5dbbcaf 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverter.java
@@ -215,7 +215,7 @@ public class IntegerLocaleConverter extends DecimalLocaleConverter {
protected Object parse(final Object value, final String pattern) throws ParseException {
final Number parsed = (Number) super.parse(value, pattern);
if (parsed.longValue() != parsed.intValue()) {
- throw new ConversionException("Suplied number is not of type Integer: " + parsed.longValue());
+ throw new ConversionException("Supplied number is not of type Integer: " + parsed.longValue());
}
return Integer.valueOf(parsed.intValue()); // unlike superclass it will return proper Integer
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java
index da87a17..38c5474 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java
@@ -268,7 +268,7 @@ public class StringLocaleConverter extends BaseLocaleConverter {
*
* @throws ConversionException if conversion cannot be performed
* successfully
- * @throws ParseException if an error occurs parsing a String to a Number
+ * @throws IllegalArgumentException if an error occurs parsing a String to a Number
*/
private DecimalFormat getDecimalFormat(final Locale locale, final String pattern) {
diff --git a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
index f26bbbe..c20bc39 100644
--- a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
@@ -100,9 +100,9 @@ public class BasicDynaBeanTestCase extends TestCase {
bean.set("booleanSecond", new Boolean(true));
bean.set("doubleProperty", new Double(321.0));
bean.set("floatProperty", new Float((float) 123.0));
- final int intArray[] = { 0, 10, 20, 30, 40 };
+ final int[] intArray = { 0, 10, 20, 30, 40 };
bean.set("intArray", intArray);
- final int intIndexed[] = { 0, 10, 20, 30, 40 };
+ final int[] intIndexed = { 0, 10, 20, 30, 40 };
bean.set("intIndexed", intIndexed);
bean.set("intProperty", new Integer(123));
final List<String> listIndexed = new ArrayList<>();
@@ -123,10 +123,10 @@ public class BasicDynaBeanTestCase extends TestCase {
bean.set("mappedIntProperty", mappedIntProperty);
// Property "nullProperty" is not initialized, so it should return null
bean.set("shortProperty", new Short((short) 987));
- final String stringArray[] =
+ final String[] stringArray =
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
bean.set("stringArray", stringArray);
- final String stringIndexed[] =
+ final String[] stringIndexed =
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
bean.set("stringIndexed", stringIndexed);
bean.set("stringProperty", "This is a string");
@@ -253,14 +253,14 @@ public class BasicDynaBeanTestCase extends TestCase {
}
/**
- * Positive test for getDynaPropertys(). Each property name
+ * Positive test for getDynaProperties(). Each property name
* listed in {@code properties} should be returned exactly once.
*/
public void testGetDescriptors() {
- final DynaProperty pd[] = bean.getDynaClass().getDynaProperties();
+ final DynaProperty[] pd = bean.getDynaClass().getDynaProperties();
assertNotNull("Got descriptors", pd);
- final int count[] = new int[properties.length];
+ final int[] count = new int[properties.length];
for (final DynaProperty element : pd) {
final String name = element.getName();
for (int j = 0; j < properties.length; j++) {
@@ -433,7 +433,7 @@ public class BasicDynaBeanTestCase extends TestCase {
assertNotNull("Got a value", value);
assertTrue("Got correct type", value instanceof Boolean);
assertTrue("Got correct value",
- ((Boolean) value).booleanValue() == true);
+ (Boolean) value);
} catch (final Throwable e) {
fail("Exception: " + e);
}
@@ -922,8 +922,8 @@ public class BasicDynaBeanTestCase extends TestCase {
*/
protected DynaClass createDynaClass() {
- final int intArray[] = new int[0];
- final String stringArray[] = new String[0];
+ final int[] intArray = new int[0];
+ final String[] stringArray = new String[0];
final DynaClass dynaClass = new BasicDynaClass
("TestDynaClass", null,
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
index 079e61c..edf702d 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
@@ -154,7 +154,7 @@ public class BeanComparatorTestCase extends TestCase {
}
catch (final Exception e) {
- assertTrue("Wrong exception was thrown: " + e, e.toString().indexOf("Unknown property") > -1);
+ assertTrue("Wrong exception was thrown: " + e, e.toString().contains("Unknown property"));
}
}
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
index c457499..8513ea8 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
@@ -71,7 +71,7 @@ public class BeanUtilsTestCase extends TestCase {
/**
* The set of properties that should be described.
*/
- protected String describes[] =
+ protected String[] describes =
{ "booleanProperty",
"booleanSecond",
"byteProperty",
@@ -222,19 +222,19 @@ public class BeanUtilsTestCase extends TestCase {
bean.getStringProperty());
// Validate the results for array properties
- final String dupProperty[] = bean.getDupProperty();
+ final String[] dupProperty = bean.getDupProperty();
assertNotNull("dupProperty present", dupProperty);
assertEquals("dupProperty length", 3, dupProperty.length);
assertEquals("dupProperty[0]", "New 0", dupProperty[0]);
assertEquals("dupProperty[1]", "New 1", dupProperty[1]);
assertEquals("dupProperty[2]", "New 2", dupProperty[2]);
- final int intArray[] = bean.getIntArray();
+ final int[] intArray = bean.getIntArray();
assertNotNull("intArray present", intArray);
assertEquals("intArray length", 3, intArray.length);
assertEquals("intArray[0]", 100, intArray[0]);
assertEquals("intArray[1]", 200, intArray[1]);
assertEquals("intArray[2]", 300, intArray[2]);
- final String stringArray[] = bean.getStringArray();
+ final String[] stringArray = bean.getStringArray();
assertNotNull("stringArray present", stringArray);
assertEquals("stringArray length", 2, stringArray.length);
assertEquals("stringArray[0]", "New 0", stringArray[0]);
@@ -284,13 +284,13 @@ public class BeanUtilsTestCase extends TestCase {
bean.getStringProperty());
// Indexed Properties
- final String dupProperty[] = bean.getDupProperty();
+ final String[] dupProperty = bean.getDupProperty();
assertNotNull("dupProperty present", dupProperty);
assertEquals("dupProperty length", 3, dupProperty.length);
assertEquals("dupProperty[0]", "New 0", dupProperty[0]);
assertEquals("dupProperty[1]", "New 1", dupProperty[1]);
assertEquals("dupProperty[2]", "New 2", dupProperty[2]);
- final int intArray[] = bean.getIntArray();
+ final int[] intArray = bean.getIntArray();
assertNotNull("intArray present", intArray);
assertEquals("intArray length", 3, intArray.length);
assertEquals("intArray[0]", 0, intArray[0]);
@@ -349,19 +349,19 @@ public class BeanUtilsTestCase extends TestCase {
bean.getStringProperty());
// Validate the results for array properties
- final String dupProperty[] = bean.getDupProperty();
+ final String[] dupProperty = bean.getDupProperty();
assertNotNull("dupProperty present", dupProperty);
assertEquals("dupProperty length", 3, dupProperty.length);
assertEquals("dupProperty[0]", "New 0", dupProperty[0]);
assertEquals("dupProperty[1]", "New 1", dupProperty[1]);
assertEquals("dupProperty[2]", "New 2", dupProperty[2]);
- final int intArray[] = bean.getIntArray();
+ final int[] intArray = bean.getIntArray();
assertNotNull("intArray present", intArray);
assertEquals("intArray length", 3, intArray.length);
assertEquals("intArray[0]", 100, intArray[0]);
assertEquals("intArray[1]", 200, intArray[1]);
assertEquals("intArray[2]", 300, intArray[2]);
- final String stringArray[] = bean.getStringArray();
+ final String[] stringArray = bean.getStringArray();
assertNotNull("stringArray present", stringArray);
assertEquals("stringArray length", 2, stringArray.length);
assertEquals("stringArray[0]", "New 0", stringArray[0]);
@@ -422,14 +422,14 @@ public class BeanUtilsTestCase extends TestCase {
*/
public void testGetArrayProperty() {
try {
- String arr[] = BeanUtils.getArrayProperty(bean, "stringArray");
- final String comp[] = bean.getStringArray();
+ String[] arr = BeanUtils.getArrayProperty(bean, "stringArray");
+ final String[] comp = bean.getStringArray();
assertTrue("String array length = " + comp.length,
comp.length == arr.length);
arr = BeanUtils.getArrayProperty(bean, "intArray");
- final int iarr[] = bean.getIntArray();
+ final int[] iarr = bean.getIntArray();
assertTrue("String array length = " + iarr.length,
iarr.length == arr.length);
@@ -658,9 +658,9 @@ public class BeanUtilsTestCase extends TestCase {
try {
final HashMap<String, Object> map = new HashMap<>();
- int intArray[] = new int[] { 123, 456, 789 };
+ int[] intArray = new int[] { 123, 456, 789 };
map.put("intArray", intArray);
- String stringArray[] = new String[]
+ String[] stringArray = new String[]
{ "New String 0", "New String 1" };
map.put("stringArray", stringArray);
@@ -843,7 +843,7 @@ public class BeanUtilsTestCase extends TestCase {
// Scalar value into array
oldValue = PropertyUtils.getSimpleProperty(bean, "stringArray");
- BeanUtils.setProperty(bean, "stringArray", (String) null);
+ BeanUtils.setProperty(bean, "stringArray", null);
newValue = PropertyUtils.getSimpleProperty(bean, "stringArray");
assertNotNull("stringArray is not null", newValue);
assertTrue("stringArray of correct type",
@@ -854,7 +854,7 @@ public class BeanUtilsTestCase extends TestCase {
// Indexed value into array
oldValue = PropertyUtils.getSimpleProperty(bean, "stringArray");
- BeanUtils.setProperty(bean, "stringArray[2]", (String) null);
+ BeanUtils.setProperty(bean, "stringArray[2]", null);
newValue = PropertyUtils.getSimpleProperty(bean, "stringArray");
assertNotNull("stringArray is not null", newValue);
assertTrue("stringArray of correct type",
@@ -1296,10 +1296,10 @@ public class BeanUtilsTestCase extends TestCase {
*/
public void testCopyPropertyNestedIndexedArray() throws Exception {
- final int origArray[] = { 0, 10, 20, 30, 40 };
- final int intArray[] = { 0, 0, 0 };
+ final int[] origArray = { 0, 10, 20, 30, 40 };
+ final int[] intArray = { 0, 0, 0 };
bean.getNested().setIntArray(intArray);
- final int intChanged[] = { 0, 0, 0 };
+ final int[] intChanged = { 0, 0, 0 };
// No conversion required
BeanUtils.copyProperty(bean, "nested.intArray[1]", new Integer(1));
@@ -1489,7 +1489,7 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals("Set property failed (3)", bean.getBooleanProperty(), true);
} catch (final PassTestException e) {
- fail("Registed converter is used by other instances");
+ fail("Registered converter is used by other instances");
}
}
@@ -1515,7 +1515,7 @@ public class BeanUtilsTestCase extends TestCase {
}
// Ensure that the actual int[] matches the expected int[]
- protected void checkIntArray(final int actual[], final int expected[]) {
+ protected void checkIntArray(final int[] actual, final int[] expected) {
assertNotNull("actual array not null", actual);
assertEquals("actual array length", expected.length, actual.length);
for (int i = 0; i < actual.length; i++) {
diff --git a/src/test/java/org/apache/commons/beanutils2/Child.java b/src/test/java/org/apache/commons/beanutils2/Child.java
index 98f3586..eb7ad71 100644
--- a/src/test/java/org/apache/commons/beanutils2/Child.java
+++ b/src/test/java/org/apache/commons/beanutils2/Child.java
@@ -21,5 +21,5 @@ package org.apache.commons.beanutils2;
*/
public interface Child {
- public String getName();
+ String getName();
}
diff --git a/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
index 960756b..4d107dd 100644
--- a/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
@@ -87,7 +87,7 @@ public class ConvertUtilsTestCase extends TestCase {
public void testNegativeIntegerArray() {
Object value = null;
- final int intArray[] = new int[0];
+ final int[] intArray = new int[0];
value = ConvertUtils.convert((String) null, intArray.getClass());
checkIntegerArray(value, intArray);
@@ -189,7 +189,7 @@ public class ConvertUtilsTestCase extends TestCase {
public void testNegativeStringArray() {
Object value = null;
- final String stringArray[] = new String[0];
+ final String[] stringArray = new String[0];
value = ConvertUtils.convert((String) null, stringArray.getClass());
checkStringArray(value, stringArray);
@@ -201,12 +201,12 @@ public class ConvertUtilsTestCase extends TestCase {
*/
public void testObjectToStringArray() {
- final int intArray0[] = new int[0];
- final int intArray1[] = { 123 };
- final int intArray2[] = { 123, 456 };
- final String stringArray0[] = new String[0];
- final String stringArray1[] = { "abc" };
- final String stringArray2[] = { "abc", "def" };
+ final int[] intArray0 = new int[0];
+ final int[] intArray1 = { 123 };
+ final int[] intArray2 = { 123, 456 };
+ final String[] stringArray0 = new String[0];
+ final String[] stringArray1 = { "abc" };
+ final String[] stringArray2 = { "abc", "def" };
assertEquals("intArray0", null,
ConvertUtils.convert(intArray0));
@@ -259,19 +259,19 @@ public class ConvertUtilsTestCase extends TestCase {
*/
public void testPositiveArray() {
- final String values1[] = { "10", "20", "30" };
+ final String[] values1 = { "10", "20", "30" };
Object value = ConvertUtils.convert(values1, Integer.TYPE);
- final int shape[] = new int[0];
+ final int[] shape = new int[0];
assertEquals(shape.getClass(), value.getClass());
- final int results1[] = (int[]) value;
+ final int[] results1 = (int[]) value;
assertEquals(results1[0], 10);
assertEquals(results1[1], 20);
assertEquals(results1[2], 30);
- final String values2[] = { "100", "200", "300" };
+ final String[] values2 = { "100", "200", "300" };
value = ConvertUtils.convert(values2, shape.getClass());
assertEquals(shape.getClass(), value.getClass());
- final int results2[] = (int[]) value;
+ final int[] results2 = (int[]) value;
assertEquals(results2[0], 100);
assertEquals(results2[1], 200);
assertEquals(results2[2], 300);
@@ -284,9 +284,9 @@ public class ConvertUtilsTestCase extends TestCase {
public void testPositiveIntegerArray() {
Object value = null;
- final int intArray[] = new int[0];
- final int intArray1[] = new int[] { 0 };
- final int intArray2[] = new int[] { 0, 10 };
+ final int[] intArray = new int[0];
+ final int[] intArray1 = new int[] { 0 };
+ final int[] intArray2 = new int[] { 0, 10 };
value = ConvertUtils.convert("{ }", intArray.getClass());
checkIntegerArray(value, intArray);
@@ -471,10 +471,10 @@ public class ConvertUtilsTestCase extends TestCase {
public void testPositiveStringArray() {
Object value = null;
- final String stringArray[] = new String[0];
- final String stringArray1[] = new String[]
+ final String[] stringArray = new String[0];
+ final String[] stringArray1 = new String[]
{ "abc" };
- final String stringArray2[] = new String[]
+ final String[] stringArray2 = new String[]
{ "abc", "de,f" };
value = ConvertUtils.convert("", stringArray.getClass());
@@ -619,7 +619,7 @@ public class ConvertUtilsTestCase extends TestCase {
utils.register(dateConverter, java.util.Date.class);
utils.register(fooConverter, String.class);
- // Convert using registerd DateConverter
+ // Convert using registered DateConverter
final java.util.Date today = new java.util.Date();
final DateFormat fmt = new SimpleDateFormat("M/d/yy"); /* US Short Format */
final String expected = fmt.format(today);
@@ -655,12 +655,12 @@ public class ConvertUtilsTestCase extends TestCase {
- private void checkIntegerArray(final Object value, final int intArray[]) {
+ private void checkIntegerArray(final Object value, final int[] intArray) {
assertNotNull("Returned value is not null", value);
assertEquals("Returned value is int[]",
intArray.getClass(), value.getClass());
- final int results[] = (int[]) value;
+ final int[] results = (int[]) value;
assertEquals("Returned array length", intArray.length, results.length);
for (int i = 0; i < intArray.length; i++) {
assertEquals("Returned array value " + i,
@@ -669,12 +669,12 @@ public class ConvertUtilsTestCase extends TestCase {
}
- private void checkStringArray(final Object value, final String stringArray[]) {
+ private void checkStringArray(final Object value, final String[] stringArray) {
assertNotNull("Returned value is not null", value);
assertEquals("Returned value is String[]",
stringArray.getClass(), value.getClass());
- final String results[] = (String[]) value;
+ final String[] results = (String[]) value;
assertEquals("Returned array length",
stringArray.length, results.length);
for (int i = 0; i < stringArray.length; i++) {
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
index e3a4008..f346618 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
@@ -50,7 +50,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
/**
* The set of properties that should be described.
*/
- protected String describes[] =
+ protected String[] describes =
{ "booleanProperty",
"booleanSecond",
"byteProperty",
@@ -107,11 +107,11 @@ public class DynaBeanUtilsTestCase extends TestCase {
bean.set("byteProperty", new Byte((byte) 121));
bean.set("doubleProperty", new Double(321.0));
bean.set("floatProperty", new Float((float) 123.0));
- final String dupProperty[] = { "Dup 0", "Dup 1", "Dup 2", "Dup 3", "Dup 4"};
+ final String[] dupProperty = { "Dup 0", "Dup 1", "Dup 2", "Dup 3", "Dup 4"};
bean.set("dupProperty", dupProperty);
- final int intArray[] = { 0, 10, 20, 30, 40 };
+ final int[] intArray = { 0, 10, 20, 30, 40 };
bean.set("intArray", intArray);
- final int intIndexed[] = { 0, 10, 20, 30, 40 };
+ final int[] intIndexed = { 0, 10, 20, 30, 40 };
bean.set("intIndexed", intIndexed);
bean.set("intProperty", new Integer(123));
final List<String> listIndexed = new ArrayList<>();
@@ -138,10 +138,10 @@ public class DynaBeanUtilsTestCase extends TestCase {
bean.set("nested", nested);
// Property "nullProperty" is not initialized, so it should return null
bean.set("shortProperty", new Short((short) 987));
- final String stringArray[] =
+ final String[] stringArray =
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
bean.set("stringArray", stringArray);
- final String stringIndexed[] =
+ final String[] stringIndexed =
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
bean.set("stringIndexed", stringIndexed);
bean.set("stringProperty", "This is a string");
@@ -227,19 +227,19 @@ public class DynaBeanUtilsTestCase extends TestCase {
(String) clonedBean.get("stringProperty"));
// Validate the results for array properties
- final String dupProperty[] = (String[]) clonedBean.get("dupProperty");
+ final String[] dupProperty = (String[]) clonedBean.get("dupProperty");
assertNotNull("dupProperty present", dupProperty);
assertEquals("dupProperty length", 3, dupProperty.length);
assertEquals("dupProperty[0]", "New 0", dupProperty[0]);
assertEquals("dupProperty[1]", "New 1", dupProperty[1]);
assertEquals("dupProperty[2]", "New 2", dupProperty[2]);
- final int intArray[] = (int[]) clonedBean.get("intArray");
+ final int[] intArray = (int[]) clonedBean.get("intArray");
assertNotNull("intArray present", intArray);
assertEquals("intArray length", 3, intArray.length);
assertEquals("intArray[0]", 100, intArray[0]);
assertEquals("intArray[1]", 200, intArray[1]);
assertEquals("intArray[2]", 300, intArray[2]);
- final String stringArray[] = (String[]) clonedBean.get("stringArray");
+ final String[] stringArray = (String[]) clonedBean.get("stringArray");
assertNotNull("stringArray present", stringArray);
assertEquals("stringArray length", 2, stringArray.length);
assertEquals("stringArray[0]", "New 0", stringArray[0]);
@@ -303,19 +303,19 @@ public class DynaBeanUtilsTestCase extends TestCase {
(String) bean.get("stringProperty"));
// Validate the results for array properties
- final String dupProperty[] = (String[]) bean.get("dupProperty");
+ final String[] dupProperty = (String[]) bean.get("dupProperty");
assertNotNull("dupProperty present", dupProperty);
assertEquals("dupProperty length", 3, dupProperty.length);
assertEquals("dupProperty[0]", "New 0", dupProperty[0]);
assertEquals("dupProperty[1]", "New 1", dupProperty[1]);
assertEquals("dupProperty[2]", "New 2", dupProperty[2]);
- final int intArray[] = (int[]) bean.get("intArray");
+ final int[] intArray = (int[]) bean.get("intArray");
assertNotNull("intArray present", intArray);
assertEquals("intArray length", 3, intArray.length);
assertEquals("intArray[0]", 100, intArray[0]);
assertEquals("intArray[1]", 200, intArray[1]);
assertEquals("intArray[2]", 300, intArray[2]);
- final String stringArray[] = (String[]) bean.get("stringArray");
+ final String[] stringArray = (String[]) bean.get("stringArray");
assertNotNull("stringArray present", stringArray);
assertEquals("stringArray length", 2, stringArray.length);
assertEquals("stringArray[0]", "New 0", stringArray[0]);
@@ -367,13 +367,13 @@ public class DynaBeanUtilsTestCase extends TestCase {
(String) bean.get("stringProperty"));
// Indexed Properties
- final String dupProperty[] = (String[]) bean.get("dupProperty");
+ final String[] dupProperty = (String[]) bean.get("dupProperty");
assertNotNull("dupProperty present", dupProperty);
assertEquals("dupProperty length", 3, dupProperty.length);
assertEquals("dupProperty[0]", "New 0", dupProperty[0]);
assertEquals("dupProperty[1]", "New 1", dupProperty[1]);
assertEquals("dupProperty[2]", "New 2", dupProperty[2]);
- final int intArray[] = (int[]) bean.get("intArray");
+ final int[] intArray = (int[]) bean.get("intArray");
assertNotNull("intArray present", intArray);
assertEquals("intArray length", 3, intArray.length);
assertEquals("intArray[0]", 0, intArray[0]);
@@ -432,19 +432,19 @@ public class DynaBeanUtilsTestCase extends TestCase {
(String) bean.get("stringProperty"));
// Validate the results for array properties
- final String dupProperty[] = (String[]) bean.get("dupProperty");
+ final String[] dupProperty = (String[]) bean.get("dupProperty");
assertNotNull("dupProperty present", dupProperty);
assertEquals("dupProperty length", 3, dupProperty.length);
assertEquals("dupProperty[0]", "New 0", dupProperty[0]);
assertEquals("dupProperty[1]", "New 1", dupProperty[1]);
assertEquals("dupProperty[2]", "New 2", dupProperty[2]);
- final int intArray[] = (int[]) bean.get("intArray");
+ final int[] intArray = (int[]) bean.get("intArray");
assertNotNull("intArray present", intArray);
assertEquals("intArray length", 3, intArray.length);
assertEquals("intArray[0]", 100, intArray[0]);
assertEquals("intArray[1]", 200, intArray[1]);
assertEquals("intArray[2]", 300, intArray[2]);
- final String stringArray[] = (String[]) bean.get("stringArray");
+ final String[] stringArray = (String[]) bean.get("stringArray");
assertNotNull("stringArray present", stringArray);
assertEquals("stringArray length", 2, stringArray.length);
assertEquals("stringArray[0]", "New 0", stringArray[0]);
@@ -509,15 +509,15 @@ public class DynaBeanUtilsTestCase extends TestCase {
final HashMap<String, Object> map = new HashMap<>();
// int intArray[] = new int[] { 123, 456, 789 };
- final String intArrayIn[] = new String[] { "123", "456", "789" };
+ final String[] intArrayIn = new String[] { "123", "456", "789" };
map.put("intArray", intArrayIn);
- String stringArray[] = new String[]
+ String[] stringArray = new String[]
{ "New String 0", "New String 1" };
map.put("stringArray", stringArray);
BeanUtils.populate(bean, map);
- final int intArray[] = (int[]) bean.get("intArray");
+ final int[] intArray = (int[]) bean.get("intArray");
assertNotNull("intArray is present", intArray);
assertEquals("intArray length",
3, intArray.length);
@@ -543,14 +543,14 @@ public class DynaBeanUtilsTestCase extends TestCase {
*/
public void testGetArrayProperty() {
try {
- String arr[] = BeanUtils.getArrayProperty(bean, "stringArray");
- final String comp[] = (String[]) bean.get("stringArray");
+ String[] arr = BeanUtils.getArrayProperty(bean, "stringArray");
+ final String[] comp = (String[]) bean.get("stringArray");
assertTrue("String array length = " + comp.length,
comp.length == arr.length);
arr = BeanUtils.getArrayProperty(bean, "intArray");
- final int iarr[] = (int[]) bean.get("intArray");
+ final int[] iarr = (int[]) bean.get("intArray");
assertTrue("String array length = " + iarr.length,
iarr.length == arr.length);
@@ -872,7 +872,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
// Scalar value into array
oldValue = PropertyUtils.getSimpleProperty(bean, "stringArray");
- BeanUtils.setProperty(bean, "stringArray", (String) null);
+ BeanUtils.setProperty(bean, "stringArray", null);
newValue = PropertyUtils.getSimpleProperty(bean, "stringArray");
assertNotNull("stringArray is not null", newValue);
assertTrue("stringArray of correct type",
@@ -883,7 +883,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
// Indexed value into array
oldValue = PropertyUtils.getSimpleProperty(bean, "stringArray");
- BeanUtils.setProperty(bean, "stringArray[2]", (String) null);
+ BeanUtils.setProperty(bean, "stringArray[2]", null);
newValue = PropertyUtils.getSimpleProperty(bean, "stringArray");
assertNotNull("stringArray is not null", newValue);
assertTrue("stringArray of correct type",
@@ -1069,10 +1069,10 @@ public class DynaBeanUtilsTestCase extends TestCase {
*/
public void testCopyPropertyNestedIndexedArray() throws Exception {
- final int origArray[] = { 0, 10, 20, 30, 40};
- final int intArray[] = { 0, 0, 0 };
+ final int[] origArray = { 0, 10, 20, 30, 40};
+ final int[] intArray = { 0, 0, 0 };
((TestBean) bean.get("nested")).setIntArray(intArray);
- final int intChanged[] = { 0, 0, 0 };
+ final int[] intChanged = { 0, 0, 0 };
// No conversion required
BeanUtils.copyProperty(bean, "nested.intArray[1]", new Integer(1));
@@ -1159,7 +1159,7 @@ public class DynaBeanUtilsTestCase extends TestCase {
// Ensure that the nested intArray matches the specified values
- protected void checkIntArray(final int actual[], final int expected[]) {
+ protected void checkIntArray(final int[] actual, final int[] expected) {
assertNotNull("actual array not null", actual);
assertEquals("actual array length", expected.length, actual.length);
for (int i = 0; i < actual.length; i++) {
@@ -1186,8 +1186,8 @@ public class DynaBeanUtilsTestCase extends TestCase {
*/
protected static DynaClass createDynaClass() {
- final int intArray[] = new int[0];
- final String stringArray[] = new String[0];
+ final int[] intArray = new int[0];
+ final String[] stringArray = new String[0];
final DynaClass dynaClass = new BasicDynaClass
("TestDynaClass", null,
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
index be46343..6d4f9f3 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
@@ -44,7 +44,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
/**
* The set of properties that should be described.
*/
- protected String describes[] =
+ protected String[] describes =
{ "booleanProperty",
"booleanSecond",
"doubleProperty",
@@ -101,9 +101,9 @@ public class DynaPropertyUtilsTestCase extends TestCase {
bean.set("booleanSecond", new Boolean(true));
bean.set("doubleProperty", new Double(321.0));
bean.set("floatProperty", new Float((float) 123.0));
- final int intArray[] = { 0, 10, 20, 30, 40 };
+ final int[] intArray = { 0, 10, 20, 30, 40 };
bean.set("intArray", intArray);
- final int intIndexed[] = { 0, 10, 20, 30, 40 };
+ final int[] intIndexed = { 0, 10, 20, 30, 40 };
bean.set("intIndexed", intIndexed);
bean.set("intProperty", new Integer(123));
final List<String> listIndexed = new ArrayList<>();
@@ -134,10 +134,10 @@ public class DynaPropertyUtilsTestCase extends TestCase {
bean.set("nested", nested);
// Property "nullProperty" is not initialized, so it should return null
bean.set("shortProperty", new Short((short) 987));
- final String stringArray[] =
+ final String[] stringArray =
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
bean.set("stringArray", stringArray);
- final String stringIndexed[] =
+ final String[] stringIndexed =
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
bean.set("stringIndexed", stringIndexed);
bean.set("stringProperty", "This is a string");
@@ -207,13 +207,13 @@ public class DynaPropertyUtilsTestCase extends TestCase {
(String) bean.get("stringProperty"));
// Indexed Properties
- final String dupProperty[] = (String[]) bean.get("dupProperty");
+ final String[] dupProperty = (String[]) bean.get("dupProperty");
assertNotNull("dupProperty present", dupProperty);
assertEquals("dupProperty length", 3, dupProperty.length);
assertEquals("dupProperty[0]", "New 0", dupProperty[0]);
assertEquals("dupProperty[1]", "New 1", dupProperty[1]);
assertEquals("dupProperty[2]", "New 2", dupProperty[2]);
- final int intArray[] = (int[]) bean.get("intArray");
+ final int[] intArray = (int[]) bean.get("intArray");
assertNotNull("intArray present", intArray);
assertEquals("intArray length", 3, intArray.length);
assertEquals("intArray[0]", 0, intArray[0]);
@@ -1169,7 +1169,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
assertNotNull("Got a value", value);
assertTrue("Got correct type", value instanceof Boolean);
assertTrue("Got correct value",
- ((Boolean) value).booleanValue() == true);
+ ((Boolean) value).booleanValue());
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final IllegalArgumentException e) {
@@ -1315,7 +1315,7 @@ public class DynaPropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.getSimpleProperty(bean,
"nested.stringProperty");
- fail("Should have thrown IllegaArgumentException");
+ fail("Should have thrown IllegalArgumentException");
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final IllegalArgumentException e) {
@@ -2536,8 +2536,8 @@ public class DynaPropertyUtilsTestCase extends TestCase {
*/
protected DynaClass createDynaClass() {
- final int intArray[] = new int[0];
- final String stringArray[] = new String[0];
+ final int[] intArray = new int[0];
+ final String[] stringArray = new String[0];
final DynaClass dynaClass = new BasicDynaClass
("TestDynaClass", null,
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
index bf98c18..90c9f33 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
@@ -42,7 +42,7 @@ public class DynaResultSetTestCase extends TestCase {
* Names of the columns for this test. Must match the order they are
* defined in {@link TestResultSetMetaData}, and must be all lower case.
*/
- protected String columns[] =
+ protected String[] columns =
{ "bigdecimalproperty", "booleanproperty",
"byteproperty", "dateproperty",
"doubleproperty", "floatproperty",
@@ -110,7 +110,7 @@ public class DynaResultSetTestCase extends TestCase {
// Invalid argument test
try {
dynaClass.getDynaProperty(null);
- fail("Did not throw IllegaArgumentException");
+ fail("Did not throw IllegalArgumentException");
} catch (final IllegalArgumentException e) {
// Expected result
}
@@ -132,7 +132,7 @@ public class DynaResultSetTestCase extends TestCase {
public void testGetDynaProperties() {
- final DynaProperty dynaProps[] = dynaClass.getDynaProperties();
+ final DynaProperty[] dynaProps = dynaClass.getDynaProperties();
assertNotNull("dynaProps exists", dynaProps);
assertEquals("dynaProps length", columns.length, dynaProps.length);
for (int i = 0; i < columns.length; i++) {
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
index 730f629..7760833 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
@@ -45,7 +45,7 @@ public class DynaRowSetTestCase extends TestCase {
* Names of the columns for this test. Must match the order they are
* defined in {@link TestResultSetMetaData}, and must be all lower case.
*/
- protected String columns[] =
+ protected String[] columns =
{ "bigdecimalproperty", "booleanproperty",
"byteproperty", "dateproperty",
"doubleproperty", "floatproperty",
@@ -113,7 +113,7 @@ public class DynaRowSetTestCase extends TestCase {
// Invalid argument test
try {
dynaClass.getDynaProperty(null);
- fail("Did not throw IllegaArgumentException");
+ fail("Did not throw IllegalArgumentException");
} catch (final IllegalArgumentException e) {
// Expected result
}
@@ -135,7 +135,7 @@ public class DynaRowSetTestCase extends TestCase {
public void testGetDynaProperties() {
- final DynaProperty dynaProps[] = dynaClass.getDynaProperties();
+ final DynaProperty[] dynaProps = dynaClass.getDynaProperties();
assertNotNull("dynaProps exists", dynaProps);
assertEquals("dynaProps length", columns.length, dynaProps.length);
for (int i = 0; i < columns.length; i++) {
diff --git a/src/test/java/org/apache/commons/beanutils2/IndexedPropertyTestCase.java b/src/test/java/org/apache/commons/beanutils2/IndexedPropertyTestCase.java
index b3d0150..96a4f7f 100644
--- a/src/test/java/org/apache/commons/beanutils2/IndexedPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/IndexedPropertyTestCase.java
@@ -110,7 +110,7 @@ public class IndexedPropertyTestCase {
assertEquals("Not IndexedPropertyDescriptor",
IndexedPropertyDescriptor.class,
descriptor.getClass());
- assertEquals("PropertDescriptor Type invalid",
+ assertEquals("PropertyDescriptor Type invalid",
testArray.getClass(),
descriptor.getPropertyType());
}
@@ -127,7 +127,7 @@ public class IndexedPropertyTestCase {
assertEquals("Not IndexedPropertyDescriptor",
IndexedPropertyDescriptor.class, descriptor.getClass());
}
- assertEquals("PropertDescriptor Type invalid",
+ assertEquals("PropertyDescriptor Type invalid",
List.class,
descriptor.getPropertyType());
}
@@ -143,7 +143,7 @@ public class IndexedPropertyTestCase {
assertEquals("Not IndexedPropertyDescriptor",
IndexedPropertyDescriptor.class, descriptor.getClass());
}
- assertEquals("PropertDescriptor Type invalid",
+ assertEquals("PropertyDescriptor Type invalid",
ArrayList.class,
descriptor.getPropertyType());
}
@@ -206,7 +206,7 @@ public class IndexedPropertyTestCase {
* Test Write Method for a List
*
* JDK 1.3.1_04: Test Passes
- * JDK 1.4.2_05: Test Fails - setter whith java.util.List argument not returned
+ * JDK 1.4.2_05: Test Fails - setter which java.util.List argument not returned
* by IndexedPropertyDescriptor.getWriteMethod();
*/
@Test
@@ -273,7 +273,7 @@ public class IndexedPropertyTestCase {
* Test getting an array property as a String
*
* NOTE: Why does retrieving array just return the first element in the array, whereas
- * retrieveing a List returns a comma separated list of all the elements?
+ * retrieving a List returns a comma separated list of all the elements?
*/
@Test
public void testGetArrayAsString() throws Exception {
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java
index 06f57a2..1e4a338 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java
@@ -193,7 +193,7 @@ public class LazyDynaBeanTestCase extends TestCase {
assertEquals("Check Mapped Property exists", TreeMap.class, bean.get(testProperty).getClass());
// assertNull("Check mapped property is null", bean.get(testProperty));
- // Set a new mapped property - should instatiate a new TreeMap property and set the mapped value
+ // Set a new mapped property - should instantiate a new TreeMap property and set the mapped value
bean.set(testProperty, testKey, testInteger1);
assertEquals("Check Mapped Property exists", TreeMap.class, bean.get(testProperty).getClass());
assertEquals("Check First Mapped Value is correct(a)", testInteger1, bean.get(testProperty, testKey));
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
index 917b155..a6c7b60 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
@@ -321,9 +321,9 @@ public class LazyDynaListTestCase extends TestCase {
*/
private String findStringProperty(final DynaClass dynaClass) {
final DynaProperty[] properties = dynaClass.getDynaProperties();
- for (final DynaProperty propertie : properties) {
- if (propertie.getType() == String.class) {
- return propertie.getName();
+ for (final DynaProperty property : properties) {
+ if (property.getType() == String.class) {
+ return property.getName();
}
}
return null;
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
index ff6a448..9c1c721 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
@@ -183,7 +183,7 @@ public class LazyDynaMapTestCase extends TestCase {
assertEquals("Check Property is correct type", TreeMap.class, dynaMap.getDynaProperty(testProperty).getType());
assertEquals("Check Mapped Property now exists", TreeMap.class, dynaMap.get(testProperty).getClass());
- // Set a new mapped property - should instatiate a new TreeMap property and set the mapped value
+ // Set a new mapped property - should instantiate a new TreeMap property and set the mapped value
dynaMap.set(testProperty, testKey, testInteger1);
assertEquals("Check Mapped Property exists", TreeMap.class, dynaMap.get(testProperty).getClass());
assertEquals("Check First Mapped Value is correct(a)", testInteger1, dynaMap.get(testProperty, testKey));
diff --git a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestInterface.java b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestInterface.java
index d826c2c..b4f75ef 100644
--- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestInterface.java
+++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestInterface.java
@@ -24,8 +24,8 @@ package org.apache.commons.beanutils2;
public interface MappedPropertyTestInterface {
- public String getMapproperty(String key);
+ String getMapproperty(String key);
- public void setMapproperty(String key, String value);
+ void setMapproperty(String key, String value);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java b/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java
index abe2210..5f2194a 100644
--- a/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java
@@ -61,7 +61,7 @@ public class NestedTestBean {
this.testBoolean = testBoolean;
}
- private NestedTestBean indexedBeans[];
+ private NestedTestBean[] indexedBeans;
public void init() {
indexedBeans = new NestedTestBean[5];
diff --git a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
index 0719278..6de31b1 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
@@ -116,7 +116,7 @@ public class PropertyUtilsTestCase extends TestCase {
/**
* The set of properties that should be described.
*/
- protected String describes[] =
+ protected String[] describes =
{ "booleanProperty",
"booleanSecond",
"doubleProperty",
@@ -268,13 +268,13 @@ public class PropertyUtilsTestCase extends TestCase {
bean.getStringProperty());
// Indexed Properties
- final String dupProperty[] = bean.getDupProperty();
+ final String[] dupProperty = bean.getDupProperty();
assertNotNull("dupProperty present", dupProperty);
assertEquals("dupProperty length", 3, dupProperty.length);
assertEquals("dupProperty[0]", "New 0", dupProperty[0]);
assertEquals("dupProperty[1]", "New 1", dupProperty[1]);
assertEquals("dupProperty[2]", "New 2", dupProperty[2]);
- final int intArray[] = bean.getIntArray();
+ final int[] intArray = bean.getIntArray();
assertNotNull("intArray present", intArray);
assertEquals("intArray length", 3, intArray.length);
assertEquals("intArray[0]", 0, intArray[0]);
@@ -530,10 +530,10 @@ public class PropertyUtilsTestCase extends TestCase {
*/
public void testGetDescriptors() {
- final PropertyDescriptor pd[] =
+ final PropertyDescriptor[] pd =
PropertyUtils.getPropertyDescriptors(bean);
assertNotNull("Got descriptors", pd);
- final int count[] = new int[properties.length];
+ final int[] count = new int[properties.length];
for (final PropertyDescriptor element : pd) {
final String name = element.getName();
for (int j = 0; j < properties.length; j++) {
@@ -1656,8 +1656,8 @@ public class PropertyUtilsTestCase extends TestCase {
public void testGetPropertyType() {
Class<?> clazz = null;
- final int intArray[] = new int[0];
- final String stringArray[] = new String[0];
+ final int[] intArray = new int[0];
+ final String[] stringArray = new String[0];
try {
@@ -1841,7 +1841,7 @@ public class PropertyUtilsTestCase extends TestCase {
// Property "foo" is not accessible because the underlying
// class has package scope
- final PropertyDescriptor pd[] =
+ final PropertyDescriptor[] pd =
PropertyUtils.getPropertyDescriptors(beanPrivate);
int n = -1;
for (int i = 0; i < pd.length; i++) {
@@ -2059,7 +2059,7 @@ public class PropertyUtilsTestCase extends TestCase {
try {
PropertyUtils.getSimpleProperty(bean,
"nested.stringProperty");
- fail("Should have thrown IllegaArgumentException");
+ fail("Should have thrown IllegalArgumentException");
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final IllegalArgumentException e) {
@@ -2232,68 +2232,68 @@ public class PropertyUtilsTestCase extends TestCase {
String property = null;
try {
property = "stringProperty";
- assertTrue("Property " + property +" isReadable expeced TRUE", PropertyUtils.isReadable(bean, property));
+ assertTrue("Property " + property +" isReadable expected TRUE", PropertyUtils.isReadable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isReadable Threw exception: " + t);
}
try {
property = "stringIndexed";
- assertTrue("Property " + property +" isReadable expeced TRUE", PropertyUtils.isReadable(bean, property));
+ assertTrue("Property " + property +" isReadable expected TRUE", PropertyUtils.isReadable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isReadable Threw exception: " + t);
}
try {
property = "mappedProperty";
- assertTrue("Property " + property +" isReadable expeced TRUE", PropertyUtils.isReadable(bean, property));
+ assertTrue("Property " + property +" isReadable expected TRUE", PropertyUtils.isReadable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isReadable Threw exception: " + t);
}
try {
property = "nestedDynaBean";
- assertTrue("Property " + property +" isReadable expeced TRUE", PropertyUtils.isReadable(bean, property));
+ assertTrue("Property " + property +" isReadable expected TRUE", PropertyUtils.isReadable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isReadable Threw exception: " + t);
}
try {
property = "nestedDynaBean.stringProperty";
- assertTrue("Property " + property +" isReadable expeced TRUE", PropertyUtils.isReadable(bean, property));
+ assertTrue("Property " + property +" isReadable expected TRUE", PropertyUtils.isReadable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isReadable Threw exception: " + t);
}
try {
property = "nestedDynaBean.nestedBean";
- assertTrue("Property " + property +" isReadable expeced TRUE", PropertyUtils.isReadable(bean, property));
+ assertTrue("Property " + property +" isReadable expected TRUE", PropertyUtils.isReadable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isReadable Threw exception: " + t);
}
try {
property = "nestedDynaBean.nestedBean.nestedDynaBean";
- assertTrue("Property " + property +" isReadable expeced TRUE", PropertyUtils.isReadable(bean, property));
+ assertTrue("Property " + property +" isReadable expected TRUE", PropertyUtils.isReadable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isReadable Threw exception: " + t);
}
try {
property = "nestedDynaBean.nestedBean.nestedDynaBean.stringProperty";
- assertTrue("Property " + property +" isReadable expeced TRUE", PropertyUtils.isReadable(bean, property));
+ assertTrue("Property " + property +" isReadable expected TRUE", PropertyUtils.isReadable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isReadable Threw exception: " + t);
}
try {
property = "nestedDynaBean.nullDynaBean";
- assertTrue("Property " + property +" isReadable expeced TRUE", PropertyUtils.isReadable(bean, property));
+ assertTrue("Property " + property +" isReadable expected TRUE", PropertyUtils.isReadable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isReadable Threw exception: " + t);
}
try {
property = "nestedDynaBean.nullDynaBean.foo";
- assertTrue("Property " + property +" isReadable expeced TRUE", PropertyUtils.isReadable(bean, property));
+ assertTrue("Property " + property +" isReadable expected TRUE", PropertyUtils.isReadable(bean, property));
fail("Property " + property +" isReadable expected NestedNullException");
} catch (final NestedNullException e) {
// expected result
@@ -2309,33 +2309,33 @@ public class PropertyUtilsTestCase extends TestCase {
String property = null;
try {
property = "stringProperty";
- assertTrue("Property " + property +" isWriteable expeced TRUE", PropertyUtils.isWriteable(bean, property));
+ assertTrue("Property " + property +" isWriteable expected TRUE", PropertyUtils.isWriteable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isWriteable Threw exception: " + t);
}
try {
property = "stringIndexed";
- assertTrue("Property " + property +" isWriteable expeced TRUE", PropertyUtils.isWriteable(bean, property));
+ assertTrue("Property " + property +" isWriteable expected TRUE", PropertyUtils.isWriteable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isWriteable Threw exception: " + t);
}
try {
property = "mappedProperty";
- assertTrue("Property " + property +" isWriteable expeced TRUE", PropertyUtils.isWriteable(bean, property));
+ assertTrue("Property " + property +" isWriteable expected TRUE", PropertyUtils.isWriteable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isWriteable Threw exception: " + t);
}
try {
property = "nestedDynaBean";
- assertTrue("Property " + property +" isWriteable expeced TRUE", PropertyUtils.isWriteable(bean, property));
+ assertTrue("Property " + property +" isWriteable expected TRUE", PropertyUtils.isWriteable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isWriteable Threw exception: " + t);
}
try {
property = "nestedDynaBean.stringProperty";
- assertTrue("Property " + property +" isWriteable expeced TRUE", PropertyUtils.isWriteable(bean, property));
+ assertTrue("Property " + property +" isWriteable expected TRUE", PropertyUtils.isWriteable(bean, property));
} catch (final Throwable t) {
t.printStackTrace();
fail("Property " + property +" isWriteable Threw exception: " + t);
@@ -2343,35 +2343,35 @@ public class PropertyUtilsTestCase extends TestCase {
try {
property = "nestedDynaBean.nestedBean";
- assertTrue("Property " + property +" isWriteable expeced TRUE", PropertyUtils.isWriteable(bean, property));
+ assertTrue("Property " + property +" isWriteable expected TRUE", PropertyUtils.isWriteable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isWriteable Threw exception: " + t);
}
try {
property = "nestedDynaBean.nestedBean.nestedDynaBean";
- assertTrue("Property " + property +" isWriteable expeced TRUE", PropertyUtils.isWriteable(bean, property));
+ assertTrue("Property " + property +" isWriteable expected TRUE", PropertyUtils.isWriteable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isWriteable Threw exception: " + t);
}
try {
property = "nestedDynaBean.nestedBean.nestedDynaBean.stringProperty";
- assertTrue("Property " + property +" isWriteable expeced TRUE", PropertyUtils.isWriteable(bean, property));
+ assertTrue("Property " + property +" isWriteable expected TRUE", PropertyUtils.isWriteable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isWriteable Threw exception: " + t);
}
try {
property = "nestedDynaBean.nullDynaBean";
- assertTrue("Property " + property +" isWriteable expeced TRUE", PropertyUtils.isWriteable(bean, property));
+ assertTrue("Property " + property +" isWriteable expected TRUE", PropertyUtils.isWriteable(bean, property));
} catch (final Throwable t) {
fail("Property " + property +" isWriteable Threw exception: " + t);
}
try {
property = "nestedDynaBean.nullDynaBean.foo";
- assertTrue("Property " + property +" isWriteable expeced TRUE", PropertyUtils.isWriteable(bean, property));
+ assertTrue("Property " + property +" isWriteable expected TRUE", PropertyUtils.isWriteable(bean, property));
fail("Property " + property +" isWriteable expected NestedNullException");
} catch (final NestedNullException e) {
// expected result
@@ -3876,10 +3876,10 @@ public class PropertyUtilsTestCase extends TestCase {
* @param properties Property names to search for
* @param className Class name where this method should be defined
*/
- protected void testGetReadMethod(final Object bean, final String properties[],
+ protected void testGetReadMethod(final Object bean, final String[] properties,
final String className) {
- final PropertyDescriptor pd[] =
+ final PropertyDescriptor[] pd =
PropertyUtils.getPropertyDescriptors(bean);
for (final String propertie : properties) {
@@ -3932,48 +3932,48 @@ public class PropertyUtilsTestCase extends TestCase {
* @param properties Property names to search for
* @param className Class name where this method should be defined
*/
- protected void testGetWriteMethod(final Object bean, final String properties[],
+ protected void testGetWriteMethod(final Object bean, final String[] properties,
final String className) {
- final PropertyDescriptor pd[] =
+ final PropertyDescriptor[] pd =
PropertyUtils.getPropertyDescriptors(bean);
- for (final String propertie : properties) {
+ for (final String property : properties) {
// Identify the property descriptor for this property
- if (propertie.equals("intIndexed")) {
+ if (property.equals("intIndexed")) {
continue;
}
- if (propertie.equals("listIndexed")) {
+ if (property.equals("listIndexed")) {
continue;
}
- if (propertie.equals("nested"))
+ if (property.equals("nested"))
{
continue; // This property is read only
}
- if (propertie.equals("readOnlyProperty")) {
+ if (property.equals("readOnlyProperty")) {
continue;
}
- if (propertie.equals("stringIndexed")) {
+ if (property.equals("stringIndexed")) {
continue;
}
int n = -1;
for (int j = 0; j < pd.length; j++) {
- if (propertie.equals(pd[j].getName())) {
+ if (property.equals(pd[j].getName())) {
n = j;
break;
}
}
- assertTrue("PropertyDescriptor for " + propertie,
+ assertTrue("PropertyDescriptor for " + property,
n >= 0);
// Locate an accessible property reader method for it
final Method writer = PropertyUtils.getWriteMethod(pd[n]);
- assertNotNull("Writer for " + propertie,
+ assertNotNull("Writer for " + property,
writer);
final Class<?> clazz = writer.getDeclaringClass();
- assertNotNull("Declaring class for " + propertie,
+ assertNotNull("Declaring class for " + property,
clazz);
- assertEquals("Correct declaring class for " + propertie,
+ assertEquals("Correct declaring class for " + property,
clazz.getName(),
className);
diff --git a/src/test/java/org/apache/commons/beanutils2/TestBean.java b/src/test/java/org/apache/commons/beanutils2/TestBean.java
index 54a5d33..9576bb6 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestBean.java
@@ -216,7 +216,7 @@ public class TestBean implements Serializable {
/**
* An integer array property accessed as an array.
*/
- private int intArray[] = { 0, 10, 20, 30, 40 };
+ private int[] intArray = { 0, 10, 20, 30, 40 };
public int[] getIntArray() {
return this.intArray;
@@ -229,7 +229,7 @@ public class TestBean implements Serializable {
/**
* An integer array property accessed as an indexed property.
*/
- private final int intIndexed[] = { 0, 10, 20, 30, 40 };
+ private final int[] intIndexed = { 0, 10, 20, 30, 40 };
public int getIntIndexed(final int index) {
return intIndexed[index];
diff --git a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
index da086e6..db6ae81 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
@@ -638,12 +638,12 @@ public class TestResultSet implements InvocationHandler {
throw new UnsupportedOperationException();
}
- public void updateBytes(final int columnPosition, final byte x[])
+ public void updateBytes(final int columnPosition, final byte[] x)
throws SQLException {
throw new UnsupportedOperationException();
}
- public void updateBytes(final String columnName, final byte x[])
+ public void updateBytes(final String columnName, final byte[] x)
throws SQLException {
throw new UnsupportedOperationException();
}
diff --git a/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java b/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
index c4d2e7d..eb38941 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
@@ -38,7 +38,7 @@ public class TestResultSetMetaData implements InvocationHandler {
/**
* <p>Array of column names and class names for metadata.</p>
*/
- protected String metadata[][] = {
+ protected String[][] metadata = {
{ "bigDecimalProperty", java.math.BigDecimal.class.getName() },
{ "booleanProperty", Boolean.class.getName() },
{ "byteProperty", Byte.class.getName() },
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java
index 8e27c08..2614580 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java
@@ -174,7 +174,7 @@ public class Jira157TestCase extends TestCase {
assertEquals("publicFoo Value", "PublicFoo Value", result.get("publicFoo"));
}
- public static interface XY {
+ public interface XY {
String getX();
String getY();
}
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java
index 69c88fe..91258b0 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
import junit.framework.TestSuite;
/**
- * Public methods overriden in anonymous or private subclasses
+ * Public methods overridden in anonymous or private subclasses
* are not recognized by PropertyUtils - see issue# BEANUTILS-273.
*
* @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-273">https://issues.apache.org/jira/browse/BEANUTILS-273</a>
@@ -83,33 +83,33 @@ public class Jira273TestCase extends TestCase {
}
/**
- * Test with an annonymous class that overrides a public method
+ * Test with an anonymous class that overrides a public method
* of a public class.
*/
- public void testIssue_BEANUTILS_273_AnnonymousOverriden() {
- final Object bean = Jira273BeanFactory.createAnnonymousOverriden();
+ public void testIssue_BEANUTILS_273_AnonymousOverridden() {
+ final Object bean = Jira273BeanFactory.createAnonymousOverridden();
Object result = null;
try {
result = PropertyUtils.getProperty(bean, "beanValue");
} catch (final Throwable t) {
- log.error("AnnonymousOverriden: " + t.getMessage(), t);
- fail("AnnonymousOverriden Threw exception: " + t);
+ log.error("AnonymousOverridden: " + t.getMessage(), t);
+ fail("AnonymousOverridden Threw exception: " + t);
}
- assertEquals("AnnonymousOverriden", result);
+ assertEquals("AnonymousOverridden", result);
}
/**
- * Test with an annonymous class that inherits a public method
+ * Test with an anonymous class that inherits a public method
* of a public class.
*/
- public void testIssue_BEANUTILS_273_AnnonymousNotOverriden() {
- final Object bean = Jira273BeanFactory.createAnnonymousNotOverriden();
+ public void testIssue_BEANUTILS_273_AnonymousNotOverridden() {
+ final Object bean = Jira273BeanFactory.createAnonymousNotOverridden();
Object result = null;
try {
result = PropertyUtils.getProperty(bean, "beanValue");
} catch (final Throwable t) {
- log.error("AnnonymousNotOverriden: " + t.getMessage(), t);
- fail("AnnonymousNotOverriden Threw exception: " + t);
+ log.error("AnonymousNotOverridden: " + t.getMessage(), t);
+ fail("AnonymousNotOverridden Threw exception: " + t);
}
assertEquals("PublicBeanWithMethod", result);
}
@@ -118,14 +118,14 @@ public class Jira273TestCase extends TestCase {
* Test with an private class that inherits a public method
* of a public class.
*/
- public void testIssue_BEANUTILS_273_PrivatePublicNotOverriden() {
- final Object bean = Jira273BeanFactory.createPrivatePublicNotOverriden();
+ public void testIssue_BEANUTILS_273_PrivatePublicNotOverridden() {
+ final Object bean = Jira273BeanFactory.createPrivatePublicNotOverridden();
Object result = null;
try {
result = PropertyUtils.getProperty(bean, "beanValue");
} catch (final Throwable t) {
- log.error("PrivatePublicNotOverriden: " + t.getMessage(), t);
- fail("PrivatePublicNotOverriden Threw exception: " + t);
+ log.error("PrivatePublicNotOverridden: " + t.getMessage(), t);
+ fail("PrivatePublicNotOverridden Threw exception: " + t);
}
assertEquals("PublicBeanWithMethod", result);
}
@@ -134,30 +134,30 @@ public class Jira273TestCase extends TestCase {
* Test with an private class that overrides a public method
* of a public class.
*/
- public void testIssue_BEANUTILS_273_PrivatePublicOverriden() {
- final Object bean = Jira273BeanFactory.createPrivatePublicOverriden();
+ public void testIssue_BEANUTILS_273_PrivatePublicOverridden() {
+ final Object bean = Jira273BeanFactory.createPrivatePublicOverridden();
Object result = null;
try {
result = PropertyUtils.getProperty(bean, "beanValue");
} catch (final Throwable t) {
- log.error("PrivatePublicOverriden: " + t.getMessage(), t);
- fail("PrivatePublicOverriden Threw exception: " + t);
+ log.error("PrivatePublicOverridden: " + t.getMessage(), t);
+ fail("PrivatePublicOverridden Threw exception: " + t);
}
- assertEquals("PrivatePublicOverriden", result);
+ assertEquals("PrivatePublicOverridden", result);
}
/**
* Test with an private class that inherits a public method
* of a "grand parent" public class.
*/
- public void testIssue_BEANUTILS_273_PrivatePrivatePublicNotOverriden() {
- final Object bean = Jira273BeanFactory.createPrivatePrivatePublicNotOverriden();
+ public void testIssue_BEANUTILS_273_PrivatePrivatePublicNotOverridden() {
+ final Object bean = Jira273BeanFactory.createPrivatePrivatePublicNotOverridden();
Object result = null;
try {
result = PropertyUtils.getProperty(bean, "beanValue");
} catch (final Throwable t) {
- log.error("PrivatePrivatePublicNotOverriden: " + t.getMessage(), t);
- fail("PrivatePrivatePublicNotOverriden Threw exception: " + t);
+ log.error("PrivatePrivatePublicNotOverridden: " + t.getMessage(), t);
+ fail("PrivatePrivatePublicNotOverridden Threw exception: " + t);
}
assertEquals("PublicBeanWithMethod", result);
}
@@ -166,15 +166,15 @@ public class Jira273TestCase extends TestCase {
* Test with an private class that overrides a public method
* of a "grand parent" public class.
*/
- public void testIssue_BEANUTILS_273_PrivatePrivatePublicOverriden() {
- final Object bean = Jira273BeanFactory.createPrivatePrivatePublicOverriden();
+ public void testIssue_BEANUTILS_273_PrivatePrivatePublicOverridden() {
+ final Object bean = Jira273BeanFactory.createPrivatePrivatePublicOverridden();
Object result = null;
try {
result = PropertyUtils.getProperty(bean, "beanValue");
} catch (final Throwable t) {
- log.error("PrivatePrivatePublicOverriden: " + t.getMessage(), t);
- fail("PrivatePrivatePublicOverriden Threw exception: " + t);
+ log.error("PrivatePrivatePublicOverridden: " + t.getMessage(), t);
+ fail("PrivatePrivatePublicOverridden Threw exception: " + t);
}
- assertEquals("PrivatePrivatePublicOverriden", result);
+ assertEquals("PrivatePrivatePublicOverridden", result);
}
}
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java
index 8431fd9..f4eb48d 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java
@@ -108,7 +108,7 @@ public class Jira347TestCase extends TestCase {
ArrayList<Object> list = new ArrayList<>();
try {
long i = 0;
- while (true && ref.get() != null) {
+ while (ref.get() != null) {
list.add("A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String " + i++);
}
} catch (final Throwable ignored) {
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/other/Jira273BeanFactory.java b/src/test/java/org/apache/commons/beanutils2/bugs/other/Jira273BeanFactory.java
index f40dc85..ed80593 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/other/Jira273BeanFactory.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/other/Jira273BeanFactory.java
@@ -25,65 +25,65 @@ import org.apache.commons.beanutils2.bugs.Jira273TestCase;
public class Jira273BeanFactory {
/**
- * Factory method which creates annonymous
- * {@link PublicBeanWithMethod} with method NOT overriden.
+ * Factory method which creates anonymous
+ * {@link PublicBeanWithMethod} with method NOT overridden.
*
- * @return a new annonymous {@link PublicBeanWithMethod}.
+ * @return a new anonymous {@link PublicBeanWithMethod}.
*/
- public static Object createAnnonymousOverriden() {
+ public static Object createAnonymousOverridden() {
return new PublicBeanWithMethod() {
@Override
public String getBeanValue() {
- return "AnnonymousOverriden";
+ return "AnonymousOverridden";
}
};
}
/**
- * Factory method which creates annonymous
- * {@link PublicBeanWithMethod} with method overriden.
+ * Factory method which creates anonymous
+ * {@link PublicBeanWithMethod} with method overridden.
*
- * @return a new annonymous {@link PublicBeanWithMethod}.
+ * @return a new anonymous {@link PublicBeanWithMethod}.
*/
- public static Object createAnnonymousNotOverriden() {
+ public static Object createAnonymousNotOverridden() {
return new PublicBeanWithMethod() {
};
}
/**
- * Factory method which creates a PrivatePublicOverriden bean.
+ * Factory method which creates a PrivatePublicOverridden bean.
*
- * @return a new a PrivatePublicOverriden bean.
+ * @return a new a PrivatePublicOverridden bean.
*/
- public static Object createPrivatePublicOverriden() {
- return new PrivatePublicOverriden();
+ public static Object createPrivatePublicOverridden() {
+ return new PrivatePublicOverridden();
}
/**
- * Factory method which creates a PrivatePrivatePublicOverriden bean.
+ * Factory method which creates a PrivatePrivatePublicOverridden bean.
*
- * @return a new a PrivatePrivatePublicOverriden bean.
+ * @return a new a PrivatePrivatePublicOverridden bean.
*/
- public static Object createPrivatePrivatePublicOverriden() {
- return new PrivatePrivatePublicOverriden();
+ public static Object createPrivatePrivatePublicOverridden() {
+ return new PrivatePrivatePublicOverridden();
}
/**
- * Factory method which creates a PrivatePrivatePublicNotOverriden bean.
+ * Factory method which creates a PrivatePrivatePublicNotOverridden bean.
*
- * @return a new a PrivatePrivatePublicNotOverriden bean.
+ * @return a new a PrivatePrivatePublicNotOverridden bean.
*/
- public static Object createPrivatePrivatePublicNotOverriden() {
- return new PrivatePrivatePublicNotOverriden();
+ public static Object createPrivatePrivatePublicNotOverridden() {
+ return new PrivatePrivatePublicNotOverridden();
}
/**
- * Factory method which creates a PrivatePublicNotOverriden bean.
+ * Factory method which creates a PrivatePublicNotOverridden bean.
*
- * @return a new a PrivatePublicNotOverriden bean.
+ * @return a new a PrivatePublicNotOverridden bean.
*/
- public static Object createPrivatePublicNotOverriden() {
- return new PrivatePublicNotOverriden();
+ public static Object createPrivatePublicNotOverridden() {
+ return new PrivatePublicNotOverridden();
}
private static class PrivateBeanWithMethod {
@@ -97,20 +97,20 @@ public class Jira273BeanFactory {
return "PublicBeanWithMethod";
}
}
- private static class PrivatePublicOverriden extends PublicBeanWithMethod {
+ private static class PrivatePublicOverridden extends PublicBeanWithMethod {
@Override
public String getBeanValue() {
- return "PrivatePublicOverriden";
+ return "PrivatePublicOverridden";
}
}
- private static class PrivatePublicNotOverriden extends PublicBeanWithMethod {
+ private static class PrivatePublicNotOverridden extends PublicBeanWithMethod {
}
- private static class PrivatePrivatePublicOverriden extends PrivatePublicNotOverriden {
+ private static class PrivatePrivatePublicOverridden extends PrivatePublicNotOverridden {
@Override
public String getBeanValue() {
- return "PrivatePrivatePublicOverriden";
+ return "PrivatePrivatePublicOverridden";
}
}
- private static class PrivatePrivatePublicNotOverriden extends PrivatePublicNotOverriden {
+ private static class PrivatePrivatePublicNotOverridden extends PrivatePublicNotOverridden {
}
}
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/other/Jira298BeanFactory.java b/src/test/java/org/apache/commons/beanutils2/bugs/other/Jira298BeanFactory.java
index 1e3f100..09760ed 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/other/Jira298BeanFactory.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/other/Jira298BeanFactory.java
@@ -34,8 +34,8 @@ public class Jira298BeanFactory {
}
public interface IX {
- public String getName();
- public void setName(String name);
+ String getName();
+ void setName(String name);
}
static class BaseX {
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
index 60e065a..2ebaf5b 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
@@ -61,7 +61,7 @@ public abstract class DateConverterTestBase extends TestCase {
protected abstract Class<?> getExpectedType();
/**
- * Convert a Date or Calendar objects to the time in millisconds
+ * Convert a Date or Calendar objects to the time in milliseconds
* @param date The date or calendar object
* @return The time in milliseconds
*/
@@ -71,7 +71,7 @@ public abstract class DateConverterTestBase extends TestCase {
// N.B. Prior to JDK 1.4 the Timestamp's getTime() method
// didn't include the milliseconds. The following code
- // ensures it works consistently accross JDK versions
+ // ensures it works consistently across JDK versions
final java.sql.Timestamp timestamp = (java.sql.Timestamp)date;
long timeInMillis = timestamp.getTime() / 1000 * 1000;
timeInMillis += timestamp.getNanos() / 1000000;
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/MemoryTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/MemoryTestCase.java
index 60ae0e7..12b7629 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/MemoryTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/MemoryTestCase.java
@@ -124,7 +124,7 @@ public class MemoryTestCase {
// that loaded the Converter class.
assertTrue(
"Converter loader via child does not implement parent type",
- Converter.class.isInstance(newFloatConverter));
+ newFloatConverter instanceof Converter);
// this converter registration will only apply to the
// componentLoader classloader...
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
index 3316768..980a389 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
@@ -97,7 +97,7 @@ public class LocaleConvertUtilsTestCase extends TestCase {
fail("Array conversions not implemented yet.");
Object value = null;
- final int intArray[] = new int[0];
+ final int[] intArray = new int[0];
value = LocaleConvertUtils.convert((String) null, intArray.getClass());
checkIntegerArray(value, intArray);
@@ -233,7 +233,7 @@ public class LocaleConvertUtilsTestCase extends TestCase {
fail("Array conversions not implemented yet.");
Object value = null;
- final String stringArray[] = new String[0];
+ final String[] stringArray = new String[0];
value = LocaleConvertUtils.convert((String) null, stringArray.getClass());
checkStringArray(value, stringArray);
@@ -245,12 +245,12 @@ public class LocaleConvertUtilsTestCase extends TestCase {
public void fixmetestObjectToStringArray() {
fail("Array conversions not implemented yet.");
- final int intArray0[] = new int[0];
- final int intArray1[] = {123};
- final int intArray2[] = {123, 456};
- final String stringArray0[] = new String[0];
- final String stringArray1[] = {"abc"};
- final String stringArray2[] = {"abc", "def"};
+ final int[] intArray0 = new int[0];
+ final int[] intArray1 = {123};
+ final int[] intArray2 = {123, 456};
+ final String[] stringArray0 = new String[0];
+ final String[] stringArray1 = {"abc"};
+ final String[] stringArray2 = {"abc", "def"};
assertEquals("intArray0", null,
LocaleConvertUtils.convert(intArray0));
@@ -305,19 +305,19 @@ public class LocaleConvertUtilsTestCase extends TestCase {
fail("Array conversions not implemented yet.");
- final String values1[] = {"10", "20", "30"};
+ final String[] values1 = {"10", "20", "30"};
Object value = LocaleConvertUtils.convert(values1, Integer.TYPE);
- final int shape[] = new int[0];
+ final int[] shape = new int[0];
assertEquals(shape.getClass(), value.getClass());
- final int results1[] = (int[]) value;
+ final int[] results1 = (int[]) value;
assertEquals(results1[0], 10);
assertEquals(results1[1], 20);
assertEquals(results1[2], 30);
- final String values2[] = {"100", "200", "300"};
+ final String[] values2 = {"100", "200", "300"};
value = LocaleConvertUtils.convert(values2, shape.getClass());
assertEquals(shape.getClass(), value.getClass());
- final int results2[] = (int[]) value;
+ final int[] results2 = (int[]) value;
assertEquals(results2[0], 100);
assertEquals(results2[1], 200);
assertEquals(results2[2], 300);
@@ -331,9 +331,9 @@ public class LocaleConvertUtilsTestCase extends TestCase {
fail("Array conversions not implemented yet.");
Object value = null;
- final int intArray[] = new int[0];
- final int intArray1[] = new int[]{0};
- final int intArray2[] = new int[]{0, 10};
+ final int[] intArray = new int[0];
+ final int[] intArray1 = new int[]{0};
+ final int[] intArray2 = new int[]{0, 10};
value = LocaleConvertUtils.convert("{ }", intArray.getClass());
checkIntegerArray(value, intArray);
@@ -525,10 +525,10 @@ public class LocaleConvertUtilsTestCase extends TestCase {
fail("Array conversions not implemented yet.");
Object value = null;
- final String stringArray[] = new String[0];
- final String stringArray1[] = new String[]
+ final String[] stringArray = new String[0];
+ final String[] stringArray1 = new String[]
{"abc"};
- final String stringArray2[] = new String[]
+ final String[] stringArray2 = new String[]
{"abc", "de,f"};
value = LocaleConvertUtils.convert("", stringArray.getClass());
@@ -580,7 +580,7 @@ public class LocaleConvertUtilsTestCase extends TestCase {
public void testConvertStringLocaleNull() {
Object result = null;
try {
- result = LocaleConvertUtils.convert("123", Integer.class, (Locale)null, "#,###");
+ result = LocaleConvertUtils.convert("123", Integer.class, null, "#,###");
} catch (final Exception e) {
e.printStackTrace();
fail("Threw: " + e);
@@ -596,7 +596,7 @@ public class LocaleConvertUtilsTestCase extends TestCase {
public void testConvertStringArrayLocaleNull() {
Object result = null;
try {
- result = LocaleConvertUtils.convert(new String[] {"123"}, Integer[].class, (Locale)null, "#,###");
+ result = LocaleConvertUtils.convert(new String[] {"123"}, Integer[].class, null, "#,###");
} catch (final Exception e) {
e.printStackTrace();
fail("Threw: " + e);
@@ -621,12 +621,12 @@ public class LocaleConvertUtilsTestCase extends TestCase {
- private void checkIntegerArray(final Object value, final int intArray[]) {
+ private void checkIntegerArray(final Object value, final int[] intArray) {
assertNotNull("Returned value is not null", value);
assertEquals("Returned value is int[]",
intArray.getClass(), value.getClass());
- final int results[] = (int[]) value;
+ final int[] results = (int[]) value;
assertEquals("Returned array length", intArray.length, results.length);
for (int i = 0; i < intArray.length; i++) {
assertEquals("Returned array value " + i,
@@ -635,12 +635,12 @@ public class LocaleConvertUtilsTestCase extends TestCase {
}
- private void checkStringArray(final Object value, final String stringArray[]) {
+ private void checkStringArray(final Object value, final String[] stringArray) {
assertNotNull("Returned value is not null", value);
assertEquals("Returned value is String[]",
stringArray.getClass(), value.getClass());
- final String results[] = (String[]) value;
+ final String[] results = (String[]) value;
assertEquals("Returned array length",
stringArray.length, results.length);
for (int i = 0; i < stringArray.length; i++) {
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverterTestCase.java
index e0b5189..4dd860f 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverterTestCase.java
@@ -96,7 +96,7 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// different JDK versions seem to have different numbers of pattern characters
final int lth = localChars.length() > expectedChars.length() ? expectedChars.length() :
- localChars.length() < expectedChars.length() ? localChars.length() : expectedChars.length();
+ Math.min(localChars.length(), expectedChars.length());
validLocalDateSymbols = expectedChars.substring(0, lth).equals(localChars.substring(0, lth));
}
diff --git a/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTestCase.java b/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTestCase.java
index 1a63bfa..d84af7f 100644
--- a/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTestCase.java
@@ -482,7 +482,7 @@ public class MemoryLeakTestCase {
java.util.ArrayList<String> list = new java.util.ArrayList<>();
try {
long i = 0;
- while (true && ref.get() != null) {
+ while (ref.get() != null) {
list.add("A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String " + i++);
}
System.out.println("Count(1) " + count + " : " + getMemoryStats());
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PrivateIndirect.java b/src/test/java/org/apache/commons/beanutils2/priv/PrivateIndirect.java
index 0778990..05d4866 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PrivateIndirect.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PrivateIndirect.java
@@ -29,11 +29,11 @@ public interface PrivateIndirect {
/**
* A property accessible via an indirectly implemented interface.
*/
- public String getBaz();
+ String getBaz();
/**
* A method accessible via an indirectly implemented interface.
*/
- public String methodBaz(String in);
+ String methodBaz(String in);
}