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 2019/10/25 18:15:13 UTC
[commons-beanutils] branch master updated: Remove too many
consecutive empty lines.
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 fd6737e Remove too many consecutive empty lines.
fd6737e is described below
commit fd6737ea3482062261d4c506289873396e1559b7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Oct 25 14:15:07 2019 -0400
Remove too many consecutive empty lines.
---
.../apache/commons/beanutils2/BasicDynaBean.java | 27 ----
.../apache/commons/beanutils2/BasicDynaClass.java | 25 ----
.../apache/commons/beanutils2/BeanPredicate.java | 4 -
.../apache/commons/beanutils2/BeanUtilsBean.java | 17 ---
.../commons/beanutils2/ConstructorUtils.java | 1 -
.../commons/beanutils2/ConversionException.java | 7 -
.../commons/beanutils2/ConvertUtilsBean.java | 8 --
.../commons/beanutils2/ConvertingWrapDynaBean.java | 1 -
.../org/apache/commons/beanutils2/DynaBean.java | 12 --
.../org/apache/commons/beanutils2/DynaClass.java | 5 -
.../apache/commons/beanutils2/DynaProperty.java | 10 --
.../apache/commons/beanutils2/LazyDynaBean.java | 3 -
.../apache/commons/beanutils2/LazyDynaClass.java | 1 -
.../apache/commons/beanutils2/LazyDynaList.java | 4 -
.../org/apache/commons/beanutils2/LazyDynaMap.java | 4 -
.../org/apache/commons/beanutils2/MethodUtils.java | 17 ---
.../commons/beanutils2/MutableDynaClass.java | 11 --
.../commons/beanutils2/PropertyUtilsBean.java | 34 -----
.../commons/beanutils2/ResultSetDynaClass.java | 12 --
.../commons/beanutils2/ResultSetIterator.java | 27 ----
.../apache/commons/beanutils2/RowSetDynaClass.java | 9 --
.../apache/commons/beanutils2/WeakFastHashMap.java | 5 -
.../apache/commons/beanutils2/WrapDynaBean.java | 17 ---
.../beanutils2/converters/CharacterConverter.java | 1 -
.../beanutils2/converters/DateTimeConverter.java | 2 -
.../beanutils2/converters/EnumConverter.java | 1 -
.../beanutils2/converters/StringConverter.java | 2 -
.../beanutils2/locale/BaseLocaleConverter.java | 2 -
.../commons/beanutils2/locale/LocaleBeanUtils.java | 9 --
.../beanutils2/locale/LocaleBeanUtilsBean.java | 7 -
.../beanutils2/locale/LocaleConvertUtils.java | 2 -
.../beanutils2/locale/LocaleConvertUtilsBean.java | 2 -
.../commons/beanutils2/locale/LocaleConverter.java | 2 -
.../converters/BigIntegerLocaleConverter.java | 1 -
.../locale/converters/ByteLocaleConverter.java | 2 -
.../locale/converters/DateLocaleConverter.java | 3 -
.../locale/converters/DecimalLocaleConverter.java | 2 -
.../locale/converters/DoubleLocaleConverter.java | 5 -
.../locale/converters/FloatLocaleConverter.java | 2 -
.../locale/converters/IntegerLocaleConverter.java | 2 -
.../locale/converters/LongLocaleConverter.java | 2 -
.../locale/converters/ShortLocaleConverter.java | 1 -
.../locale/converters/SqlDateLocaleConverter.java | 2 -
.../locale/converters/SqlTimeLocaleConverter.java | 1 -
.../converters/SqlTimestampLocaleConverter.java | 1 -
.../locale/converters/StringLocaleConverter.java | 2 -
src/test/java/org/apache/commons/beanutils2/A.java | 1 -
.../apache/commons/beanutils2/AbstractParent.java | 1 -
.../commons/beanutils2/BasicDynaBeanTestCase.java | 60 ---------
.../commons/beanutils2/BeanUtils2TestCase.java | 3 -
.../commons/beanutils2/BeanUtilsBenchCase.java | 21 ---
.../commons/beanutils2/BeanUtilsTestCase.java | 42 ------
.../org/apache/commons/beanutils2/BenchBean.java | 12 --
.../java/org/apache/commons/beanutils2/Child.java | 1 -
.../beanutils2/ConstructorUtilsTestCase.java | 7 -
.../commons/beanutils2/ConvertUtilsTestCase.java | 23 ----
.../commons/beanutils2/DynaBeanUtilsTestCase.java | 46 -------
.../beanutils2/DynaPropertyUtilsTestCase.java | 73 -----------
.../commons/beanutils2/DynaResultSetTestCase.java | 25 ----
.../commons/beanutils2/DynaRowSetTestCase.java | 23 ----
.../apache/commons/beanutils2/ExtendMapBean.java | 1 -
.../beanutils2/IndexedPropertyTestCase.java | 7 -
.../apache/commons/beanutils2/IndexedTestBean.java | 1 -
.../commons/beanutils2/LazyDynaClassTestCase.java | 1 -
.../commons/beanutils2/LazyDynaListTestCase.java | 8 --
.../beanutils2/MappedPropertyChildBean.java | 2 -
.../beanutils2/MappedPropertyChildInterface.java | 3 -
.../commons/beanutils2/MappedPropertyTestBean.java | 2 -
.../commons/beanutils2/MappedPropertyTestCase.java | 3 -
.../beanutils2/MappedPropertyTestInterface.java | 2 -
.../commons/beanutils2/MethodUtilsTestCase.java | 8 --
.../apache/commons/beanutils2/NestedTestBean.java | 8 --
.../commons/beanutils2/PassTestException.java | 1 -
.../commons/beanutils2/PropertyUtilsBenchCase.java | 18 ---
.../commons/beanutils2/PropertyUtilsTestCase.java | 113 ----------------
.../org/apache/commons/beanutils2/TestBean.java | 31 -----
.../beanutils2/TestBeanPackageSubclass.java | 3 -
.../commons/beanutils2/TestBeanPublicSubclass.java | 3 -
.../apache/commons/beanutils2/TestResultSet.java | 146 ---------------------
.../commons/beanutils2/TestResultSetMetaData.java | 28 ----
.../beanutils2/ThrowExceptionConverter.java | 1 -
.../commons/beanutils2/WrapDynaBeanTestCase.java | 16 ---
.../commons/beanutils2/bugs/Jira422TestCase.java | 1 -
.../commons/beanutils2/bugs/Jira422bTestCase.java | 2 -
.../commons/beanutils2/bugs/Jira492TestCase.java | 1 -
.../converters/ArrayConverterTestCase.java | 2 -
.../converters/BigDecimalConverterTestCase.java | 1 -
.../converters/BigIntegerConverterTestCase.java | 1 -
.../converters/BooleanConverterTestCase.java | 2 -
.../converters/ByteConverterTestCase.java | 1 -
.../converters/CharacterConverterTestCase.java | 1 -
.../converters/ClassConverterTestCase.java | 1 -
.../converters/ClassReloaderTestCase.java | 1 -
.../converters/DoubleConverterTestCase.java | 1 -
.../converters/DurationConverterTestCase.java | 2 -
.../converters/EnumConverterTestCase.java | 3 -
.../converters/FileConverterTestCase.java | 1 -
.../converters/FloatConverterTestCase.java | 2 -
.../converters/IntegerConverterTestCase.java | 1 -
.../converters/LocalTimeConverterTestCase.java | 2 -
.../converters/LongConverterTestCase.java | 1 -
.../converters/MonthDayConverterTestCase.java | 2 -
.../converters/NumberConverterTestBase.java | 1 -
.../converters/OffsetTimeConverterTestCase.java | 2 -
.../converters/PathConverterTestCase.java | 3 -
.../converters/PeriodConverterTestCase.java | 2 -
.../converters/ShortConverterTestCase.java | 1 -
.../converters/SqlTimestampConverterTestCase.java | 2 -
.../converters/URIConverterTestCase.java | 1 -
.../converters/URLConverterTestCase.java | 1 -
.../converters/UUIDConverterTestCase.java | 2 -
.../converters/YearConverterTestCase.java | 2 -
.../converters/YearMonthConverterTestCase.java | 2 -
.../converters/ZoneIdConverterTestCase.java | 2 -
.../converters/ZoneOffsetConverterTestCase.java | 2 -
.../beanutils2/locale/LocaleBeanUtilsTestCase.java | 5 -
.../locale/LocaleConvertUtilsTestCase.java | 22 ----
.../converters/BaseLocaleConverterTestCase.java | 6 -
.../BigDecimalLocaleConverterTestCase.java | 15 ---
.../BigIntegerLocaleConverterTestCase.java | 13 --
.../converters/ByteLocaleConverterTestCase.java | 14 --
.../converters/DateLocaleConverterTestCase.java | 10 --
.../converters/DoubleLocaleConverterTestCase.java | 15 ---
.../converters/FloatLocaleConverterTestCase.java | 15 ---
.../converters/IntegerLocaleConverterTestCase.java | 14 --
.../converters/LongLocaleConverterTestCase.java | 15 ---
.../converters/ShortLocaleConverterTestCase.java | 15 ---
.../memoryleaktests/pojotests/SomeMappedPojo.java | 1 -
.../memoryleaktests/pojotests/SomePojo.java | 1 -
.../commons/beanutils2/priv/PackageBean.java | 6 -
.../commons/beanutils2/priv/PrivateBean.java | 11 --
.../beanutils2/priv/PrivateBeanFactory.java | 5 -
.../beanutils2/priv/PrivateBeanSubclass.java | 7 -
.../commons/beanutils2/priv/PrivateDirect.java | 5 -
.../commons/beanutils2/priv/PrivateIndirect.java | 6 -
.../commons/beanutils2/priv/PublicSubBean.java | 6 -
136 files changed, 1320 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/BasicDynaBean.java b/src/main/java/org/apache/commons/beanutils2/BasicDynaBean.java
index 6938955..9dfa1b8 100644
--- a/src/main/java/org/apache/commons/beanutils2/BasicDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/BasicDynaBean.java
@@ -15,17 +15,14 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.io.Serializable;
import java.lang.reflect.Array;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
/**
* <p>Minimal implementation of the {@code DynaBean} interface. Can be
* used as a convenience base class for more sophisticated implementations.</p>
@@ -43,8 +40,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
private static final long serialVersionUID = 1L;
-
-
/**
* Construct a new {@code DynaBean} associated with the specified
* {@code DynaClass} instance.
@@ -58,17 +53,12 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
-
-
-
/**
* The {@code DynaClass} "base class" that this DynaBean
* is associated with.
*/
protected DynaClass dynaClass = null;
-
/**
* The set of property values for this DynaBean, keyed by property name.
*/
@@ -98,9 +88,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
-
-
/**
* Does the specified mapped property contain a value for the specified
* key value?
@@ -129,7 +116,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
/**
* Return the value of a simple property with the specified name.
*
@@ -177,7 +163,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
/**
* Return the value of an indexed property with the specified name.
*
@@ -212,7 +197,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
/**
* Return the value of a mapped property with the specified name,
* or {@code null} if there is no value for the specified key.
@@ -242,7 +226,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
/**
* Return the {@code DynaClass} instance that describes the set of
* properties available for this DynaBean.
@@ -256,7 +239,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
/**
* Remove any existing value for the specified key on the
* specified mapped property.
@@ -284,7 +266,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
/**
* Set the value of a simple property with the specified name.
*
@@ -318,7 +299,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
/**
* Set the value of an indexed property with the specified name.
*
@@ -362,7 +342,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
/**
* Set the value of a mapped property with the specified name.
*
@@ -398,10 +377,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
-
-
-
/**
* Return the property descriptor for the specified property name.
*
@@ -422,7 +397,6 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
/**
* Is an object of the source class assignable to the destination class?
*
@@ -448,5 +422,4 @@ public class BasicDynaBean implements DynaBean, Serializable {
}
-
}
diff --git a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
index 66ec0bb..390bfea 100644
--- a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
@@ -15,16 +15,13 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.io.Serializable;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
-
/**
* <p>Minimal implementation of the {@code DynaClass} interface. Can be
* used as a convenience base class for more sophisticated implementations.</p>
@@ -41,7 +38,6 @@ public class BasicDynaClass implements DynaClass, Serializable {
-
/**
* Construct a new BasicDynaClass with default parameters.
*/
@@ -51,7 +47,6 @@ public class BasicDynaClass implements DynaClass, Serializable {
}
-
/**
* Construct a new BasicDynaClass with the specified parameters.
*
@@ -64,7 +59,6 @@ public class BasicDynaClass implements DynaClass, Serializable {
}
-
/**
* Construct a new BasicDynaClass with the specified parameters.
*
@@ -89,50 +83,42 @@ public class BasicDynaClass implements DynaClass, Serializable {
}
-
-
/**
* The constructor of the {@code dynaBeanClass} that we will use
* for creating new instances.
*/
protected transient Constructor<?> constructor = null;
-
/**
* The method signature of the constructor we will use to create
* new DynaBean instances.
*/
protected static Class<?>[] constructorTypes = { DynaClass.class };
-
/**
* The argument values to be passed to the constructor we will use
* to create new DynaBean instances.
*/
protected Object[] constructorValues = { this };
-
/**
* The {@code DynaBean} implementation class we will use for
* creating new instances.
*/
protected Class<?> dynaBeanClass = BasicDynaBean.class;
-
/**
* The "name" of this DynaBean class.
*/
protected String name = this.getClass().getName();
-
/**
* The set of dynamic properties that are part of this DynaClass.
*/
protected DynaProperty[] properties = new DynaProperty[0];
-
/**
* The set of dynamic properties that are part of this DynaClass,
* keyed by the property name. Individual descriptor instances will
@@ -140,10 +126,8 @@ public class BasicDynaClass implements DynaClass, Serializable {
*/
protected HashMap<String, DynaProperty> propertiesMap = new HashMap<>();
-
-
/**
* Return the name of this DynaClass (analogous to the
* {@code getName()} method of {@code java.lang.Class}, which
@@ -159,7 +143,6 @@ public class BasicDynaClass implements DynaClass, Serializable {
}
-
/**
* Return a property descriptor for the specified property, if it exists;
* otherwise, return {@code null}.
@@ -181,7 +164,6 @@ public class BasicDynaClass implements DynaClass, Serializable {
}
-
/**
* <p>Return an array of {@code ProperyDescriptors} for the properties
* currently defined in this DynaClass. If no properties are defined, a
@@ -200,7 +182,6 @@ public class BasicDynaClass implements DynaClass, Serializable {
}
-
/**
* Instantiate and return a new DynaBean instance, associated
* with this DynaClass.
@@ -230,10 +211,8 @@ public class BasicDynaClass implements DynaClass, Serializable {
}
-
-
/**
* Return the Class object we will use to create new instances in the
* {@code newInstance()} method. This Class <strong>MUST</strong>
@@ -247,10 +226,8 @@ public class BasicDynaClass implements DynaClass, Serializable {
}
-
-
/**
* Set the Class object we will use to create new instances in the
* {@code newInstance()} method. This Class <strong>MUST</strong>
@@ -287,7 +264,6 @@ public class BasicDynaClass implements DynaClass, Serializable {
}
-
/**
* Set the list of dynamic properties supported by this DynaClass.
*
@@ -303,5 +279,4 @@ public class BasicDynaClass implements DynaClass, Serializable {
}
-
}
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java b/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
index ed3f1a9..a116b3f 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanPredicate.java
@@ -124,8 +124,4 @@ public class BeanPredicate<T> implements Predicate<T> {
this.predicate = predicate;
}
-
-
-
-
}
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java
index fc80ae9..19f8c81 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.beans.IndexedPropertyDescriptor;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
@@ -34,7 +32,6 @@ import org.apache.commons.beanutils2.expression.Resolver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p>JavaBean property population methods.</p>
*
@@ -49,7 +46,6 @@ import org.apache.commons.logging.LogFactory;
public class BeanUtilsBean {
-
/**
@@ -183,7 +179,6 @@ public class BeanUtilsBean {
}
-
/**
* <p>Copy property values from the origin bean to the destination bean
* for all cases where the property names are the same. For each
@@ -290,7 +285,6 @@ public class BeanUtilsBean {
}
-
/**
* <p>Copy the specified property value to the specified destination bean,
* performing any type conversion that is required. If the specified
@@ -442,7 +436,6 @@ public class BeanUtilsBean {
}
-
/**
* <p>Return the entire set of properties for which the specified bean
* provides a read method. This map contains the to {@code String}
@@ -517,7 +510,6 @@ public class BeanUtilsBean {
}
-
/**
* Return the value of the specified array property of the specified
* bean, as a String array.
@@ -572,7 +564,6 @@ public class BeanUtilsBean {
}
-
/**
* Return the value of the specified indexed property of the specified
* bean, as a String. The zero-relative index of the
@@ -601,7 +592,6 @@ public class BeanUtilsBean {
}
-
/**
* Return the value of the specified indexed property of the specified
* bean, as a String. The index is specified as a method parameter and
@@ -629,7 +619,6 @@ public class BeanUtilsBean {
}
-
/**
* Return the value of the specified indexed property of the specified
* bean, as a String. The String-valued key of the required value
@@ -658,7 +647,6 @@ public class BeanUtilsBean {
}
-
/**
* Return the value of the specified mapped property of the specified
* bean, as a String. The key is specified as a method parameter and
@@ -686,7 +674,6 @@ public class BeanUtilsBean {
}
-
/**
* Return the value of the (possibly nested) property of the specified
* name, for the specified bean, as a String.
@@ -713,7 +700,6 @@ public class BeanUtilsBean {
}
-
/**
* Return the value of the specified property of the specified bean,
* no matter which property reference format is used, as a String.
@@ -738,7 +724,6 @@ public class BeanUtilsBean {
}
-
/**
* Return the value of the specified simple property of the specified
* bean, converted to a String.
@@ -763,7 +748,6 @@ public class BeanUtilsBean {
}
-
/**
* <p>Populate the JavaBeans properties of the specified bean, based on
* the specified name/value pairs. This method uses Java reflection APIs
@@ -826,7 +810,6 @@ public class BeanUtilsBean {
}
-
/**
* <p>Set the specified property value, performing type conversions as
* required to conform to the type of the destination property.</p>
diff --git a/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java b/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java
index 0c58261..7e2b1cd 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java
@@ -158,7 +158,6 @@ public class ConstructorUtils {
return ctor.newInstance(args);
}
-
/**
* <p>Convenience method returning new instance of {@code klazz} using a single argument constructor.
* The formal parameter type is inferred from the actual values of {@code arg}.
diff --git a/src/main/java/org/apache/commons/beanutils2/ConversionException.java b/src/main/java/org/apache/commons/beanutils2/ConversionException.java
index 4cf19f2..5646150 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConversionException.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConversionException.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
/**
* <p>A <strong>ConversionException</strong> indicates that a call to
* {@code Converter.convert()} has failed to complete successfully.
@@ -43,7 +41,6 @@ public class ConversionException extends RuntimeException {
}
-
/**
* Construct a new exception with the specified message and root cause.
*
@@ -57,7 +54,6 @@ public class ConversionException extends RuntimeException {
}
-
/**
* Construct a new exception with the specified root cause.
*
@@ -70,10 +66,8 @@ public class ConversionException extends RuntimeException {
}
-
-
/**
* The root cause of this {@code ConversionException}, compatible with
* JDK 1.4's extensions to {@code java.lang.Throwable}.
@@ -89,5 +83,4 @@ public class ConversionException extends RuntimeException {
return this.cause;
}
-
}
diff --git a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
index 8372864..2234bf9 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.io.File;
import java.lang.reflect.Array;
import java.math.BigDecimal;
@@ -85,7 +83,6 @@ import org.apache.commons.beanutils2.converters.ZonedDateTimeConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p>Utility methods for converting String scalar values to objects of the
* specified Class, String arrays to arrays of the specified Class. The
@@ -189,7 +186,6 @@ public class ConvertUtilsBean {
-
/**
* The set of {@link Converter}s that can be used to convert Strings
* into objects of a specified Class, keyed by the destination Class.
@@ -245,7 +241,6 @@ public class ConvertUtilsBean {
}
-
/**
* Convert the specified value to an object of the specified class (if
* possible). Otherwise, return a String representation of the value.
@@ -273,7 +268,6 @@ public class ConvertUtilsBean {
}
-
/**
* Convert an array of specified values to an array of objects of the
* specified class (if possible). If the specified Java class is itself
@@ -312,7 +306,6 @@ public class ConvertUtilsBean {
}
-
/**
* Convert the value to an object of the specified class (if
* possible). If no converter for the desired target type is registered,
@@ -655,7 +648,6 @@ public class ConvertUtilsBean {
}
-
/**
* Look up and return any registered {@link Converter} for the specified
* destination class; if there is no registered Converter, return
diff --git a/src/main/java/org/apache/commons/beanutils2/ConvertingWrapDynaBean.java b/src/main/java/org/apache/commons/beanutils2/ConvertingWrapDynaBean.java
index a2c3026..588bf5d 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConvertingWrapDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConvertingWrapDynaBean.java
@@ -47,7 +47,6 @@ public class ConvertingWrapDynaBean extends WrapDynaBean {
}
-
/**
* Set the value of the property with the specified name
* performing any type conversions if necessary. So this method
diff --git a/src/main/java/org/apache/commons/beanutils2/DynaBean.java b/src/main/java/org/apache/commons/beanutils2/DynaBean.java
index aff2a77..bf0dc96 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaBean.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
/**
* <p>A <strong>DynaBean</strong> is a Java object that supports properties
* whose names and data types, as well as values, may be dynamically modified.
@@ -30,7 +28,6 @@ package org.apache.commons.beanutils2;
public interface DynaBean {
-
/**
* Does the specified mapped property contain a value for the specified
* key value?
@@ -45,7 +42,6 @@ public interface DynaBean {
*/
public boolean contains(String name, String key);
-
/**
* Return the value of a simple property with the specified name.
*
@@ -57,7 +53,6 @@ public interface DynaBean {
*/
public Object get(String name);
-
/**
* Return the value of an indexed property with the specified name.
*
@@ -76,7 +71,6 @@ public interface DynaBean {
*/
public Object get(String name, int index);
-
/**
* Return the value of a mapped property with the specified name,
* or {@code null} if there is no value for the specified key.
@@ -92,7 +86,6 @@ public interface DynaBean {
*/
public Object get(String name, String key);
-
/**
* Return the {@code DynaClass} instance that describes the set of
* properties available for this DynaBean.
@@ -101,7 +94,6 @@ public interface DynaBean {
*/
public DynaClass getDynaClass();
-
/**
* Remove any existing value for the specified key on the
* specified mapped property.
@@ -115,7 +107,6 @@ public interface DynaBean {
*/
public void remove(String name, String key);
-
/**
* Set the value of a simple property with the specified name.
*
@@ -131,7 +122,6 @@ public interface DynaBean {
*/
public void set(String name, Object value);
-
/**
* Set the value of an indexed property with the specified name.
*
@@ -150,7 +140,6 @@ public interface DynaBean {
*/
public void set(String name, int index, Object value);
-
/**
* Set the value of a mapped property with the specified name.
*
@@ -167,5 +156,4 @@ public interface DynaBean {
*/
public 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 d3a9d7d..4fd2e78 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaClass.java
@@ -27,7 +27,6 @@ package org.apache.commons.beanutils2;
public interface DynaClass {
-
/**
* Returns the name of this DynaClass (analogous to the
* {@code getName()} method of {@code java.lang.Class}, which
@@ -38,7 +37,6 @@ public interface DynaClass {
*/
public String getName();
-
/**
* Returns a property descriptor for the specified property, if it exists;
* otherwise, return {@code null}.
@@ -51,7 +49,6 @@ public interface DynaClass {
*/
public DynaProperty getDynaProperty(String name);
-
/**
* <p>Returns an array of {@code ProperyDescriptors} for the properties
* currently defined in this DynaClass. If no properties are defined, a
@@ -65,7 +62,6 @@ public interface DynaClass {
*/
public DynaProperty[] getDynaProperties();
-
/**
* Instantiates and return a new DynaBean instance, associated
* with this DynaClass.
@@ -81,5 +77,4 @@ public interface DynaClass {
public 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 859ff5e..015844f 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -27,7 +25,6 @@ import java.io.StreamCorruptedException;
import java.util.List;
import java.util.Map;
-
/**
* <p>The metadata describing an individual property of a DynaBean.</p>
*
@@ -62,10 +59,8 @@ public class DynaProperty implements Serializable {
private static final int LONG_TYPE = 7;
private static final int SHORT_TYPE = 8;
-
-
/**
* Construct a property that accepts any data type.
*
@@ -77,7 +72,6 @@ public class DynaProperty implements Serializable {
}
-
/**
* Construct a property of the specified data type.
*
@@ -142,7 +136,6 @@ public class DynaProperty implements Serializable {
return this.type;
}
-
/** The <em>(optional)</em> type of content elements for indexed {@code DynaProperty} */
protected transient Class<?> contentType;
/**
@@ -162,7 +155,6 @@ public class DynaProperty implements Serializable {
-
/**
* Does this property represent an indexed value (ie an array or List)?
*
@@ -183,7 +175,6 @@ public class DynaProperty implements Serializable {
}
-
/**
* Does this property represent a mapped value (ie a Map)?
*
@@ -342,7 +333,6 @@ public class DynaProperty implements Serializable {
in.defaultReadObject();
}
-
/**
* Reads a class using safe encoding to workaround java 1.3 serialization bug.
*/
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
index 1ac1d31..0a9ed5c 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
@@ -163,7 +163,6 @@ public class LazyDynaBean implements DynaBean, Serializable {
*/
protected MutableDynaClass dynaClass;
-
/**
@@ -201,7 +200,6 @@ public class LazyDynaBean implements DynaBean, Serializable {
}
-
/**
@@ -418,7 +416,6 @@ public class LazyDynaBean implements DynaBean, Serializable {
}
-
/**
* Return the {@code DynaClass} instance that describes the set of
* properties available for this DynaBean.
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
index 935b08c..97f171d 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
@@ -280,7 +280,6 @@ public class LazyDynaClass extends BasicDynaClass implements MutableDynaClass {
return;
}
-
// Create a new property array of without the specified property
final DynaProperty[] oldProperties = getDynaProperties();
final DynaProperty[] newProperties = new DynaProperty[oldProperties.length-1];
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
index 6171427..f0e2ee2 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
@@ -186,7 +186,6 @@ public class LazyDynaList extends ArrayList<Object> {
*/
private Class<?> elementDynaBeanType;
-
/**
@@ -253,7 +252,6 @@ public class LazyDynaList extends ArrayList<Object> {
}
}
-
/**
@@ -480,7 +478,6 @@ public class LazyDynaList extends ArrayList<Object> {
}
-
/**
@@ -594,7 +591,6 @@ public class LazyDynaList extends ArrayList<Object> {
}
-
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
index 9ae7f01..4478451 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
@@ -67,7 +67,6 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
*/
protected boolean returnNull = false;
-
/**
@@ -295,7 +294,6 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
return lazyMap;
}
-
/**
@@ -436,7 +434,6 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
}
-
/**
@@ -465,7 +462,6 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
this.returnNull = returnNull;
}
-
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
index 4725641..cc2a998 100644
--- a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2;
-
import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
import java.lang.reflect.InvocationTargetException;
@@ -30,7 +29,6 @@ import java.util.WeakHashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p> Utility reflection methods focused on methods in general rather than properties in particular. </p>
*
@@ -172,7 +170,6 @@ public class MethodUtils {
return invokeMethod(object, methodName, args);
}
-
/**
* <p>Invoke a named method whose parameter type matches the object type.</p>
*
@@ -221,7 +218,6 @@ public class MethodUtils {
return invokeMethod(object, methodName, args, parameterTypes);
}
-
/**
* <p>Invoke a named method whose parameter type matches the object type.</p>
*
@@ -277,7 +273,6 @@ public class MethodUtils {
return method.invoke(object, args);
}
-
/**
* <p>Invoke a method whose parameter type matches exactly the object
* type.</p>
@@ -311,7 +306,6 @@ public class MethodUtils {
return invokeExactMethod(object, methodName, args);
}
-
/**
* <p>Invoke a method whose parameter types match exactly the object
* types.</p>
@@ -351,7 +345,6 @@ public class MethodUtils {
return invokeExactMethod(object, methodName, args, parameterTypes);
}
-
/**
* <p>Invoke a method whose parameter types match exactly the parameter
* types given.</p>
@@ -493,7 +486,6 @@ public class MethodUtils {
return invokeStaticMethod (objectClass, methodName, args);
}
-
/**
* <p>Invoke a named static method whose parameter type matches the object type.</p>
*
@@ -543,7 +535,6 @@ public class MethodUtils {
return invokeStaticMethod (objectClass, methodName, args, parameterTypes);
}
-
/**
* <p>Invoke a named static method whose parameter type matches the object type.</p>
*
@@ -600,7 +591,6 @@ public class MethodUtils {
return method.invoke(null, args);
}
-
/**
* <p>Invoke a static method whose parameter type matches exactly the object
* type.</p>
@@ -675,7 +665,6 @@ public class MethodUtils {
return invokeExactStaticMethod(objectClass, methodName, args, parameterTypes);
}
-
private static Object[] toArray(final Object arg) {
Object[] args = null;
if (arg != null) {
@@ -705,7 +694,6 @@ public class MethodUtils {
return getAccessibleMethod(clazz, methodName, parameterTypes);
}
-
/**
* <p>Return an accessible method (that is, one that can be invoked via
* reflection) with given name and parameters. If no such method
@@ -758,8 +746,6 @@ public class MethodUtils {
return getAccessibleMethod(method.getDeclaringClass(), method);
}
-
-
/**
* <p>Return an accessible method (that is, one that can be invoked via
* reflection) that implements the specified Method. If no such method
@@ -820,7 +806,6 @@ public class MethodUtils {
return method;
}
-
/**
@@ -1148,7 +1133,6 @@ public class MethodUtils {
return cost;
}
-
/**
* <p>Determine whether a type can be used as a parameter in a method invocation.
* This method handles primitive conversions correctly.</p>
@@ -1267,7 +1251,6 @@ public class MethodUtils {
return clazz;
}
-
/**
* Return the method from the cache, if present.
*
diff --git a/src/main/java/org/apache/commons/beanutils2/MutableDynaClass.java b/src/main/java/org/apache/commons/beanutils2/MutableDynaClass.java
index 1b6635c..c46341c 100644
--- a/src/main/java/org/apache/commons/beanutils2/MutableDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/MutableDynaClass.java
@@ -17,10 +17,6 @@
package org.apache.commons.beanutils2;
-
-
-
-
/**
* <p>A specialized extension to {@code DynaClass} that allows properties
* to be added or removed dynamically.</p>
@@ -33,7 +29,6 @@ package org.apache.commons.beanutils2;
public interface MutableDynaClass extends DynaClass {
-
/**
* Add a new dynamic property with no restrictions on data type,
* readability, or writeability.
@@ -46,7 +41,6 @@ public interface MutableDynaClass extends DynaClass {
*/
public void add(String name);
-
/**
* Add a new dynamic property with the specified data type, but with
* no restrictions on readability or writeability.
@@ -61,7 +55,6 @@ public interface MutableDynaClass extends DynaClass {
*/
public void add(String name, Class<?> type);
-
/**
* Add a new dynamic property with the specified data type, readability,
* and writeability.
@@ -81,7 +74,6 @@ public interface MutableDynaClass extends DynaClass {
public void add(String name, Class<?> type, boolean readable,
boolean writeable);
-
/**
* Is this DynaClass currently restricted, if so, no changes to the
* existing registration of property names, data types, readability, or
@@ -92,7 +84,6 @@ public interface MutableDynaClass extends DynaClass {
*/
public boolean isRestricted();
-
/**
* Remove the specified dynamic property, and any associated data type,
* readability, and writeability, from this dynamic class.
@@ -108,7 +99,6 @@ public interface MutableDynaClass extends DynaClass {
*/
public void remove(String name);
-
/**
* Set the restricted state of this DynaClass to the specified value.
*
@@ -116,5 +106,4 @@ public interface MutableDynaClass extends DynaClass {
*/
public 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 a5004b3..ddab70e 100644
--- a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2;
-
import java.beans.IndexedPropertyDescriptor;
import java.beans.IntrospectionException;
import java.beans.Introspector;
@@ -36,7 +35,6 @@ import org.apache.commons.beanutils2.expression.Resolver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* Utility methods for using Java Reflection APIs to facilitate generic
* property getter and setter operations on Java objects. Much of this
@@ -134,10 +132,8 @@ public class PropertyUtilsBean {
resetBeanIntrospectors();
}
-
-
/**
* Return the configured {@link Resolver} implementation used by BeanUtils.
* <p>
@@ -230,7 +226,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Copy property values from the "origin" bean to the "destination" bean
* for all cases where the property names are the same (even though the
@@ -335,7 +330,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Return the entire set of properties for which the specified bean
* provides a read method. This map contains the unconverted property
@@ -384,7 +378,6 @@ public class PropertyUtilsBean {
}
-
/**
* Return the value of the specified indexed property of the specified
* bean, with no type conversions. The zero-relative index of the
@@ -443,7 +436,6 @@ public class PropertyUtilsBean {
}
-
/**
* Return the value of the specified indexed property of the specified
* bean, with no type conversions. In addition to supporting the JavaBeans
@@ -554,7 +546,6 @@ public class PropertyUtilsBean {
}
-
/**
* Return the value of the specified mapped property of the
* specified bean, with no type conversions. The key of the
@@ -608,7 +599,6 @@ public class PropertyUtilsBean {
}
-
/**
* Return the value of the specified mapped property of the specified
* bean, with no type conversions.
@@ -695,7 +685,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Return the mapped property descriptors for this bean class.</p>
*
@@ -715,7 +704,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Return the mapped property descriptors for this bean.</p>
*
@@ -733,7 +721,6 @@ public class PropertyUtilsBean {
}
-
/**
* Return the value of the (possibly nested) property of the specified
* name, for the specified bean, with no type conversions.
@@ -845,8 +832,6 @@ public class PropertyUtilsBean {
return bean.get(propertyName);
}
-
-
/**
* Return the value of the specified property of the specified bean,
* no matter which property reference format is used, with no
@@ -874,7 +859,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Retrieve the property descriptor for the specified property of the
* specified bean, or return {@code null} if there is no such
@@ -971,7 +955,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Retrieve the property descriptors for the specified class,
* introspecting and caching them the first time a particular bean class
@@ -1012,7 +995,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Return the Java Class repesenting the property editor class that has
* been registered for this property (if any). This method follows the
@@ -1064,7 +1046,6 @@ public class PropertyUtilsBean {
}
-
/**
* Return the Java Class representing the property type of the specified
* property, or {@code null} if there is no such property for the
@@ -1158,7 +1139,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Return an accessible property getter method for this property,
* if there is one; otherwise return {@code null}.</p>
@@ -1174,7 +1154,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Return an accessible property getter method for this property,
* if there is one; otherwise return {@code null}.</p>
@@ -1189,7 +1168,6 @@ public class PropertyUtilsBean {
return MethodUtils.getAccessibleMethod(clazz, descriptor.getReadMethod());
}
-
/**
* Return the value of the specified simple property of the specified
* bean, with no type conversions.
@@ -1267,7 +1245,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Return an accessible property setter method for this property,
* if there is one; otherwise return {@code null}.</p>
@@ -1288,7 +1265,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Return an accessible property setter method for this property,
* if there is one; otherwise return {@code null}.</p>
@@ -1306,7 +1282,6 @@ public class PropertyUtilsBean {
data.getWriteMethod(clazz, descriptor));
}
-
/**
* <p>Return {@code true} if the specified property name identifies
* a readable property on the specified bean; otherwise, return
@@ -1395,7 +1370,6 @@ public class PropertyUtilsBean {
}
-
/**
* <p>Return {@code true} if the specified property name identifies
* a writeable property on the specified bean; otherwise, return
@@ -1484,7 +1458,6 @@ public class PropertyUtilsBean {
}
-
/**
* Set the value of the specified indexed property of the specified
* bean, with no type conversions. The zero-relative index of the
@@ -1544,7 +1517,6 @@ public class PropertyUtilsBean {
}
-
/**
* Set the value of the specified indexed property of the specified
* bean, with no type conversions. In addition to supporting the JavaBeans
@@ -1667,7 +1639,6 @@ public class PropertyUtilsBean {
}
-
/**
* Set the value of the specified mapped property of the
* specified bean, with no type conversions. The key of the
@@ -1723,7 +1694,6 @@ public class PropertyUtilsBean {
}
-
/**
* Set the value of the specified mapped property of the specified
* bean, with no type conversions.
@@ -1820,7 +1790,6 @@ public class PropertyUtilsBean {
}
-
/**
* Set the value of the (possibly nested) property of the specified
* name, for the specified bean, with no type conversions.
@@ -1975,8 +1944,6 @@ public class PropertyUtilsBean {
bean.put(propertyName, value);
}
-
-
/**
* Set the value of the specified property of the specified bean,
* no matter which property reference format is used, with no
@@ -2004,7 +1971,6 @@ public class PropertyUtilsBean {
}
-
/**
* Set the value of the specified simple property of the specified bean,
* with no type conversions.
diff --git a/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java b/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
index cbba54e..d89169e 100644
--- a/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
@@ -15,15 +15,12 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Iterator;
-
/**
* <p>Implementation of {@code DynaClass} for DynaBeans that wrap the
* {@code java.sql.Row</code> objects of a <code>java.sql.ResultSet}.
@@ -103,7 +100,6 @@ public class ResultSetDynaClass extends JDBCDynaClass {
}
-
/**
* <p>Construct a new ResultSetDynaClass for the specified
* {@code ResultSet}. The property names corresponding
@@ -132,7 +128,6 @@ public class ResultSetDynaClass extends JDBCDynaClass {
}
-
/**
* <p>Construct a new ResultSetDynaClass for the specified
* {@code ResultSet}. The property names corresponding
@@ -169,19 +164,15 @@ public class ResultSetDynaClass extends JDBCDynaClass {
}
-
-
/**
* <p>The {@code ResultSet} we are wrapping.</p>
*/
protected ResultSet resultSet = null;
-
-
/**
* <p>Return an {@code Iterator} of {@link DynaBean} instances for
* each row of the wrapped {@code ResultSet}, in "forward" order.
@@ -195,7 +186,6 @@ public class ResultSetDynaClass extends JDBCDynaClass {
}
-
/**
* Get a value from the {@link ResultSet} for the specified
* property name.
@@ -211,7 +201,6 @@ public class ResultSetDynaClass extends JDBCDynaClass {
-
/**
* <p>Return the result set we are wrapping.</p>
*/
@@ -221,7 +210,6 @@ public class ResultSetDynaClass extends JDBCDynaClass {
}
-
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java b/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java
index 8f538b3..aa6de91 100644
--- a/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java
+++ b/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java
@@ -15,15 +15,12 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.sql.SQLException;
import java.util.Iterator;
import java.util.NoSuchElementException;
-
/**
* <p>Implementation of {@code java.util.Iterator} returned by the
* {@code iterator()} method of {@link ResultSetDynaClass}. Each
@@ -34,10 +31,8 @@ import java.util.NoSuchElementException;
public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
-
-
/**
* <p>Construct an {@code Iterator} for the result set being wrapped
* by the specified {@link ResultSetDynaClass}.</p>
@@ -51,34 +46,27 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
-
-
/**
* <p>Flag indicating whether the result set is currently positioned at a
* row for which we have not yet returned an element in the iteration.</p>
*/
protected boolean current = false;
-
/**
* <p>The {@link ResultSetDynaClass} we are associated with.</p>
*/
protected ResultSetDynaClass dynaClass = null;
-
/**
* <p>Flag indicating whether the result set has indicated that there are
* no further rows.</p>
*/
protected boolean eof = false;
-
-
/**
* Does the specified mapped property contain a value for the specified
* key value?
@@ -99,7 +87,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
/**
* Return the value of a simple property with the specified name.
*
@@ -124,7 +111,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
/**
* Return the value of an indexed property with the specified name.
*
@@ -149,7 +135,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
/**
* Return the value of a mapped property with the specified name,
* or {@code null} if there is no value for the specified key.
@@ -171,7 +156,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
/**
* Return the {@code DynaClass} instance that describes the set of
* properties available for this DynaBean.
@@ -185,7 +169,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
/**
* Remove any existing value for the specified key on the
* specified mapped property.
@@ -205,7 +188,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
/**
* Set the value of a simple property with the specified name.
*
@@ -234,7 +216,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
/**
* Set the value of an indexed property with the specified name.
*
@@ -259,7 +240,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
/**
* Set the value of a mapped property with the specified name.
*
@@ -282,10 +262,8 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
-
/**
* <p>Return {@code true} if the iteration has more elements.</p>
*
@@ -304,7 +282,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
/**
* <p>Return the next element in the iteration.</p>
*
@@ -326,7 +303,6 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
/**
* <p>Remove the current element from the iteration. This method is
* not supported.</p>
@@ -338,10 +314,8 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
-
/**
* <p>Advance the result set to the next row, if there is not a current
* row (and if we are not already at eof).</p>
@@ -362,5 +336,4 @@ public class ResultSetIterator implements DynaBean, Iterator<DynaBean> {
}
-
}
diff --git a/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java b/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
index 72c992d..f11becf 100644
--- a/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
@@ -15,16 +15,13 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-
/**
* <p>Implementation of {@link DynaClass} that creates an in-memory collection
* of {@link DynaBean}s representing the results of an SQL query. Once the
@@ -85,7 +82,6 @@ public class RowSetDynaClass extends JDBCDynaClass {
-
/**
* <p>Construct a new {@link RowSetDynaClass} for the specified
* {@code ResultSet}. The property names corresponding
@@ -126,7 +122,6 @@ public class RowSetDynaClass extends JDBCDynaClass {
}
-
/**
* <p>Construct a new {@link RowSetDynaClass} for the specified
* {@code ResultSet}. The property names corresponding
@@ -266,10 +261,8 @@ public class RowSetDynaClass extends JDBCDynaClass {
}
-
-
/**
* <p>Copy the column values for each row in the specified
* {@code ResultSet} into a newly created {@link DynaBean}, and add
@@ -296,7 +289,6 @@ public class RowSetDynaClass extends JDBCDynaClass {
}
-
/**
* <p>Create and return a new {@link DynaBean} instance to be used for
* representing a row in the underlying result set.</p>
@@ -309,5 +301,4 @@ public class RowSetDynaClass extends JDBCDynaClass {
}
-
}
diff --git a/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java b/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java
index f9a993b..67af01e 100644
--- a/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java
+++ b/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java
@@ -116,7 +116,6 @@ public class WeakFastHashMap<K, V> extends HashMap<K, V> {
this.map = createMap(map);
}
-
// Property access
@@ -138,7 +137,6 @@ public class WeakFastHashMap<K, V> extends HashMap<K, V> {
this.fast = fast;
}
-
// Map access
// These methods can forward straight to the wrapped Map in 'fast' mode.
@@ -495,7 +493,6 @@ public class WeakFastHashMap<K, V> extends HashMap<K, V> {
protected abstract Collection<E> get(Map<K, V> map);
protected abstract E iteratorNext(Map.Entry<K, V> entry);
-
@Override
public void clear() {
if (fast) {
@@ -564,7 +561,6 @@ public class WeakFastHashMap<K, V> extends HashMap<K, V> {
}
}
-
@Override
public boolean isEmpty() {
if (fast) {
@@ -615,7 +611,6 @@ public class WeakFastHashMap<K, V> extends HashMap<K, V> {
}
}
-
@Override
public boolean equals(final Object o) {
if (o == this) {
diff --git a/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java b/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java
index 9edbade..44b6619 100644
--- a/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java
@@ -15,13 +15,11 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
-
/**
* <p>Implementation of {@code DynaBean} that wraps a standard JavaBean
* instance, so that DynaBean APIs can be used to access its properties.</p>
@@ -81,23 +79,19 @@ public class WrapDynaBean implements DynaBean, Serializable {
-
/**
* The {@code DynaClass} "base class" that this DynaBean
* is associated with.
*/
protected transient WrapDynaClass dynaClass = null;
-
/**
* The JavaBean instance wrapped by this WrapDynaBean.
*/
protected Object instance = null;
-
-
/**
* Does the specified mapped property contain a value for the specified
* key value?
@@ -118,7 +112,6 @@ public class WrapDynaBean implements DynaBean, Serializable {
}
-
/**
* Return the value of a simple property with the specified name.
*
@@ -148,7 +141,6 @@ public class WrapDynaBean implements DynaBean, Serializable {
}
-
/**
* Return the value of an indexed property with the specified name.
*
@@ -187,7 +179,6 @@ public class WrapDynaBean implements DynaBean, Serializable {
}
-
/**
* Return the value of a mapped property with the specified name,
* or {@code null} if there is no value for the specified key.
@@ -221,7 +212,6 @@ public class WrapDynaBean implements DynaBean, Serializable {
}
-
/**
* Return the {@code DynaClass} instance that describes the set of
* properties available for this DynaBean.
@@ -238,7 +228,6 @@ public class WrapDynaBean implements DynaBean, Serializable {
}
-
/**
* Remove any existing value for the specified key on the
* specified mapped property.
@@ -253,13 +242,11 @@ public class WrapDynaBean implements DynaBean, Serializable {
@Override
public void remove(final String name, final String key) {
-
throw new UnsupportedOperationException
("WrapDynaBean does not support remove()");
}
-
/**
* Set the value of a simple property with the specified name.
*
@@ -291,7 +278,6 @@ public class WrapDynaBean implements DynaBean, Serializable {
}
-
/**
* Set the value of an indexed property with the specified name.
*
@@ -328,7 +314,6 @@ public class WrapDynaBean implements DynaBean, Serializable {
}
-
/**
* Set the value of a mapped property with the specified name.
*
@@ -375,10 +360,8 @@ public class WrapDynaBean implements DynaBean, Serializable {
return instance;
}
-
-
/**
* Return the property descriptor for the specified property name.
*
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/CharacterConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/CharacterConverter.java
index 7ede90c..8236587 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/CharacterConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/CharacterConverter.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.beanutils2.converters;
-
/**
* {@link org.apache.commons.beanutils2.Converter} implementation that handles conversion
* to and from <b>java.lang.Character</b> objects.
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
index 3e94de1..49c07f7 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
@@ -98,7 +98,6 @@ public abstract class DateTimeConverter extends AbstractConverter {
private TimeZone timeZone;
private boolean useLocaleFormat;
-
/**
@@ -121,7 +120,6 @@ public abstract class DateTimeConverter extends AbstractConverter {
super(defaultValue);
}
-
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/EnumConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/EnumConverter.java
index 2fe8d77..bf53869 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/EnumConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/EnumConverter.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.beanutils2.converters;
-
/**
* {@link org.apache.commons.beanutils2.Converter} implementation that handles conversion
* to and from <b>java.lang.Enum</b> objects.
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/StringConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/StringConverter.java
index 4db439e..2d1ca40 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/StringConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/StringConverter.java
@@ -42,7 +42,6 @@ package org.apache.commons.beanutils2.converters;
*/
public final class StringConverter extends AbstractConverter {
-
/**
* Construct a <b>java.lang.String</b> <i>Converter</i> that throws
* a {@code ConversionException} if an error occurs.
@@ -95,5 +94,4 @@ public final class StringConverter extends AbstractConverter {
throw conversionException(type, value);
}
-
}
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 23cccca..3d0efb5 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java
@@ -25,7 +25,6 @@ import org.apache.commons.beanutils2.ConvertUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p>The base class for all standard type locale-sensitive converters.
* It has {@link LocaleConverter} and {@link org.apache.commons.beanutils2.Converter} implementations,
@@ -155,7 +154,6 @@ public abstract class BaseLocaleConverter implements LocaleConverter {
abstract protected Object parse(Object value, String pattern) throws ParseException;
-
/**
* Convert the specified locale-sensitive input object into an output object.
* The default pattern is used for the conversion.
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java
index 3696bd3..24e7ae9 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtils.java
@@ -17,14 +17,11 @@
package org.apache.commons.beanutils2.locale;
-
import java.lang.reflect.InvocationTargetException;
import java.util.Locale;
import org.apache.commons.beanutils2.BeanUtils;
-
-
/**
* <p>Utility methods for populating JavaBeans properties
* via reflection in a locale-dependent manner.</p>
@@ -36,7 +33,6 @@ import org.apache.commons.beanutils2.BeanUtils;
public class LocaleBeanUtils extends BeanUtils {
-
/**
@@ -52,7 +48,6 @@ public class LocaleBeanUtils extends BeanUtils {
return LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().getDefaultLocale();
}
-
/**
* <p>Sets the locale used when no locale is passed.</p>
*
@@ -94,7 +89,6 @@ public class LocaleBeanUtils extends BeanUtils {
LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().setApplyLocalized(newApplyLocalized);
}
-
/**
@@ -324,7 +318,6 @@ public class LocaleBeanUtils extends BeanUtils {
return LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().getMappedProperty(bean, name, key);
}
-
/**
* <p>Return the value of the specified locale-sensitive mapped property
* of the specified bean, as a String using the specified pattern.</p>
@@ -353,7 +346,6 @@ public class LocaleBeanUtils extends BeanUtils {
return LocaleBeanUtilsBean.getLocaleBeanUtilsInstance().getMappedPropertyLocale(bean, name, pattern);
}
-
/**
* <p>Return the value of the specified locale-sensitive mapped property
* of the specified bean, as a String using the default
@@ -622,4 +614,3 @@ public class LocaleBeanUtils extends BeanUtils {
}
}
-
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java
index 8bad65c..434d473 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.locale;
-
import java.beans.IndexedPropertyDescriptor;
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
@@ -36,7 +35,6 @@ import org.apache.commons.beanutils2.expression.Resolver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p>Utility methods for populating JavaBeans properties
* via reflection in a locale-dependent manner.</p>
@@ -139,7 +137,6 @@ public class LocaleBeanUtilsBean extends BeanUtilsBean {
return getLocaleConvertUtils().getDefaultLocale();
}
-
/**
* Sets the default Locale.
*
@@ -174,7 +171,6 @@ public class LocaleBeanUtilsBean extends BeanUtilsBean {
getLocaleConvertUtils().setApplyLocalized(newApplyLocalized);
}
-
/**
@@ -405,7 +401,6 @@ public class LocaleBeanUtilsBean extends BeanUtilsBean {
return getMappedProperty(bean, name, key, null);
}
-
/**
* Return the value of the specified locale-sensitive mapped property
* of the specified bean, as a String using the specified pattern.
@@ -440,7 +435,6 @@ public class LocaleBeanUtilsBean extends BeanUtilsBean {
return getLocaleConvertUtils().convert(value, pattern);
}
-
/**
* Return the value of the specified locale-sensitive mapped property
* of the specified bean, as a String using the default
@@ -895,4 +889,3 @@ public class LocaleBeanUtilsBean extends BeanUtilsBean {
}
}
-
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java
index 0f2529e..a20a651 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtils.java
@@ -266,7 +266,6 @@ public class LocaleConvertUtils {
LocaleConvertUtilsBean.getInstance().deregister();
}
-
/**
* <p>Remove any registered {@link LocaleConverter} for the specified locale.</p>
*
@@ -280,7 +279,6 @@ public class LocaleConvertUtils {
LocaleConvertUtilsBean.getInstance().deregister(locale);
}
-
/**
* <p>Remove any registered {@link LocaleConverter} for the specified locale and Class.</p>
*
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
index 2cb5f3d..d7232d6 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
@@ -380,7 +380,6 @@ public class LocaleConvertUtilsBean {
mapConverters.setFast(true);
}
-
/**
* Remove any registered {@link LocaleConverter} for the specified locale
*
@@ -391,7 +390,6 @@ public class LocaleConvertUtilsBean {
mapConverters.remove(locale);
}
-
/**
* Remove any registered {@link LocaleConverter} for the specified locale and Class.
*
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 db1e4c2..789acbd 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConverter.java
@@ -19,7 +19,6 @@ package org.apache.commons.beanutils2.locale;
import org.apache.commons.beanutils2.Converter;
-
/**
* <p>General purpose locale-sensitive data type converter that can be registered and used
* within the BeanUtils package to manage the conversion of objects from
@@ -29,7 +28,6 @@ import org.apache.commons.beanutils2.Converter;
public interface LocaleConverter extends Converter {
-
/**
* Convert the specified locale-sensitive input object into an output object of the
* specified type.
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 41678c3..f73da96 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
@@ -35,7 +35,6 @@ import org.apache.commons.beanutils2.ConversionException;
public class BigIntegerLocaleConverter extends DecimalLocaleConverter {
-
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java
index 8226c5f..19f93fb 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverter.java
@@ -22,7 +22,6 @@ import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
@@ -35,7 +34,6 @@ import org.apache.commons.beanutils2.ConversionException;
public class ByteLocaleConverter extends DecimalLocaleConverter {
-
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
index 620c8c5..7168c3c 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/DateLocaleConverter.java
@@ -29,7 +29,6 @@ import org.apache.commons.beanutils2.locale.BaseLocaleConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
@@ -191,7 +190,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
this(defaultValue, locale, null, locPattern);
}
-
/**
* Create a {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* that will return the specified default value
@@ -279,7 +277,6 @@ public class DateLocaleConverter extends BaseLocaleConverter {
: new SimpleDateFormat(pattern, locale);
formatter.setLenient(isLenient);
-
// Parse the Date
final ParsePosition pos = new ParsePosition(0);
final String strValue = value.toString();
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java
index c998480..ce540d4 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/DecimalLocaleConverter.java
@@ -26,7 +26,6 @@ import org.apache.commons.beanutils2.locale.BaseLocaleConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
@@ -40,7 +39,6 @@ import org.apache.commons.logging.LogFactory;
public class DecimalLocaleConverter extends BaseLocaleConverter {
-
/** All logging goes through this logger */
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
index 875d79c..3a28f81 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
@@ -17,11 +17,9 @@
package org.apache.commons.beanutils2.locale.converters;
-
import java.text.ParseException;
import java.util.Locale;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
@@ -34,7 +32,6 @@ import java.util.Locale;
public class DoubleLocaleConverter extends DecimalLocaleConverter {
-
/**
@@ -220,7 +217,5 @@ public class DoubleLocaleConverter extends DecimalLocaleConverter {
return result;
}
-
}
-
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java
index 6aef50d..e504a92 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java
@@ -22,7 +22,6 @@ import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
@@ -35,7 +34,6 @@ import org.apache.commons.beanutils2.ConversionException;
public class FloatLocaleConverter extends DecimalLocaleConverter {
-
/**
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 37304aa..3448b7a 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
@@ -22,7 +22,6 @@ import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
@@ -35,7 +34,6 @@ import org.apache.commons.beanutils2.ConversionException;
public class IntegerLocaleConverter extends DecimalLocaleConverter {
-
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java
index 3b07fb3..78aab48 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverter.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.locale.converters;
import java.text.ParseException;
import java.util.Locale;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
@@ -33,7 +32,6 @@ import java.util.Locale;
public class LongLocaleConverter extends DecimalLocaleConverter {
-
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java
index 11d5288..63da24e 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverter.java
@@ -22,7 +22,6 @@ import java.util.Locale;
import org.apache.commons.beanutils2.ConversionException;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlDateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlDateLocaleConverter.java
index d8c0ab1..e4d5033 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlDateLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlDateLocaleConverter.java
@@ -33,7 +33,6 @@ import java.util.Locale;
public class SqlDateLocaleConverter extends DateLocaleConverter {
-
/**
@@ -198,7 +197,6 @@ public class SqlDateLocaleConverter extends DateLocaleConverter {
super(defaultValue, locale, pattern, locPattern);
}
-
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimeLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimeLocaleConverter.java
index a0e54de..07c1f1a 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimeLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimeLocaleConverter.java
@@ -33,7 +33,6 @@ import java.util.Locale;
public class SqlTimeLocaleConverter extends DateLocaleConverter {
-
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimestampLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimestampLocaleConverter.java
index c8b639b..e3f0925 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimestampLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimestampLocaleConverter.java
@@ -33,7 +33,6 @@ import java.util.Locale;
public class SqlTimestampLocaleConverter extends DateLocaleConverter {
-
/**
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 ba354fe..a789dab 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
@@ -31,7 +31,6 @@ import org.apache.commons.beanutils2.locale.BaseLocaleConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
@@ -49,7 +48,6 @@ public class StringLocaleConverter extends BaseLocaleConverter {
/** All logging goes through this logger */
private final Log log = LogFactory.getLog(StringLocaleConverter.class); //msz fix
-
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/A.java b/src/test/java/org/apache/commons/beanutils2/A.java
index 1150b8e..6276099 100644
--- a/src/test/java/org/apache/commons/beanutils2/A.java
+++ b/src/test/java/org/apache/commons/beanutils2/A.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
import java.io.OutputStream;
diff --git a/src/test/java/org/apache/commons/beanutils2/AbstractParent.java b/src/test/java/org/apache/commons/beanutils2/AbstractParent.java
index f19ce7b..984d364 100644
--- a/src/test/java/org/apache/commons/beanutils2/AbstractParent.java
+++ b/src/test/java/org/apache/commons/beanutils2/AbstractParent.java
@@ -47,7 +47,6 @@ public abstract class AbstractParent {
return child.getName();
}
-
public String testAddChild2(final String ignore, final Child child) {
this.child = child;
return child.getName();
diff --git a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
index 39dad0c..9320a49 100644
--- a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
@@ -32,7 +30,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* <p>Test Case for the {@code BasicDynaBean} implementation class.
* These tests were based on the ones in {@code PropertyUtilsTestCase}
@@ -42,16 +39,13 @@ import junit.framework.TestSuite;
public class BasicDynaBeanTestCase extends TestCase {
-
-
/**
* The basic test bean for each test.
*/
protected DynaBean bean = null;
-
/**
* The set of property names we expect to have returned when calling
* {@code getDynaProperties()}. You should update this list
@@ -76,10 +70,8 @@ public class BasicDynaBeanTestCase extends TestCase {
"stringProperty",
};
-
-
/**
* Construct a new instance of this test case.
*
@@ -91,10 +83,8 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -143,7 +133,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Return the tests included in this test suite.
*/
@@ -153,7 +142,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -164,11 +152,8 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
-
-
/**
* Corner cases on getDynaProperty invalid arguments.
*/
@@ -194,7 +179,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Positive getDynaProperty on property {@code booleanProperty}.
*/
@@ -204,7 +188,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Positive getDynaProperty on property {@code doubleProperty}.
*/
@@ -214,7 +197,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Positive getDynaProperty on property {@code floatProperty}.
*/
@@ -224,7 +206,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Positive getDynaProperty on property {@code intProperty}.
*/
@@ -234,7 +215,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Positive getDynaProperty on property {@code longProperty}.
*/
@@ -244,7 +224,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Positive getDynaProperty on property {@code booleanSecond}
* that uses an "is" method as the getter.
@@ -255,7 +234,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Positive getDynaProperty on property {@code shortProperty}.
*/
@@ -265,7 +243,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Positive getDynaProperty on property {@code stringProperty}.
*/
@@ -275,7 +252,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Positive test for getDynaPropertys(). Each property name
* listed in {@code properties} should be returned exactly once.
@@ -303,7 +279,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Corner cases on getIndexedProperty invalid arguments.
*/
@@ -318,10 +293,8 @@ public class BasicDynaBeanTestCase extends TestCase {
fail("Threw " + t + " instead of IndexOutOfBoundsException");
}
-
}
-
/**
* Positive and negative tests on getIndexedProperty valid arguments.
*/
@@ -388,16 +361,13 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
}
-
/**
* Corner cases on getMappedProperty invalid arguments.
*/
public void testGetMappedArguments() {
-
try {
final Object value = bean.get("mappedProperty", "unknown");
assertNull("Should not return a value", value);
@@ -405,10 +375,8 @@ public class BasicDynaBeanTestCase extends TestCase {
fail("Threw " + t + " instead of returning null");
}
-
}
-
/**
* Positive and negative tests on getMappedProperty valid arguments.
*/
@@ -439,7 +407,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Corner cases on getSimpleProperty invalid arguments.
*/
@@ -456,7 +423,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a boolean property.
*/
@@ -474,7 +440,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a double property.
*/
@@ -493,7 +458,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a float property.
*/
@@ -513,7 +477,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a int property.
*/
@@ -532,7 +495,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a long property.
*/
@@ -551,7 +513,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a short property.
*/
@@ -570,7 +531,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a String property.
*/
@@ -589,7 +549,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test {@code contains()} method for mapped properties.
*/
@@ -602,7 +561,6 @@ public class BasicDynaBeanTestCase extends TestCase {
fail("Exception: " + t);
}
-
try {
assertTrue("Can not see unknown key",
!bean.contains("mappedProperty", "Unknown Key"));
@@ -612,7 +570,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test {@code remove()} method for mapped properties.
*/
@@ -640,7 +597,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test serialization and deserialization.
*/
@@ -714,7 +670,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Corner cases on setIndexedProperty invalid arguments.
*/
@@ -731,7 +686,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Positive and negative tests on setIndexedProperty valid arguments.
*/
@@ -799,10 +753,8 @@ public class BasicDynaBeanTestCase extends TestCase {
fail("Threw " + t);
}
-
}
-
/**
* Positive and negative tests on setMappedProperty valid arguments.
*/
@@ -826,10 +778,8 @@ public class BasicDynaBeanTestCase extends TestCase {
fail("Finding fourth value threw " + t);
}
-
}
-
/**
* Test setSimpleProperty on a boolean property.
*/
@@ -849,7 +799,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a double property.
*/
@@ -870,7 +819,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a float property.
*/
@@ -891,7 +839,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a int property.
*/
@@ -911,7 +858,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a long property.
*/
@@ -931,7 +877,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a short property.
*/
@@ -951,7 +896,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a String property.
*/
@@ -970,10 +914,8 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
-
/**
* Create and return a {@code DynaClass} instance for our test
* {@code DynaBean}.
@@ -1007,7 +949,6 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
/**
* Base for testGetDescriptorXxxxx() series of tests.
*
@@ -1027,5 +968,4 @@ public class BasicDynaBeanTestCase extends TestCase {
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java
index f608146..d86f52b 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java
@@ -36,10 +36,8 @@ public class BeanUtils2TestCase extends BeanUtilsTestCase {
super(name);
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -50,7 +48,6 @@ public class BeanUtils2TestCase extends BeanUtilsTestCase {
setUpShared();
}
-
/**
* Return the tests included in this test suite.
*/
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
index 5957505..453d993 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -27,7 +25,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* JUnit Test Case containing microbenchmarks for BeanUtils.
*
@@ -35,10 +32,8 @@ import junit.framework.TestSuite;
public class BeanUtilsBenchCase extends TestCase {
-
-
/**
* Construct a new instance of this test case.
*
@@ -50,10 +45,8 @@ public class BeanUtilsBenchCase extends TestCase {
}
-
-
// Basic loop counter
private long counter = 100000;
@@ -73,10 +66,8 @@ public class BeanUtilsBenchCase extends TestCase {
// BeanUtilsBean instance to be used
private BeanUtilsBean bu = null;
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -141,7 +132,6 @@ public class BeanUtilsBenchCase extends TestCase {
}
-
/**
* Return the tests included in this test suite.
*/
@@ -151,7 +141,6 @@ public class BeanUtilsBenchCase extends TestCase {
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -168,11 +157,8 @@ public class BeanUtilsBenchCase extends TestCase {
}
-
-
-
// Time copyProperties() from a bean
public void testCopyPropertiesBean() throws Exception {
@@ -205,7 +191,6 @@ public class BeanUtilsBenchCase extends TestCase {
}
-
// Time copyProperties() from a DynaBean
public void testCopyPropertiesDyna() throws Exception {
@@ -238,7 +223,6 @@ public class BeanUtilsBenchCase extends TestCase {
}
-
// Time copyProperties() from a Map of Objects
public void testCopyPropertiesMap() throws Exception {
@@ -271,7 +255,6 @@ public class BeanUtilsBenchCase extends TestCase {
}
-
// Time copyProperties() from a Map of Strings
public void testCopyPropertiesStrs() throws Exception {
@@ -304,7 +287,6 @@ public class BeanUtilsBenchCase extends TestCase {
}
-
// Time populate() from a Map of Objects
public void testPopulateMap() throws Exception {
@@ -337,7 +319,6 @@ public class BeanUtilsBenchCase extends TestCase {
}
-
// Time populate() from a Map of Strings
// NOTE - This simulates what Struts does when processing form beans
public void testPopulateStrs() throws Exception {
@@ -371,8 +352,6 @@ public class BeanUtilsBenchCase extends TestCase {
}
-
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
index 46c5746..6963f9c 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2;
-
import java.lang.reflect.InvocationTargetException;
import java.util.Calendar;
import java.util.HashMap;
@@ -33,7 +32,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* <p>
* Test Case for the BeanUtils class. The majority of these tests use
@@ -70,7 +68,6 @@ public class BeanUtilsTestCase extends TestCase {
*/
protected TestBean bean = null;
-
/**
* The set of properties that should be described.
*/
@@ -117,10 +114,8 @@ public class BeanUtilsTestCase extends TestCase {
super(name);
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -153,7 +148,6 @@ public class BeanUtilsTestCase extends TestCase {
testStringDate = "28.12.1992";
}
-
/**
* Return the tests included in this test suite.
*/
@@ -169,10 +163,8 @@ public class BeanUtilsTestCase extends TestCase {
bean = null;
}
-
-
/**
* Test the copyProperties() method from a DynaBean.
*/
@@ -250,7 +242,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test copyProperties() when the origin is a a {@code Map}.
*/
@@ -308,7 +299,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test the copyProperties() method from a standard JavaBean.
*/
@@ -379,7 +369,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test the describe() method.
*/
@@ -428,7 +417,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* tests the string and int arrays of TestBean
*/
@@ -446,14 +434,12 @@ public class BeanUtilsTestCase extends TestCase {
assertTrue("String array length = " + iarr.length,
iarr.length == arr.length);
-
// Test property which isn't array or collection
arr = BeanUtils.getArrayProperty(bean, "shortProperty");
final String shortAsString = "" + bean.getShortProperty();
assertEquals("Short List Test lth", 1, arr.length);
assertEquals("Short Test value", shortAsString, arr[0]);
-
// Test comma delimited list
bean.setStringProperty("ABC");
arr = BeanUtils.getArrayProperty(bean, "stringProperty");
@@ -544,7 +530,6 @@ public class BeanUtilsTestCase extends TestCase {
}
}
-
/**
* tests getting a nested property
*/
@@ -563,7 +548,6 @@ public class BeanUtilsTestCase extends TestCase {
}
}
-
/**
* tests getting a 'whatever' property
*/
@@ -583,7 +567,6 @@ public class BeanUtilsTestCase extends TestCase {
}
}
-
/**
* tests getting a 'whatever' property
*/
@@ -667,7 +650,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test populate() method on array properties as a whole.
*/
@@ -705,7 +687,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test populate() on mapped properties.
*/
@@ -739,7 +720,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test populate() method on nested properties.
*/
@@ -793,7 +773,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test populate() method on scalar properties.
*/
@@ -854,7 +833,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test calling setProperty() with null property values.
*/
@@ -894,7 +872,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test converting to and from primitive wrapper types.
*/
@@ -907,7 +884,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on byte.
*/
@@ -1013,7 +989,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on float.
*/
@@ -1034,7 +1009,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on int.
*/
@@ -1057,7 +1031,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on long.
*/
@@ -1080,7 +1053,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test setting a null property value.
*/
@@ -1092,7 +1064,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on short.
*/
@@ -1136,7 +1107,6 @@ public class BeanUtilsTestCase extends TestCase {
assertEquals("value[4]", 40, intArray[4]);
}
-
/**
* Test narrowing and widening conversions on byte.
*/
@@ -1240,7 +1210,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on float.
*/
@@ -1261,7 +1230,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on int.
*/
@@ -1282,7 +1250,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on long.
*/
@@ -1303,7 +1270,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on short.
*/
@@ -1324,7 +1290,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test copying a property using a nested indexed array expression,
* with and without conversions.
@@ -1362,7 +1327,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test copying a property using a nested mapped map property.
*/
@@ -1384,7 +1348,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test copying a property using a nested simple expression, with and
* without conversions.
@@ -1420,7 +1383,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test copying a null property value.
*/
@@ -1432,7 +1394,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test copying a new value to a write-only property, with and without
* conversions.
@@ -1451,7 +1412,6 @@ public class BeanUtilsTestCase extends TestCase {
}
-
/**
* Test setting a new value to a write-only property, with and without
* conversions.
@@ -1499,7 +1459,6 @@ public class BeanUtilsTestCase extends TestCase {
new ConvertUtilsBean(),
new PropertyUtilsBean());
-
final TestBean bean = new TestBean();
// Make sure what we're testing works
@@ -1565,7 +1524,6 @@ public class BeanUtilsTestCase extends TestCase {
}
}
-
// Ensure that the actual Map matches the expected Map
protected void checkMap(final Map<?, ?> actual, final Map<?, ?> expected) {
assertNotNull("actual map not null", actual);
diff --git a/src/test/java/org/apache/commons/beanutils2/BenchBean.java b/src/test/java/org/apache/commons/beanutils2/BenchBean.java
index 4fc2b26..47c9ece 100644
--- a/src/test/java/org/apache/commons/beanutils2/BenchBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/BenchBean.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
/**
* Plain old java bean (POJO) for microbenchmarks.
*
@@ -26,10 +24,8 @@ package org.apache.commons.beanutils2;
public class BenchBean {
-
-
/**
* A boolean property.
*/
@@ -43,7 +39,6 @@ public class BenchBean {
this.booleanProperty = booleanProperty;
}
-
/**
* A byte property.
*/
@@ -57,7 +52,6 @@ public class BenchBean {
this.byteProperty = byteProperty;
}
-
/**
* A double property.
*/
@@ -71,7 +65,6 @@ public class BenchBean {
this.doubleProperty = doubleProperty;
}
-
/**
* A float property.
*/
@@ -85,7 +78,6 @@ public class BenchBean {
this.floatProperty = floatProperty;
}
-
/**
* An integer property.
*/
@@ -99,7 +91,6 @@ public class BenchBean {
this.intProperty = intProperty;
}
-
/**
* A long property.
*/
@@ -113,7 +104,6 @@ public class BenchBean {
this.longProperty = longProperty;
}
-
/**
* A short property.
*/
@@ -127,7 +117,6 @@ public class BenchBean {
this.shortProperty = shortProperty;
}
-
/**
* A String property.
*/
@@ -141,5 +130,4 @@ public class BenchBean {
this.stringProperty = stringProperty;
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/Child.java b/src/test/java/org/apache/commons/beanutils2/Child.java
index c5beba0..98f3586 100644
--- a/src/test/java/org/apache/commons/beanutils2/Child.java
+++ b/src/test/java/org/apache/commons/beanutils2/Child.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java
index 1ca6755..926d761 100644
--- a/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
@@ -26,7 +24,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* <p> Test case for {@code ConstructorUtils} </p>
*
@@ -44,10 +41,8 @@ public class ConstructorUtilsTestCase extends TestCase {
super(name);
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -56,7 +51,6 @@ public class ConstructorUtilsTestCase extends TestCase {
super.setUp();
}
-
/**
* Return the tests included in this test suite.
*/
@@ -72,7 +66,6 @@ public class ConstructorUtilsTestCase extends TestCase {
super.tearDown();
}
-
public void testInvokeConstructor() throws Exception {
diff --git a/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
index 6ff8a07..0bb005c 100644
--- a/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2;
-
import java.sql.Date;
import java.sql.Time;
import java.sql.Timestamp;
@@ -31,7 +30,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* <p>
* Test Case for the ConvertUtils class.
@@ -43,10 +41,8 @@ public class ConvertUtilsTestCase extends TestCase {
-
-
/**
* Construct a new instance of this test case.
*
@@ -56,10 +52,8 @@ public class ConvertUtilsTestCase extends TestCase {
super(name);
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -70,7 +64,6 @@ public class ConvertUtilsTestCase extends TestCase {
}
-
/**
* Return the tests included in this test suite.
*/
@@ -78,7 +71,6 @@ public class ConvertUtilsTestCase extends TestCase {
return new TestSuite(ConvertUtilsTestCase.class);
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -87,10 +79,8 @@ public class ConvertUtilsTestCase extends TestCase {
// No action required
}
-
-
/**
* Negative String to primitive integer array tests.
*/
@@ -114,10 +104,8 @@ public class ConvertUtilsTestCase extends TestCase {
value = ConvertUtils.convert("{ 0, 1a3 }", intArray.getClass());
checkIntegerArray(value, intArray);
-
}
-
/**
* Negative scalar conversion tests. These rely on the standard
* default value conversions in ConvertUtils.
@@ -195,7 +183,6 @@ public class ConvertUtilsTestCase extends TestCase {
}
-
/**
* Negative String to String array tests.
*/
@@ -209,7 +196,6 @@ public class ConvertUtilsTestCase extends TestCase {
}
-
/**
* Test conversion of object to string for arrays.
*/
@@ -238,7 +224,6 @@ public class ConvertUtilsTestCase extends TestCase {
}
-
/**
* Test conversion of object to string for scalars.
*/
@@ -269,7 +254,6 @@ public class ConvertUtilsTestCase extends TestCase {
}
-
/**
* Positive array conversion tests.
*/
@@ -294,7 +278,6 @@ public class ConvertUtilsTestCase extends TestCase {
}
-
/**
* Positive String to primitive integer array tests.
*/
@@ -330,7 +313,6 @@ public class ConvertUtilsTestCase extends TestCase {
}
-
/**
* Positive scalar conversion tests.
*/
@@ -483,7 +465,6 @@ public class ConvertUtilsTestCase extends TestCase {
}
-
/**
* Positive String to String array tests.
*/
@@ -537,7 +518,6 @@ public class ConvertUtilsTestCase extends TestCase {
stringArray.getClass());
checkStringArray(value, stringArray2);
-
}
public void testSeparateConvertInstances() throws Exception {
@@ -675,7 +655,6 @@ public class ConvertUtilsTestCase extends TestCase {
-
private void checkIntegerArray(final Object value, final int intArray[]) {
assertNotNull("Returned value is not null", value);
@@ -690,7 +669,6 @@ public class ConvertUtilsTestCase extends TestCase {
}
-
private void checkStringArray(final Object value, final String stringArray[]) {
assertNotNull("Returned value is not null", value);
@@ -706,6 +684,5 @@ public class ConvertUtilsTestCase extends TestCase {
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
index a39f492..ab9387a 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2;
-
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -29,7 +28,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test case for BeanUtils when the underlying bean is actually a DynaBean.
*
@@ -37,22 +35,18 @@ import junit.framework.TestSuite;
public class DynaBeanUtilsTestCase extends TestCase {
-
-
/**
* The basic test bean for each test.
*/
protected DynaBean bean = null;
-
/**
* The nested bean pointed at by the "nested" property.
*/
protected TestBean nested = null;
-
/**
* The set of properties that should be described.
*/
@@ -80,10 +74,8 @@ public class DynaBeanUtilsTestCase extends TestCase {
"stringProperty"
};
-
-
/**
* Construct a new instance of this test case.
*
@@ -95,10 +87,8 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -158,7 +148,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Return the tests included in this test suite.
*/
@@ -168,7 +157,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -180,8 +168,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
-
/**
@@ -337,7 +323,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test copyProperties() when the origin is a a {@code Map}.
*/
@@ -397,7 +382,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test the copyProperties() method from a standard JavaBean.
*/
@@ -468,7 +452,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test the describe() method.
*/
@@ -517,7 +500,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test populate() method on array properties as a whole.
*/
@@ -556,7 +538,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* tests the string and int arrays of TestBean
*/
@@ -583,7 +564,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* tests getting an indexed property
*/
@@ -605,7 +585,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
}
-
/**
* tests getting an indexed property
*/
@@ -630,7 +609,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
}
-
/**
* tests getting a nested property
*/
@@ -649,7 +627,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
}
-
/**
* tests getting a 'whatever' property
*/
@@ -669,7 +646,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
}
-
/**
* tests getting a 'whatever' property
*/
@@ -689,7 +665,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
}
-
/**
* Test populate() method on individual array elements.
*/
@@ -749,7 +724,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test populate() on mapped properties.
*/
@@ -783,7 +757,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test populate() method on nested properties.
*/
@@ -834,7 +807,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test populate() method on scalar properties.
*/
@@ -890,7 +862,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test calling setProperty() with null property values.
*/
@@ -930,7 +901,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test converting to and from primitive wrapper types.
*/
@@ -943,7 +913,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test setting a null property value.
*/
@@ -955,7 +924,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on byte.
*/
@@ -978,7 +946,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on double.
*/
@@ -999,7 +966,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on float.
*/
@@ -1020,7 +986,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on int.
*/
@@ -1043,7 +1008,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on long.
*/
@@ -1066,7 +1030,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test copying a null property value.
*/
@@ -1078,7 +1041,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test narrowing and widening conversions on short.
*/
@@ -1101,7 +1063,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test copying a property using a nested indexed array expression,
* with and without conversions.
@@ -1143,7 +1104,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test copying a property using a nested mapped map property.
*/
@@ -1165,7 +1125,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
/**
* Test copying a property using a nested simple expression, with and
* without conversions.
@@ -1197,10 +1156,8 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
-
// Ensure that the nested intArray matches the specified values
protected void checkIntArray(final int actual[], final int expected[]) {
assertNotNull("actual array not null", actual);
@@ -1211,7 +1168,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
}
-
// Ensure that the actual Map matches the expected Map
protected void checkMap(final Map<?, ?> actual, final Map<?, ?> expected) {
assertNotNull("actual map not null", actual);
@@ -1224,7 +1180,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
}
-
/**
* Create and return a {@code DynaClass} instance for our test
* {@code DynaBean}.
@@ -1262,5 +1217,4 @@ public class DynaBeanUtilsTestCase extends TestCase {
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
index 386c221..1eea44b 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -29,7 +27,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test accessing DynaBeans transparently via PropertyUtils.
*
@@ -37,16 +34,13 @@ import junit.framework.TestSuite;
public class DynaPropertyUtilsTestCase extends TestCase {
-
-
/**
* The basic test bean for each test.
*/
protected DynaBean bean = null;
-
/**
* The set of properties that should be described.
*/
@@ -72,16 +66,13 @@ public class DynaPropertyUtilsTestCase extends TestCase {
"stringProperty"
};
-
/**
* The nested bean pointed at by the "nested" property.
*/
protected TestBean nested = null;
-
-
/**
* Construct a new instance of this test case.
*
@@ -93,10 +84,8 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -155,7 +144,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Return the tests included in this test suite.
*/
@@ -165,7 +153,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -177,11 +164,8 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
-
-
/**
* Test copyProperties() when the origin is a a {@code Map}.
*/
@@ -238,7 +222,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test the describe() method.
*/
@@ -278,7 +261,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on getIndexedProperty invalid arguments.
*/
@@ -386,7 +368,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive and negative tests on getIndexedProperty valid arguments.
*/
@@ -645,7 +626,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on getMappedProperty invalid arguments.
*/
@@ -713,7 +693,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getting mapped values with periods in the key.
*/
@@ -755,7 +734,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getting mapped values with slashes in the key. This is different
* from periods because slashes are not syntactically significant.
@@ -798,7 +776,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive and negative tests on getMappedProperty valid arguments.
*/
@@ -892,7 +869,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on getNestedProperty invalid arguments.
*/
@@ -918,7 +894,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a boolean property.
*/
@@ -946,7 +921,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a double property.
*/
@@ -975,7 +949,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a float property.
*/
@@ -1004,7 +977,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on an int property.
*/
@@ -1032,7 +1004,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a long property.
*/
@@ -1060,7 +1031,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a read-only String property.
*/
@@ -1088,7 +1058,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a short property.
*/
@@ -1116,7 +1085,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a String property.
*/
@@ -1144,7 +1112,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test getNestedProperty on an unknown property.
*/
@@ -1165,7 +1132,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on getSimpleProperty invalid arguments.
*/
@@ -1191,7 +1157,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a boolean property.
*/
@@ -1217,7 +1182,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a double property.
*/
@@ -1243,7 +1207,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a float property.
*/
@@ -1271,7 +1234,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test getSimpleProperty on an indexed property.
*/
@@ -1293,7 +1255,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on an int property.
*/
@@ -1320,7 +1281,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a long property.
*/
@@ -1347,7 +1307,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test getSimpleProperty on a nested property.
*/
@@ -1369,7 +1328,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a short property.
*/
@@ -1396,7 +1354,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a String property.
*/
@@ -1423,7 +1380,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test getSimpleProperty on an unknown property.
*/
@@ -1446,7 +1402,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on setIndexedProperty invalid arguments.
*/
@@ -1564,7 +1519,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive and negative tests on setIndexedProperty valid arguments.
*/
@@ -1850,7 +1804,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on getMappedProperty invalid arguments.
*/
@@ -1923,7 +1876,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive and negative tests on setMappedProperty valid arguments.
*/
@@ -2014,7 +1966,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on setNestedProperty invalid arguments.
*/
@@ -2040,7 +1991,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNextedProperty on a boolean property.
*/
@@ -2067,7 +2017,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a double property.
*/
@@ -2095,7 +2044,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a float property.
*/
@@ -2123,7 +2071,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a int property.
*/
@@ -2150,7 +2097,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a long property.
*/
@@ -2177,7 +2123,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a read-only String property.
*/
@@ -2202,7 +2147,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a short property.
*/
@@ -2230,7 +2174,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a String property.
*/
@@ -2257,7 +2200,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on an unknown property name.
*/
@@ -2281,7 +2223,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a write-only String property.
*/
@@ -2308,7 +2249,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on setSimpleProperty invalid arguments.
*/
@@ -2334,7 +2274,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a boolean property.
*/
@@ -2361,7 +2300,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a double property.
*/
@@ -2389,7 +2327,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a float property.
*/
@@ -2417,7 +2354,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test setSimpleProperty on an indexed property.
*/
@@ -2440,7 +2376,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a int property.
*/
@@ -2467,7 +2402,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a long property.
*/
@@ -2494,7 +2428,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test setSimpleProperty on a nested property.
*/
@@ -2517,7 +2450,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a short property.
*/
@@ -2545,7 +2477,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a String property.
*/
@@ -2572,7 +2503,6 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on an unknown property name.
*/
@@ -2598,10 +2528,8 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
-
/**
* Create and return a {@code DynaClass} instance for our test
* {@code DynaBean}.
@@ -2639,5 +2567,4 @@ public class DynaPropertyUtilsTestCase extends TestCase {
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
index 994d094..488a0f9 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.math.BigDecimal;
import java.util.Iterator;
@@ -26,7 +24,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test accessing ResultSets via DynaBeans.
*
@@ -34,16 +31,13 @@ import junit.framework.TestSuite;
public class DynaResultSetTestCase extends TestCase {
-
-
/**
* The mock result set DynaClass to be tested.
*/
protected ResultSetDynaClass dynaClass = null;
-
/**
* Names of the columns for this test. Must match the order they are
* defined in {@link TestResultSetMetaData}, and must be all lower case.
@@ -57,10 +51,8 @@ public class DynaResultSetTestCase extends TestCase {
"stringproperty", "timeproperty",
"timestampproperty" };
-
-
/**
* Construct a new instance of this test case.
*
@@ -72,10 +64,8 @@ public class DynaResultSetTestCase extends TestCase {
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -86,7 +76,6 @@ public class DynaResultSetTestCase extends TestCase {
}
-
/**
* Return the tests included in this test suite.
*/
@@ -96,7 +85,6 @@ public class DynaResultSetTestCase extends TestCase {
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -107,21 +95,16 @@ public class DynaResultSetTestCase extends TestCase {
}
-
-
-
public void testGetName() {
assertEquals("DynaClass name",
"org.apache.commons.beanutils2.ResultSetDynaClass",
dynaClass.getName());
-
}
-
public void testGetDynaProperty() {
// Invalid argument test
@@ -147,7 +130,6 @@ public class DynaResultSetTestCase extends TestCase {
}
-
public void testGetDynaProperties() {
final DynaProperty dynaProps[] = dynaClass.getDynaProperties();
@@ -160,7 +142,6 @@ public class DynaResultSetTestCase extends TestCase {
}
-
public void testNewInstance() {
try {
@@ -174,7 +155,6 @@ public class DynaResultSetTestCase extends TestCase {
}
-
public void testIteratorCount() {
final Iterator<?> rows = dynaClass.iterator();
@@ -191,7 +171,6 @@ public class DynaResultSetTestCase extends TestCase {
}
-
public void testIteratorResults() {
// Grab the third row
@@ -238,10 +217,8 @@ public class DynaResultSetTestCase extends TestCase {
"This is a string",
(String) stringProperty);
-
}
-
/**
* Test normal case column names (i.e. not converted to lower case)
*/
@@ -297,8 +274,6 @@ public class DynaResultSetTestCase extends TestCase {
"This is a string",
(String) stringProperty);
-
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
index 148cb05..cf593fc 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.math.BigDecimal;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
@@ -29,7 +27,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test accessing RowSets via DynaBeans.
*
@@ -37,16 +34,13 @@ import junit.framework.TestSuite;
public class DynaRowSetTestCase extends TestCase {
-
-
/**
* The mock result set DynaClass to be tested.
*/
protected RowSetDynaClass dynaClass = null;
-
/**
* Names of the columns for this test. Must match the order they are
* defined in {@link TestResultSetMetaData}, and must be all lower case.
@@ -60,10 +54,8 @@ public class DynaRowSetTestCase extends TestCase {
"stringproperty", "timeproperty",
"timestampproperty" };
-
-
/**
* Construct a new instance of this test case.
*
@@ -75,10 +67,8 @@ public class DynaRowSetTestCase extends TestCase {
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -89,7 +79,6 @@ public class DynaRowSetTestCase extends TestCase {
}
-
/**
* Return the tests included in this test suite.
*/
@@ -99,7 +88,6 @@ public class DynaRowSetTestCase extends TestCase {
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -110,21 +98,16 @@ public class DynaRowSetTestCase extends TestCase {
}
-
-
-
public void testGetName() {
assertEquals("DynaClass name",
"org.apache.commons.beanutils2.RowSetDynaClass",
dynaClass.getName());
-
}
-
public void testGetDynaProperty() {
// Invalid argument test
@@ -150,7 +133,6 @@ public class DynaRowSetTestCase extends TestCase {
}
-
public void testGetDynaProperties() {
final DynaProperty dynaProps[] = dynaClass.getDynaProperties();
@@ -163,7 +145,6 @@ public class DynaRowSetTestCase extends TestCase {
}
-
public void testNewInstance() {
try {
@@ -177,7 +158,6 @@ public class DynaRowSetTestCase extends TestCase {
}
-
public void testListCount() {
final List<DynaBean> rows = dynaClass.getRows();
@@ -186,7 +166,6 @@ public class DynaRowSetTestCase extends TestCase {
}
-
public void testListResults() {
// Grab the third row
@@ -231,7 +210,6 @@ public class DynaRowSetTestCase extends TestCase {
"This is a string",
(String) stringProperty);
-
}
/**
@@ -287,7 +265,6 @@ public class DynaRowSetTestCase extends TestCase {
"This is a string",
(String) stringProperty);
-
}
public void testLimitedRows() throws Exception {
diff --git a/src/test/java/org/apache/commons/beanutils2/ExtendMapBean.java b/src/test/java/org/apache/commons/beanutils2/ExtendMapBean.java
index c435b36..f2b13d1 100644
--- a/src/test/java/org/apache/commons/beanutils2/ExtendMapBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/ExtendMapBean.java
@@ -19,7 +19,6 @@ package org.apache.commons.beanutils2;
import java.util.Hashtable;
-
/**
* Used to test
*
diff --git a/src/test/java/org/apache/commons/beanutils2/IndexedPropertyTestCase.java b/src/test/java/org/apache/commons/beanutils2/IndexedPropertyTestCase.java
index d566c5d..b337e1c 100644
--- a/src/test/java/org/apache/commons/beanutils2/IndexedPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/IndexedPropertyTestCase.java
@@ -31,7 +31,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
/**
* <p>Test Case for the Indexed Properties.</p>
*
@@ -53,10 +52,8 @@ public class IndexedPropertyTestCase {
private List<Object> newList;
private ArrayList<Object> arrayList;
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -101,7 +98,6 @@ public class IndexedPropertyTestCase {
bean = null;
}
-
/**
@@ -370,7 +366,6 @@ public class IndexedPropertyTestCase {
}
}
-
/**
* Test setting an indexed item of an Array using setProperty("name[x]", value)
*/
@@ -409,7 +404,6 @@ public class IndexedPropertyTestCase {
}
}
-
/**
* Test setting an indexed item of a List using setProperty("name[x]", value)
*/
@@ -428,7 +422,6 @@ public class IndexedPropertyTestCase {
assertEquals("modified-1", bean.getStringList(1));
}
-
/**
* Test getting an ArrayList
*/
diff --git a/src/test/java/org/apache/commons/beanutils2/IndexedTestBean.java b/src/test/java/org/apache/commons/beanutils2/IndexedTestBean.java
index 494a96b..1b3c125 100644
--- a/src/test/java/org/apache/commons/beanutils2/IndexedTestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/IndexedTestBean.java
@@ -30,7 +30,6 @@ public class IndexedTestBean {
private List<String> stringList;
private ArrayList<Object> arrayList;
-
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java
index 1a7d990..7aae4a1 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java
@@ -196,7 +196,6 @@ public class LazyDynaClassTestCase extends TestCase {
assertFalse("property doesnt exist", dynaClass.isDynaProperty(testProperty));
}
-
/**
* Test retrieving a property which doesn't exist (returnNull is 'true')
*/
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
index 1935e8d..e64437d 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
@@ -111,7 +111,6 @@ public class LazyDynaListTestCase extends TestCase {
// Create LazyArrayList for DynaBeans
final LazyDynaList list = new LazyDynaList(LazyDynaBean.class);
-
final LazyDynaBean bean = new LazyDynaBean();
bean.set("prop1", "val");
@@ -187,7 +186,6 @@ public class LazyDynaListTestCase extends TestCase {
testList.add(testArray[i]);
}
-
// ----- Create LazyArrayList from Collection -----
LazyDynaList lazyList = new LazyDynaList(testList);
assertEquals("1. check size", size, lazyList.size());
@@ -203,8 +201,6 @@ public class LazyDynaListTestCase extends TestCase {
assertEquals("5."+i+" Map error ", "val"+i, mapArray[i].get("prop"+i));
}
-
-
// ----- Create LazyArrayList from Array -----
lazyList = new LazyDynaList(testArray);
assertEquals("6. check size", size, lazyList.size());
@@ -267,7 +263,6 @@ public class LazyDynaListTestCase extends TestCase {
// expected result
}
-
// find a String property to set
final String testProperty = findStringProperty(testDynaClass);
assertNotNull("Test Property Not Found", testProperty);
@@ -306,7 +301,6 @@ public class LazyDynaListTestCase extends TestCase {
assertEquals("15. Wrong Value", origValue+"_updated_"+2, dynaArray[3].get(testProperty));
assertEquals("16. Wrong Value", "orig_pos1", dynaArray[4].get(testProperty));
-
// Test Insert - add(index, Object)
try {
final DynaBean extraElement = testDynaClass.newInstance();
@@ -335,8 +329,6 @@ public class LazyDynaListTestCase extends TestCase {
return null;
}
-
-
/**
* Test Map Create
*/
diff --git a/src/test/java/org/apache/commons/beanutils2/MappedPropertyChildBean.java b/src/test/java/org/apache/commons/beanutils2/MappedPropertyChildBean.java
index f1efc62..d7b098a 100644
--- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyChildBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyChildBean.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
/**
* Inherited Mapped property test bean.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/MappedPropertyChildInterface.java b/src/test/java/org/apache/commons/beanutils2/MappedPropertyChildInterface.java
index cf67e2e..4189f44 100644
--- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyChildInterface.java
+++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyChildInterface.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
/**
* Test Child Interface
*
@@ -26,6 +24,5 @@ package org.apache.commons.beanutils2;
public interface MappedPropertyChildInterface extends MappedPropertyTestInterface {
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
index b1c2d17..d4b357e 100644
--- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
import java.util.HashMap;
@@ -31,7 +30,6 @@ public class MappedPropertyTestBean {
private final Map<Object, Object> map = new HashMap<>();
private final Map<Object, Object> myMap = new HashMap<>();
-
public String getMapproperty(final String key) {
diff --git a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java
index 22e582e..53ecdd0 100644
--- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java
@@ -214,7 +214,6 @@ public class MappedPropertyTestCase extends TestCase {
}
}
-
/**
* Test property with any two args
*/
@@ -261,7 +260,6 @@ public class MappedPropertyTestCase extends TestCase {
}
}
-
/**
* Test 'public' method in parent
*/
@@ -291,7 +289,6 @@ public class MappedPropertyTestCase extends TestCase {
}
}
-
/**
* Test Interface with mapped property
*/
diff --git a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestInterface.java b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestInterface.java
index b0452ab..d826c2c 100644
--- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestInterface.java
+++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestInterface.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
/**
@@ -25,7 +24,6 @@ package org.apache.commons.beanutils2;
public interface MappedPropertyTestInterface {
-
public String getMapproperty(String key);
public void setMapproperty(String key, String value);
diff --git a/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
index 9646a82..9cec068 100644
--- a/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
@@ -45,10 +45,8 @@ public class MethodUtilsTestCase extends TestCase {
super(name);
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -56,7 +54,6 @@ public class MethodUtilsTestCase extends TestCase {
public void setUp() {
}
-
/**
* Return the tests included in this test suite.
*/
@@ -71,7 +68,6 @@ public class MethodUtilsTestCase extends TestCase {
public void tearDown() {
}
-
/**
@@ -96,7 +92,6 @@ public class MethodUtilsTestCase extends TestCase {
assertMethod(method, "methodBar");
}
-
public void testGetAccessibleMethodIndirectInterface() {
Method method;
// trickier this one - find a method in a indirect interface
@@ -145,7 +140,6 @@ public class MethodUtilsTestCase extends TestCase {
assertEquals("Method TWO was invoked correctly", "YET ANOTHER TEST", ret);
}
-
public void testInvokeExactMethodNullArray() throws Exception {
final Object result = MethodUtils.invokeExactMethod(
new AlphaBean("parent"),
@@ -205,7 +199,6 @@ public class MethodUtilsTestCase extends TestCase {
MethodUtils.invokeMethod(parent, "testAddChild2", params));
}
-
public void testInvokeMethodUnknown() throws Exception {
// test that exception is correctly thrown when a method cannot be found with matching params
try {
@@ -373,7 +366,6 @@ public class MethodUtilsTestCase extends TestCase {
}
-
/**
* Simple tests for accessing static methods via invokeExactMethod().
*/
diff --git a/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java b/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java
index 8a524d0..f45963b 100644
--- a/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java
@@ -15,11 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
-
/**
* Specialist test bean for complex nested properties.
*
@@ -27,13 +24,11 @@ package org.apache.commons.beanutils2;
public class NestedTestBean {
-
public NestedTestBean(final String name) {
setName(name);
}
-
private String name;
@@ -46,7 +41,6 @@ public class NestedTestBean {
this.name = name;
}
-
private String testString = "NOT SET";
public String getTestString() {
@@ -57,7 +51,6 @@ public class NestedTestBean {
this.testString = testString;
}
-
private boolean testBoolean = false;
public boolean getTestBoolean() {
@@ -68,7 +61,6 @@ public class NestedTestBean {
this.testBoolean = testBoolean;
}
-
private NestedTestBean indexedBeans[];
public void init() {
diff --git a/src/test/java/org/apache/commons/beanutils2/PassTestException.java b/src/test/java/org/apache/commons/beanutils2/PassTestException.java
index 9e80282..dd37d74 100644
--- a/src/test/java/org/apache/commons/beanutils2/PassTestException.java
+++ b/src/test/java/org/apache/commons/beanutils2/PassTestException.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2;
-
/**
* Just a runtime exception. Useful for check that a method is called.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
index 2e6b656..9906692 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.util.HashMap;
import java.util.Map;
@@ -26,7 +24,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* JUnit Test Case containing microbenchmarks for PropertyUtils.
*
@@ -34,10 +31,8 @@ import junit.framework.TestSuite;
public class PropertyUtilsBenchCase extends TestCase {
-
-
/**
* Construct a new instance of this test case.
*
@@ -49,10 +44,8 @@ public class PropertyUtilsBenchCase extends TestCase {
}
-
-
// Basic loop counter
private long counter = 100000;
@@ -71,10 +64,8 @@ public class PropertyUtilsBenchCase extends TestCase {
// PropertyUtilsBean instance to be used
private PropertyUtilsBean pu = null;
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -130,7 +121,6 @@ public class PropertyUtilsBenchCase extends TestCase {
}
-
/**
* Return the tests included in this test suite.
*/
@@ -140,7 +130,6 @@ public class PropertyUtilsBenchCase extends TestCase {
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -157,11 +146,8 @@ public class PropertyUtilsBenchCase extends TestCase {
}
-
-
-
// Time copyProperties() from a bean
public void testCopyPropertiesBean() throws Exception {
@@ -194,7 +180,6 @@ public class PropertyUtilsBenchCase extends TestCase {
}
-
// Time copyProperties() from a DynaBean
public void testCopyPropertiesDyna() throws Exception {
@@ -227,7 +212,6 @@ public class PropertyUtilsBenchCase extends TestCase {
}
-
// Time copyProperties() from a Map
public void testCopyPropertiesMap() throws Exception {
@@ -260,8 +244,6 @@ public class PropertyUtilsBenchCase extends TestCase {
}
-
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
index 70468fa..dd75325 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
@@ -39,7 +37,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* <p>Test Case for the PropertyUtils class. The majority of these tests use
* instances of the TestBean class, so be sure to update the tests if you
@@ -69,10 +66,8 @@ import junit.framework.TestSuite;
public class PropertyUtilsTestCase extends TestCase {
-
-
/**
* The fully qualified class name of our private directly
* implemented interface.
@@ -80,7 +75,6 @@ public class PropertyUtilsTestCase extends TestCase {
private static final String PRIVATE_DIRECT_CLASS =
"org.apache.commons.beanutils2.priv.PrivateDirect";
-
/**
* The fully qualified class name of our private indirectly
* implemented interface.
@@ -88,44 +82,37 @@ public class PropertyUtilsTestCase extends TestCase {
private static final String PRIVATE_INDIRECT_CLASS =
"org.apache.commons.beanutils2.priv.PrivateIndirect";
-
/**
* The fully qualified class name of our test bean class.
*/
private static final String TEST_BEAN_CLASS =
"org.apache.commons.beanutils2.TestBean";
-
/**
* The basic test bean for each test.
*/
protected TestBean bean = null;
-
/**
* The "package private subclass" test bean for each test.
*/
protected TestBeanPackageSubclass beanPackageSubclass = null;
-
/**
* The test bean for private access tests.
*/
protected PrivateDirect beanPrivate = null;
-
/**
* The test bean for private access tests of subclasses.
*/
protected PrivateDirect beanPrivateSubclass = null;
-
/**
* The "public subclass" test bean for each test.
*/
protected TestBeanPublicSubclass beanPublicSubclass = null;
-
/**
* The set of properties that should be described.
*/
@@ -151,7 +138,6 @@ public class PropertyUtilsTestCase extends TestCase {
"stringProperty"
};
-
/**
* The set of property names we expect to have returned when calling
* {@code getPropertyDescriptors()}. You should update this list
@@ -178,10 +164,8 @@ public class PropertyUtilsTestCase extends TestCase {
"writeOnlyProperty",
};
-
-
/**
* Construct a new instance of this test case.
*
@@ -193,10 +177,8 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -221,7 +203,6 @@ public class PropertyUtilsTestCase extends TestCase {
PropertyUtils.clearDescriptors();
}
-
/**
* Return the tests included in this test suite.
*/
@@ -231,7 +212,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -247,11 +227,8 @@ public class PropertyUtilsTestCase extends TestCase {
PropertyUtils.resetBeanIntrospectors();
}
-
-
-
/**
* Test copyProperties() when the origin is a a {@code Map}.
*/
@@ -306,7 +283,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test the describe() method.
*/
@@ -346,7 +322,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on getPropertyDescriptor invalid arguments.
*/
@@ -372,7 +347,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive getPropertyDescriptor on property {@code booleanProperty}.
*/
@@ -383,7 +357,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive getPropertyDescriptor on property {@code doubleProperty}.
*/
@@ -394,7 +367,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive getPropertyDescriptor on property {@code floatProperty}.
*/
@@ -405,7 +377,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive getPropertyDescriptor on property {@code intProperty}.
*/
@@ -416,7 +387,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* <p>Negative tests on an invalid property with two different boolean
* getters (which is fine, according to the JavaBeans spec) but a
@@ -443,7 +413,6 @@ public class PropertyUtilsTestCase extends TestCase {
.contains(pd.getReadMethod().getName()));
}
-
/**
* Positive getPropertyDescriptor on property {@code longProperty}.
*/
@@ -493,7 +462,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
}
-
/**
* Positive getPropertyDescriptor on property
* {@code readOnlyProperty}.
@@ -505,7 +473,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive getPropertyDescriptor on property {@code booleanSecond}
* that uses an "is" method as the getter.
@@ -517,7 +484,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive getPropertyDescriptor on property {@code shortProperty}.
*/
@@ -528,7 +494,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive getPropertyDescriptor on property {@code stringProperty}.
*/
@@ -539,7 +504,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative getPropertyDescriptor on property {@code unknown}.
*/
@@ -549,7 +513,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive getPropertyDescriptor on property
* {@code writeOnlyProperty}.
@@ -561,7 +524,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive test for getPropertyDescriptors(). Each property name
* listed in {@code properties} should be returned exactly once.
@@ -590,7 +552,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on getPropertyDescriptors invalid arguments.
*/
@@ -607,7 +568,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on getIndexedProperty invalid arguments.
*/
@@ -715,7 +675,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive and negative tests on getIndexedProperty valid arguments.
*/
@@ -1022,7 +981,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getting an indexed value out of a multi-dimensional array
*/
@@ -1264,7 +1222,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
}
-
/**
* Test getting mapped values with slashes in the key. This is different
* from periods because slashes are not syntactically significant.
@@ -1307,7 +1264,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Positive and negative tests on getMappedProperty valid arguments.
*/
@@ -1401,7 +1357,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on getNestedProperty invalid arguments.
*/
@@ -1427,7 +1382,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a boolean property.
*/
@@ -1454,7 +1408,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a double property.
*/
@@ -1482,7 +1435,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a float property.
*/
@@ -1510,7 +1462,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on an int property.
*/
@@ -1537,7 +1488,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a long property.
*/
@@ -1564,7 +1514,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a read-only String property.
*/
@@ -1591,7 +1540,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a short property.
*/
@@ -1618,7 +1566,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getNestedProperty on a String property.
*/
@@ -1645,7 +1592,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test getNestedProperty on an unknown property.
*/
@@ -1704,7 +1650,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getPropertyType() on all kinds of properties.
*/
@@ -1820,7 +1765,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test accessing a public sub-bean of a package scope bean
*/
@@ -1848,7 +1792,6 @@ public class PropertyUtilsTestCase extends TestCase {
assertEquals("bar property", "bar-start", result);
}
-
/**
* Test getting accessible property reader methods for a specified
* list of properties of our standard test bean.
@@ -1859,7 +1802,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getting accessible property reader methods for a specified
* list of properties of a package private subclass of our standard
@@ -1871,7 +1813,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getting accessible property reader methods for a specified
* list of properties that are declared either directly or via
@@ -1923,7 +1864,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getting accessible property reader methods for a specified
* list of properties of a public subclass of our standard test bean.
@@ -1934,7 +1874,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on getSimpleProperty invalid arguments.
*/
@@ -1960,7 +1899,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a boolean property.
*/
@@ -1987,7 +1925,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a double property.
*/
@@ -2014,7 +1951,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a float property.
*/
@@ -2042,7 +1978,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test getSimpleProperty on an indexed property.
*/
@@ -2064,7 +1999,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on an int property.
*/
@@ -2091,7 +2025,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a long property.
*/
@@ -2118,7 +2051,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test getSimpleProperty on a nested property.
*/
@@ -2140,7 +2072,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a read-only String property.
*/
@@ -2167,7 +2098,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a short property.
*/
@@ -2194,7 +2124,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a String property.
*/
@@ -2221,7 +2150,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test getSimpleProperty on an unknown property.
*/
@@ -2244,7 +2172,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getSimpleProperty on a write-only String property.
*/
@@ -2267,7 +2194,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getting accessible property writer methods for a specified
* list of properties of our standard test bean.
@@ -2278,7 +2204,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getting accessible property writer methods for a specified
* list of properties of a package private subclass of our standard
@@ -2290,7 +2215,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test getting accessible property writer methods for a specified
* list of properties of a public subclass of our standard test bean.
@@ -2456,7 +2380,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
}
-
/**
* Test the mappedPropertyType of MappedPropertyDescriptor.
*/
@@ -2478,7 +2401,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on setIndexedProperty invalid arguments.
*/
@@ -2660,7 +2582,6 @@ public class PropertyUtilsTestCase extends TestCase {
assertEquals("AFTER", "SECOND-VALUE-1-UPDATED", ((Map<?, ?>)bean.getListIndexed().get(1)).get("SECOND-KEY-1"));
}
-
/**
* Positive and negative tests on setIndexedProperty valid arguments.
*/
@@ -3000,7 +2921,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on getMappedProperty invalid arguments.
*/
@@ -3073,7 +2993,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setting an indexed value out of a mapped array
*/
@@ -3226,7 +3145,6 @@ public class PropertyUtilsTestCase extends TestCase {
*/
public void testSetMappedPeriods() {
-
// -------- PropertyUtils.setMappedProperty()--------
bean.setMappedProperty("key.with.a.dot", "Special Value");
assertEquals("Can retrieve directly (A)",
@@ -3256,7 +3174,6 @@ public class PropertyUtilsTestCase extends TestCase {
fail("Thew exception: " + e);
}
-
// -------- PropertyUtils.setNestedProperty() --------
final TestBean testBean = new TestBean();
bean.setMappedObjects("nested.property", testBean);
@@ -3291,7 +3208,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
}
-
/**
* Corner cases on setNestedProperty invalid arguments.
*/
@@ -3317,7 +3233,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNextedProperty on a boolean property.
*/
@@ -3344,7 +3259,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a double property.
*/
@@ -3372,7 +3286,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a float property.
*/
@@ -3400,7 +3313,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a int property.
*/
@@ -3427,7 +3339,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a long property.
*/
@@ -3454,7 +3365,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a read-only String property.
*/
@@ -3479,7 +3389,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a short property.
*/
@@ -3507,7 +3416,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a String property.
*/
@@ -3534,7 +3442,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on an unknown property name.
*/
@@ -3558,7 +3465,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setNestedProperty on a write-only String property.
*/
@@ -3585,7 +3491,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Corner cases on setSimpleProperty invalid arguments.
*/
@@ -3611,7 +3516,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a boolean property.
*/
@@ -3638,7 +3542,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a double property.
*/
@@ -3666,7 +3569,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a float property.
*/
@@ -3694,7 +3596,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test setSimpleProperty on an indexed property.
*/
@@ -3717,7 +3618,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a int property.
*/
@@ -3744,7 +3644,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a long property.
*/
@@ -3771,7 +3670,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Negative test setSimpleProperty on a nested property.
*/
@@ -3794,7 +3692,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a read-only String property.
*/
@@ -3821,7 +3718,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a short property.
*/
@@ -3849,7 +3745,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a String property.
*/
@@ -3876,7 +3771,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on an unknown property name.
*/
@@ -3902,7 +3796,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Test setSimpleProperty on a write-only String property.
*/
@@ -3929,10 +3822,8 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
-
/**
* Base for testGetDescriptorXxxxx() series of tests.
*
@@ -3978,7 +3869,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Base for testGetReadMethod() series of tests.
*
@@ -4035,7 +3925,6 @@ public class PropertyUtilsTestCase extends TestCase {
}
-
/**
* Base for testGetWriteMethod() series of tests.
*
@@ -4046,7 +3935,6 @@ public class PropertyUtilsTestCase extends TestCase {
protected void testGetWriteMethod(final Object bean, final String properties[],
final String className) {
-
final PropertyDescriptor pd[] =
PropertyUtils.getPropertyDescriptors(bean);
for (final String propertie : properties) {
@@ -4144,7 +4032,6 @@ public class PropertyUtilsTestCase extends TestCase {
"Test#2",
nestedBean.getIndexedProperty(1).getTestString());
-
// test first calling indexed properties on a simple property
value = (NestedTestBean) PropertyUtils.getProperty(
diff --git a/src/test/java/org/apache/commons/beanutils2/TestBean.java b/src/test/java/org/apache/commons/beanutils2/TestBean.java
index 160a056..c270212 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestBean.java
@@ -15,17 +15,14 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
/**
* General purpose test bean for JUnit tests for the "beanutils" component.
*
@@ -102,7 +99,6 @@ public class TestBean implements Serializable {
-
/**
* A boolean property.
*/
@@ -116,7 +112,6 @@ public class TestBean implements Serializable {
this.booleanProperty = booleanProperty;
}
-
/**
* A boolean property that uses an "is" method for the getter.
*/
@@ -130,7 +125,6 @@ public class TestBean implements Serializable {
this.booleanSecond = booleanSecond;
}
-
/**
* A byte property.
*/
@@ -144,7 +138,6 @@ public class TestBean implements Serializable {
this.byteProperty = byteProperty;
}
-
/**
* A java.util.Date property.
*/
@@ -184,7 +177,6 @@ public class TestBean implements Serializable {
this.doubleProperty = doubleProperty;
}
-
/**
* An "indexed property" accessible via both array and subscript
* based getters and setters.
@@ -208,7 +200,6 @@ public class TestBean implements Serializable {
this.dupProperty = dupProperty;
}
-
/**
* A float property.
*/
@@ -222,7 +213,6 @@ public class TestBean implements Serializable {
this.floatProperty = floatProperty;
}
-
/**
* An integer array property accessed as an array.
*/
@@ -236,7 +226,6 @@ public class TestBean implements Serializable {
this.intArray = intArray;
}
-
/**
* An integer array property accessed as an indexed property.
*/
@@ -250,7 +239,6 @@ public class TestBean implements Serializable {
intIndexed[index] = value;
}
-
/**
* An integer property.
*/
@@ -264,7 +252,6 @@ public class TestBean implements Serializable {
this.intProperty = intProperty;
}
-
/**
* A List property accessed as an indexed property.
*/
@@ -274,7 +261,6 @@ public class TestBean implements Serializable {
return listIndexed;
}
-
/**
* A long property.
*/
@@ -288,7 +274,6 @@ public class TestBean implements Serializable {
this.longProperty = longProperty;
}
-
/**
* A mapped property with only a getter and setter for a Map.
*/
@@ -314,7 +299,6 @@ public class TestBean implements Serializable {
this.mapProperty = mapProperty;
}
-
/**
* A mapped property that has String keys and Object values.
*/
@@ -340,7 +324,6 @@ public class TestBean implements Serializable {
mappedObjects.put(key, value);
}
-
/**
* A mapped property that has String keys and String values.
*/
@@ -366,7 +349,6 @@ public class TestBean implements Serializable {
mappedProperty.put(key, value);
}
-
/**
* A mapped property that has String keys and int values.
*/
@@ -387,7 +369,6 @@ public class TestBean implements Serializable {
mappedIntProperty.put(key, value);
}
-
/**
* A nested reference to another test bean (populated as needed).
*/
@@ -457,7 +438,6 @@ public class TestBean implements Serializable {
this.nullProperty = nullProperty;
}
-
/**
* A read-only String property.
*/
@@ -467,7 +447,6 @@ public class TestBean implements Serializable {
return this.readOnlyProperty;
}
-
/**
* A short property.
*/
@@ -481,7 +460,6 @@ public class TestBean implements Serializable {
this.shortProperty = shortProperty;
}
-
/**
* A String array property accessed as a String.
*/
@@ -496,7 +474,6 @@ public class TestBean implements Serializable {
this.stringArray = stringArray;
}
-
/**
* A String array property accessed as an indexed property.
*/
@@ -529,7 +506,6 @@ public class TestBean implements Serializable {
this.stringProperty = stringProperty;
}
-
/**
* A write-only String property.
*/
@@ -543,10 +519,8 @@ public class TestBean implements Serializable {
this.writeOnlyProperty = writeOnlyProperty;
}
-
-
/**
* <p>An invalid property that has two boolean getters (getInvalidBoolean
* and isInvalidBoolean) plus a String setter (setInvalidBoolean). By the
@@ -573,18 +547,14 @@ public class TestBean implements Serializable {
}
}
-
-
-
/**
* A static variable that is accessed and updated via static methods
* for MethodUtils testing.
*/
private static int counter = 0;
-
/**
* Return the current value of the counter.
*/
@@ -594,7 +564,6 @@ public class TestBean implements Serializable {
}
-
/**
* Increment the current value of the counter by 1.
*/
diff --git a/src/test/java/org/apache/commons/beanutils2/TestBeanPackageSubclass.java b/src/test/java/org/apache/commons/beanutils2/TestBeanPackageSubclass.java
index 629d7f2..f18383b 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestBeanPackageSubclass.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestBeanPackageSubclass.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
/**
* This is a package private subclass of TestBean. All of our properties
* should still be accessible via reflection.
@@ -27,5 +25,4 @@ package org.apache.commons.beanutils2;
class TestBeanPackageSubclass extends TestBean {
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/TestBeanPublicSubclass.java b/src/test/java/org/apache/commons/beanutils2/TestBeanPublicSubclass.java
index 6c79dc3..5c41111 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestBeanPublicSubclass.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestBeanPublicSubclass.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
/**
* This is a public subclass of TestBean. All of our properties should still
* be accessible via reflection.
@@ -27,5 +25,4 @@ package org.apache.commons.beanutils2;
public class TestBeanPublicSubclass extends TestBean {
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
index 9dadbd7..5bf9f86 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.InvocationHandler;
@@ -41,7 +39,6 @@ import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Map;
-
/**
* <p>Mock object that implements enough of {@code java.sql.ResultSet}
* to exercise the {@link ResultSetDynaClass} functionality.</p>
@@ -50,16 +47,13 @@ import java.util.Map;
public class TestResultSet implements InvocationHandler {
-
-
/**
* Current row number (0 means "before the first one").
*/
protected int row = 0;
-
/**
* The constant (per run) value used to initialize date/time/timestamp.
*/
@@ -150,17 +144,14 @@ public class TestResultSet implements InvocationHandler {
-
public void close() throws SQLException {
// No action required
}
-
public ResultSetMetaData getMetaData() throws SQLException {
return resultSetMetaData;
}
-
public Object getObject(final String columnName) throws SQLException {
if (row > 5) {
throw new SQLException("No current row");
@@ -218,7 +209,6 @@ public class TestResultSet implements InvocationHandler {
return false;
}
-
public void updateObject(final String columnName, final Object x)
throws SQLException {
if (row > 5) {
@@ -227,70 +217,56 @@ public class TestResultSet implements InvocationHandler {
// FIXME - updateObject()
}
-
-
public boolean absolute(final int row) throws SQLException {
throw new UnsupportedOperationException();
}
-
public void afterLast() throws SQLException {
throw new UnsupportedOperationException();
}
-
public void beforeFirst() throws SQLException {
throw new UnsupportedOperationException();
}
-
public void cancelRowUpdates() throws SQLException {
throw new UnsupportedOperationException();
}
-
public void clearWarnings() throws SQLException {
throw new UnsupportedOperationException();
}
-
public void deleteRow() throws SQLException {
throw new UnsupportedOperationException();
}
-
public int findColumn(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean first() throws SQLException {
throw new UnsupportedOperationException();
}
-
public Array getArray(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Array getArray(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public InputStream getAsciiStream(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public InputStream getAsciiStream(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public BigDecimal getBigDecimal(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
@@ -302,12 +278,10 @@ public class TestResultSet implements InvocationHandler {
throw new UnsupportedOperationException();
}
-
public BigDecimal getBigDecimal(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
/** @deprecated */
@Deprecated
public BigDecimal getBigDecimal(final String columnName, final int scale)
@@ -315,636 +289,516 @@ public class TestResultSet implements InvocationHandler {
throw new UnsupportedOperationException();
}
-
public InputStream getBinaryStream(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public InputStream getBinaryStream(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Blob getBlob(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Blob getBlob(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean getBoolean(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean getBoolean(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public byte getByte(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public byte getByte(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public byte[] getBytes(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public byte[] getBytes(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Reader getCharacterStream(final int columnIndex)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public Reader getCharacterStream(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Clob getClob(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Clob getClob(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public int getConcurrency() throws SQLException {
throw new UnsupportedOperationException();
}
-
public String getCursorName() throws SQLException {
throw new UnsupportedOperationException();
}
-
public Date getDate(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Date getDate(final int columnIndex, final Calendar cal) throws SQLException {
throw new UnsupportedOperationException();
}
-
-
-
public Date getDate(final String columnName, final Calendar cal) throws SQLException {
throw new UnsupportedOperationException();
}
-
public double getDouble(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public double getDouble(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public int getFetchDirection() throws SQLException {
throw new UnsupportedOperationException();
}
-
public int getFetchSize() throws SQLException {
throw new UnsupportedOperationException();
}
-
public float getFloat(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public float getFloat(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public int getInt(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public int getInt(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public long getLong(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public long getLong(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Object getObject(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Object getObject(final int columnIndex, final Map<?, ?> map) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Object getObject(final String columnName, final Map<?, ?> map) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Ref getRef(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Ref getRef(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public int getRow() throws SQLException {
throw new UnsupportedOperationException();
}
-
public short getShort(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public short getShort(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Statement getStatement() throws SQLException {
throw new UnsupportedOperationException();
}
-
public String getString(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public String getString(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Time getTime(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Time getTime(final int columnIndex, final Calendar cal) throws SQLException {
throw new UnsupportedOperationException();
}
-
-
public Time getTime(final String columnName, final Calendar cal) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Timestamp getTimestamp(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public Timestamp getTimestamp(final int columnIndex, final Calendar cal)
throws SQLException {
throw new UnsupportedOperationException();
}
-
-
public Timestamp getTimestamp(final String columnName, final Calendar cal)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public int getType() throws SQLException {
throw new UnsupportedOperationException();
}
-
/** @deprecated */
@Deprecated
public InputStream getUnicodeStream(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
/** @deprecated */
@Deprecated
public InputStream getUnicodeStream(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public URL getURL(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public URL getURL(final String columnName) throws SQLException {
throw new UnsupportedOperationException();
}
-
public SQLWarning getWarnings() throws SQLException {
throw new UnsupportedOperationException();
}
-
public void insertRow() throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isAfterLast() throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isBeforeFirst() throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isFirst() throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isLast() throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean last() throws SQLException {
throw new UnsupportedOperationException();
}
-
public void moveToCurrentRow() throws SQLException {
throw new UnsupportedOperationException();
}
-
public void moveToInsertRow() throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean previous() throws SQLException {
throw new UnsupportedOperationException();
}
-
public void refreshRow() throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean relative(final int rows) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean rowDeleted() throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean rowInserted() throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean rowUpdated() throws SQLException {
throw new UnsupportedOperationException();
}
-
public void setFetchDirection(final int direction) throws SQLException {
throw new UnsupportedOperationException();
}
-
public void setFetchSize(final int size) throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateArray(final int columnPosition, final Array x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateArray(final String columnName, final Array x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateAsciiStream(final int columnPosition, final InputStream x, final int len)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateAsciiStream(final String columnName, final InputStream x, final int len)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateBigDecimal(final int columnPosition, final BigDecimal x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateBigDecimal(final String columnName, final BigDecimal x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateBinaryStream(final int columnPosition, final InputStream x, final int len)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateBinaryStream(final String columnName, final InputStream x, final int len)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateBlob(final int columnPosition, final Blob x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateBlob(final String columnName, final Blob x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateBoolean(final int columnPosition, final boolean x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateBoolean(final String columnName, final boolean x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateByte(final int columnPosition, final byte x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateByte(final String columnName, final byte x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateBytes(final int columnPosition, final byte x[])
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateBytes(final String columnName, final byte x[])
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateCharacterStream(final int columnPosition, final Reader x, final int len)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateCharacterStream(final String columnName, final Reader x, final int len)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateClob(final int columnPosition, final Clob x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateClob(final String columnName, final Clob x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateDate(final int columnPosition, final Date x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateDate(final String columnName, final Date x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateDouble(final int columnPosition, final double x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateDouble(final String columnName, final double x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateFloat(final int columnPosition, final float x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateFloat(final String columnName, final float x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateInt(final int columnPosition, final int x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateInt(final String columnName, final int x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateLong(final int columnPosition, final long x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateLong(final String columnName, final long x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateNull(final int columnPosition)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateNull(final String columnName)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateObject(final int columnPosition, final Object x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateObject(final int columnPosition, final Object x, final int scale)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateObject(final String columnName, final Object x, final int scale)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateRef(final int columnPosition, final Ref x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateRef(final String columnName, final Ref x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateRow() throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateShort(final int columnPosition, final short x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateShort(final String columnName, final short x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateString(final int columnPosition, final String x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateString(final String columnName, final String x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateTime(final int columnPosition, final Time x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateTime(final String columnName, final Time x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateTimestamp(final int columnPosition, final Timestamp x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public void updateTimestamp(final String columnName, final Timestamp x)
throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean wasNull() 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 a54ef98..a50ab81 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
-
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
@@ -26,7 +24,6 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Types;
-
/**
* <p>Mock object that implements enough of
* {@code java.sql.ResultSetMetaData}
@@ -36,10 +33,8 @@ import java.sql.Types;
public class TestResultSetMetaData implements InvocationHandler {
-
-
/**
* <p>Array of column names and class names for metadata.</p>
*/
@@ -59,7 +54,6 @@ public class TestResultSetMetaData implements InvocationHandler {
{ "timestampProperty", java.sql.Timestamp.class.getName() },
};
-
/**
* Factory method for creating {@link ResultSetMetaData} proxies.
*
@@ -107,12 +101,10 @@ public class TestResultSetMetaData implements InvocationHandler {
-
public String getColumnClassName(final int columnIndex) throws SQLException {
return metadata[columnIndex - 1][1];
}
-
public int getColumnCount() throws SQLException {
return metadata.length;
}
@@ -121,7 +113,6 @@ public class TestResultSetMetaData implements InvocationHandler {
return metadata[columnIndex - 1][0];
}
-
public Integer getColumnType(final int columnIndex) throws SQLException {
final String columnName = getColumnName(columnIndex);
int sqlType = Types.OTHER;
@@ -158,93 +149,74 @@ public class TestResultSetMetaData implements InvocationHandler {
return new Integer(sqlType);
}
-
-
public String getCatalogName(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public int getColumnDisplaySize(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public String getColumnLabel(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public String getColumnTypeName(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public int getPrecision(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public int getScale(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public String getSchemaName(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public String getTableName(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isAutoIncrement(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isCaseSensitive(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isCurrency(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isDefinitelyWritable(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public int isNullable(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isReadOnly(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isSearchable(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isSigned(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
public boolean isWritable(final int columnIndex) throws SQLException {
throw new UnsupportedOperationException();
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/ThrowExceptionConverter.java b/src/test/java/org/apache/commons/beanutils2/ThrowExceptionConverter.java
index 3338c6a..6a045e5 100644
--- a/src/test/java/org/apache/commons/beanutils2/ThrowExceptionConverter.java
+++ b/src/test/java/org/apache/commons/beanutils2/ThrowExceptionConverter.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
index 72eeb59..780cf89 100644
--- a/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2;
import java.io.ByteArrayInputStream;
@@ -26,7 +25,6 @@ import java.io.ObjectOutputStream;
import junit.framework.Test;
import junit.framework.TestSuite;
-
/**
* <p>Test Case for the {@code WrapDynaBean} implementation class.
* These tests were based on the ones in {@code PropertyUtilsTestCase}
@@ -36,13 +34,10 @@ import junit.framework.TestSuite;
public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
-
-
-
/**
* Construct a new instance of this test case.
*
@@ -54,10 +49,8 @@ public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -68,7 +61,6 @@ public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
}
-
/**
* Return the tests included in this test suite.
*/
@@ -78,7 +70,6 @@ public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -89,11 +80,8 @@ public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
}
-
-
-
/**
* The {@code set()} method.
*/
@@ -103,7 +91,6 @@ public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
}
-
/**
* Helper method for testing whether basic access to properties works as
* expected.
@@ -200,7 +187,6 @@ public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
fail("Exception: " + t);
}
-
try {
assertTrue("Can not see unknown key",
!bean.contains("mappedProperty", "Unknown Key"));
@@ -213,7 +199,6 @@ public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
}
-
/**
* The {@code remove()} method is not supported by the
* {@code WrapDynaBean} implementation class.
@@ -268,7 +253,6 @@ public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
assertTrue("Object type is AlphaBean", dynaBean.getInstance() instanceof AlphaBean);
}
-
/**
* Serialization and deserialization tests.
* (WrapDynaBean is now serializable, although WrapDynaClass still is not)
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira422TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira422TestCase.java
index 1857171..e4f64d8 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira422TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira422TestCase.java
@@ -31,7 +31,6 @@ import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
-
/**
* getPropertyType return null on second descendant class
* <p>
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira422bTestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira422bTestCase.java
index 2114bf4..36684b1 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira422bTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira422bTestCase.java
@@ -36,7 +36,6 @@ public class Jira422bTestCase {
assertEquals(String.class.getName(), propertyType.getName());
}
-
@Test
public void testSecondChildBean() throws Exception {
final RootBeanB bean = new SecondChildBeanB();
@@ -46,7 +45,6 @@ public class Jira422bTestCase {
}
-
class RootBeanB {
private String[] file;
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira492TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira492TestCase.java
index 4dd124c..cdcef9a 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira492TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira492TestCase.java
@@ -117,5 +117,4 @@ public class Jira492TestCase {
}
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
index 3b4609c..578ad81 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
@@ -73,7 +73,6 @@ public class ArrayConverterTestCase extends TestCase {
public void setUp() throws Exception {
}
-
/** Tear Down */
@@ -108,7 +107,6 @@ public class ArrayConverterTestCase extends TestCase {
longList.add(LONGArray[i]);
}
-
String msg = null;
// String --> int[]
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
index 5f2b15d..2a37d69 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
@@ -23,7 +23,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestSuite;
-
/**
* Test Case for the DoubleConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
index 5284e23..d9063a5 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
@@ -23,7 +23,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestSuite;
-
/**
* Test Case for the BigInteger class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java
index 0bafcec..463888e 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java
@@ -33,7 +33,6 @@ public class BooleanConverterTestCase extends TestCase {
"no", "n", "false", "off", "0"
};
-
public BooleanConverterTestCase(final String name) {
super(name);
}
@@ -70,7 +69,6 @@ public class BooleanConverterTestCase extends TestCase {
new String[] {"NO", "fAlSe"});
}
-
/**
* Tests a conversion to another target type. This should not be possible.
*/
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
index 57d3246..4ea0572 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
@@ -21,7 +21,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestSuite;
-
/**
* Test Case for the ByteConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java
index 4b52657..6bf9e91 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java
@@ -56,7 +56,6 @@ public class CharacterConverterTestCase extends TestCase {
public void tearDown() throws Exception {
}
-
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java
index 8e295a5..31114f9 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java
@@ -56,7 +56,6 @@ public class ClassConverterTestCase extends TestCase {
public void tearDown() throws Exception {
}
-
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java
index 8d0f5e9..d5e2cda 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java
@@ -32,7 +32,6 @@ public class ClassReloaderTestCase extends TestCase {
public static class DummyClass {
}
-
public static TestSuite suite() {
return new TestSuite(ClassReloaderTestCase.class);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
index bf0118e..b448254 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
@@ -21,7 +21,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestSuite;
-
/**
* Test Case for the DoubleConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java
index 0883c1b..d1824dc 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.converters;
-
import java.time.Duration;
import org.apache.commons.beanutils2.ConversionException;
@@ -26,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the DurationConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/EnumConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/EnumConverterTestCase.java
index 3a100b9..f55ee3f 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/EnumConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/EnumConverterTestCase.java
@@ -17,15 +17,12 @@
package org.apache.commons.beanutils2.converters;
-
-
import org.apache.commons.beanutils2.ConversionException;
import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the EnumConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java
index 03d4ebe..ed2d627 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java
@@ -25,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the FileConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
index 2bed384..080c9b9 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
@@ -21,7 +21,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestSuite;
-
/**
* Test Case for the FloatConverter class.
*
@@ -98,7 +97,6 @@ public class FloatConverterTestCase extends NumberConverterTestBase {
}
}
-
public void testSimpleConversion() throws Exception {
final String[] message= {
"from String",
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
index f1bd9ba..82806c6 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
@@ -22,7 +22,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestSuite;
-
/**
* Test Case for the IntegerConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/LocalTimeConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/LocalTimeConverterTestCase.java
index d375bab..b1574f5 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/LocalTimeConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/LocalTimeConverterTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.converters;
-
import java.time.LocalTime;
import org.apache.commons.beanutils2.ConversionException;
@@ -26,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the LocalTimeConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
index 795f0cb..4250475 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
@@ -21,7 +21,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestSuite;
-
/**
* Test Case for the LongConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/MonthDayConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/MonthDayConverterTestCase.java
index 0c87542..10e7bf3 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/MonthDayConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/MonthDayConverterTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.converters;
-
import java.time.MonthDay;
import org.apache.commons.beanutils2.ConversionException;
@@ -26,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the MonthDayConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/NumberConverterTestBase.java b/src/test/java/org/apache/commons/beanutils2/converters/NumberConverterTestBase.java
index 658c6e9..19010f3 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/NumberConverterTestBase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/NumberConverterTestBase.java
@@ -27,7 +27,6 @@ import org.apache.commons.beanutils2.ConversionException;
import junit.framework.TestCase;
-
/**
* Abstract base for <Number>Converter classes.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java
index 5925fbf..37151bb 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.converters;
-
import java.time.OffsetTime;
import org.apache.commons.beanutils2.ConversionException;
@@ -26,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the OffsetTimeConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java
index de6dc27..1cd2297 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java
@@ -17,8 +17,6 @@
package org.apache.commons.beanutils2.converters;
-
-
import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -29,7 +27,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the UUIDConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java
index 3b7c247..aa95bfe 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.converters;
-
import java.time.Period;
import org.apache.commons.beanutils2.ConversionException;
@@ -26,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the PeriodConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
index bd5b0a2..ff88b0a 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
@@ -21,7 +21,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestSuite;
-
/**
* Test Case for the ShortConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java
index 6698abe..2ef6afe 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java
@@ -120,7 +120,6 @@ public class SqlTimestampConverterTestCase extends DateConverterTestBase {
Locale.setDefault(Locale.US);
isUSFormatWithComma();
-
// Create & Configure the Converter
final DateTimeConverter converter = makeConverter();
converter.setUseLocaleFormat(true);
@@ -136,7 +135,6 @@ public class SqlTimestampConverterTestCase extends DateConverterTestBase {
testString = "3/21/06 3:06 PM";
}
-
// Valid String --> Type Conversion
final Object expected = toType(testString, pattern, null);
validConversion(converter, expected, testString);
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java
index 9858f61..7aa350e 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java
@@ -25,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the URIConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/URLConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/URLConverterTestCase.java
index 1d89f77..545ba67 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/URLConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/URLConverterTestCase.java
@@ -25,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the URLConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java
index 6ae4b93..9b17e55 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.converters;
-
import java.util.UUID;
import org.apache.commons.beanutils2.ConversionException;
@@ -26,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the UUIDConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java
index 7166247..1482862 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.converters;
-
import java.time.Year;
import org.apache.commons.beanutils2.ConversionException;
@@ -26,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the YearConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/YearMonthConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/YearMonthConverterTestCase.java
index e9a7355..6b34cfd 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/YearMonthConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/YearMonthConverterTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.converters;
-
import java.time.YearMonth;
import org.apache.commons.beanutils2.ConversionException;
@@ -26,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the YearMonthConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ZoneIdConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ZoneIdConverterTestCase.java
index 03529c7..21bd561 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ZoneIdConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ZoneIdConverterTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.converters;
-
import java.time.ZoneId;
import org.apache.commons.beanutils2.ConversionException;
@@ -26,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the ZoneIdConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java
index 5c02328..74d7635 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.converters;
-
import java.time.ZoneOffset;
import org.apache.commons.beanutils2.ConversionException;
@@ -26,7 +25,6 @@ import org.apache.commons.beanutils2.Converter;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* Test Case for the ZoneOffsetConverter class.
*
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java
index 3bc6562..a8b947c 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java
@@ -41,10 +41,8 @@ public class LocaleBeanUtilsTestCase extends TestCase {
super(name);
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -52,7 +50,6 @@ public class LocaleBeanUtilsTestCase extends TestCase {
public void setUp() {
}
-
/**
* Return the tests included in this test suite.
* @return Test Suite
@@ -61,7 +58,6 @@ public class LocaleBeanUtilsTestCase extends TestCase {
return new TestSuite(LocaleBeanUtilsTestCase.class);
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -69,7 +65,6 @@ public class LocaleBeanUtilsTestCase extends TestCase {
public void tearDown() {
}
-
/**
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 6706181..bf861af 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
@@ -17,7 +17,6 @@
package org.apache.commons.beanutils2.locale;
-
import java.sql.Date;
import java.sql.Time;
import java.sql.Timestamp;
@@ -30,7 +29,6 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
/**
* <p>
* Test Case for the LocaleConvertUtils class.
@@ -47,7 +45,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
-
/**
* Construct a new instance of this test case.
*
@@ -57,10 +54,8 @@ public class LocaleConvertUtilsTestCase extends TestCase {
super(name);
}
-
-
/**
* Set up instance variables required by this test case.
*/
@@ -75,10 +70,8 @@ public class LocaleConvertUtilsTestCase extends TestCase {
// could be commas instead of stops in Europe.
m_decimalSeparator = result.charAt(1);
-
}
-
/**
* Return the tests included in this test suite.
*/
@@ -86,7 +79,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
return new TestSuite(LocaleConvertUtilsTestCase.class);
}
-
/**
* Tear down instance variables required by this test case.
*/
@@ -95,10 +87,8 @@ public class LocaleConvertUtilsTestCase extends TestCase {
// No action required
}
-
-
/**
* Negative String to primitive integer array tests.
*/
@@ -126,7 +116,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
}
-
/**
* Negative scalar conversion tests. These rely on the standard
* default value conversions in LocaleConvertUtils.
@@ -141,7 +130,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
...
*/
-
try {
LocaleConvertUtils.convert("foo", Byte.TYPE);
fail("Should have thrown conversion exception (1)");
@@ -237,7 +225,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
}
-
/**
* Negative String to String array tests.
*/
@@ -252,7 +239,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
checkStringArray(value, stringArray);
}
-
/**
* Test conversion of object to string for arrays - .
*/
@@ -282,7 +268,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
}
-
/**
* Test conversion of object to string for scalars.
*/
@@ -313,7 +298,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
}
-
/**
* Positive array conversion tests.
*/
@@ -339,7 +323,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
assertEquals(results2[2], 300);
}
-
/**
* Positive String to primitive integer array tests.
*/
@@ -376,7 +359,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
checkIntegerArray(value, intArray2);
}
-
/**
* Positive scalar conversion tests.
*/
@@ -535,7 +517,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
}
-
/**
* Positive String to String array tests.
*/
@@ -640,7 +621,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
-
private void checkIntegerArray(final Object value, final int intArray[]) {
assertNotNull("Returned value is not null", value);
@@ -655,7 +635,6 @@ public class LocaleConvertUtilsTestCase extends TestCase {
}
-
private void checkStringArray(final Object value, final String stringArray[]) {
assertNotNull("Returned value is not null", value);
@@ -671,6 +650,5 @@ public class LocaleConvertUtilsTestCase extends TestCase {
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/BaseLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/converters/BaseLocaleConverterTestCase.java
index 85afc97..6774c85 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/BaseLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/converters/BaseLocaleConverterTestCase.java
@@ -32,7 +32,6 @@ import junit.framework.TestCase;
public class BaseLocaleConverterTestCase extends TestCase {
-
// Original Default Locale
protected Locale origLocale;
@@ -42,7 +41,6 @@ public class BaseLocaleConverterTestCase extends TestCase {
protected Object defaultValue;
protected Object expectedValue;
-
// Localized values
protected Locale localizedLocale;
protected String localizedDecimalPattern;
@@ -57,7 +55,6 @@ public class BaseLocaleConverterTestCase extends TestCase {
protected String defaultDecimalValue;
protected String defaultIntegerValue;
-
// Expected values
protected String expectedDecimalValue;
protected String expectedIntegerValue;
@@ -110,7 +107,6 @@ public class BaseLocaleConverterTestCase extends TestCase {
Locale.setDefault(defaultLocale);
}
-
}
/**
@@ -132,7 +128,6 @@ public class BaseLocaleConverterTestCase extends TestCase {
}
-
/**
@@ -177,7 +172,6 @@ public class BaseLocaleConverterTestCase extends TestCase {
}
assertEquals("Check conversion value without pattern " + msgId, expectedValue, result);
-
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverterTestCase.java
index 18eb556..19eb0c7 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/converters/BigDecimalLocaleConverterTestCase.java
@@ -26,8 +26,6 @@ import java.math.BigDecimal;
public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCase {
-
-
public BigDecimalLocaleConverterTestCase(final String name) {
@@ -57,7 +55,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
super.tearDown();
}
-
/**
@@ -71,13 +68,11 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
localizedDecimalPattern,
true);
-
convertValueNoPattern(converter, "(A)", localizedDecimalValue, expectedValue);
convertValueWithPattern(converter, "(A)", localizedDecimalValue, localizedDecimalPattern, expectedValue);
convertInvalid(converter, "(A)", defaultValue);
convertNull(converter, "(A)", defaultValue);
-
// **************************************************************************
// Convert value in the wrong format - maybe you would expect it to throw an
// exception and return the default - it doesn't, DecimalFormat parses it
@@ -86,7 +81,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
// **************************************************************************
convertValueNoPattern(converter, "(B)", defaultDecimalValue, new BigDecimal("1.234"));
-
// **************************************************************************
// Convert with non-localized pattern - this causes an exception in parse()
// but it gets swallowed in convert() method and returns default.
@@ -96,7 +90,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
// **************************************************************************
convertValueWithPattern(converter, "(B)", localizedDecimalValue, defaultDecimalPattern, defaultValue);
-
// **************************************************************************
// Convert with specified type
//
@@ -106,14 +99,12 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
// **************************************************************************
//convertValueToType(converter, "(B)", Double.class, localizedDecimalValue, localizedDecimalPattern, expectedValue);
-
// ------------- Construct with non-localized pattern ------------
converter = new BigDecimalLocaleConverter(defaultValue,
localizedLocale,
defaultDecimalPattern,
false);
-
convertValueNoPattern(converter, "(C)", localizedDecimalValue, expectedValue);
convertValueWithPattern(converter, "(C)", localizedDecimalValue, defaultDecimalPattern, expectedValue);
convertInvalid(converter, "(C)", defaultValue);
@@ -157,7 +148,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -174,10 +164,8 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
convertInvalid(converter, null);
convertNull(converter, null);
-
}
-
/**
* Test Converter(Locale, locPattern) constructor
*/
@@ -192,7 +180,6 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -259,7 +246,5 @@ public class BigDecimalLocaleConverterTestCase extends BaseLocaleConverterTestCa
}
-
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverterTestCase.java
index 978c170..cc07a53 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/converters/BigIntegerLocaleConverterTestCase.java
@@ -28,8 +28,6 @@ import org.apache.commons.beanutils2.ConversionException;
public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase {
-
-
public BigIntegerLocaleConverterTestCase(final String name) {
@@ -59,7 +57,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
super.tearDown();
}
-
/**
@@ -73,13 +70,11 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
localizedIntegerPattern,
true);
-
convertValueNoPattern(converter, "(A)", localizedIntegerValue, expectedValue);
convertValueWithPattern(converter, "(A)", localizedIntegerValue, localizedIntegerPattern, expectedValue);
convertInvalid(converter, "(A)", defaultValue);
convertNull(converter, "(A)", defaultValue);
-
// **************************************************************************
// Convert value in the wrong format - maybe you would expect it to throw an
// exception and return the default - it doesn't, DecimalFormat parses it
@@ -88,7 +83,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
// **************************************************************************
convertValueNoPattern(converter, "(B)", defaultIntegerValue, new BigInteger("1"));
-
// **************************************************************************
// Convert with non-localized pattern - unlike the equivalent BigDecimal Test Case
// it doesn't causes an exception in parse() - DecimalFormat parses it
@@ -97,7 +91,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
// **************************************************************************
convertValueWithPattern(converter, "(B)", localizedIntegerValue, defaultIntegerPattern, new BigInteger("1"));
-
// **************************************************************************
// Convert with specified type
//
@@ -107,14 +100,12 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
// **************************************************************************
//convertValueToType(converter, "(B)", Double.class, localizedIntegerValue, localizedIntegerPattern, expectedValue);
-
// ------------- Construct with non-localized pattern ------------
converter = new BigIntegerLocaleConverter(defaultValue,
localizedLocale,
defaultIntegerPattern,
false);
-
convertValueNoPattern(converter, "(C)", localizedIntegerValue, expectedValue);
convertValueWithPattern(converter, "(C)", localizedIntegerValue, defaultIntegerPattern, expectedValue);
convertInvalid(converter, "(C)", defaultValue);
@@ -158,7 +149,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -175,10 +165,8 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
convertInvalid(converter, null);
convertNull(converter, null);
-
}
-
/**
* Test Converter(Locale, locPattern) constructor
*/
@@ -193,7 +181,6 @@ public class BigIntegerLocaleConverterTestCase extends BaseLocaleConverterTestCa
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverterTestCase.java
index 8f50474..69bbafd 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/converters/ByteLocaleConverterTestCase.java
@@ -50,7 +50,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
expectedDecimalValue = "123.56";
expectedIntegerValue = "123";
-
defaultValue = new Byte("99");
expectedValue = new Byte(expectedIntegerValue);
@@ -64,7 +63,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
super.tearDown();
}
-
/**
@@ -78,13 +76,11 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
localizedIntegerPattern,
true);
-
convertValueNoPattern(converter, "(A)", localizedIntegerValue, expectedValue);
convertValueWithPattern(converter, "(A)", localizedIntegerValue, localizedIntegerPattern, expectedValue);
convertInvalid(converter, "(A)", defaultValue);
convertNull(converter, "(A)", defaultValue);
-
// **************************************************************************
// Convert value in the wrong format - maybe you would expect it to throw an
// exception and return the default - it doesn't, DecimalFormat parses it
@@ -93,14 +89,12 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
convertValueNoPattern(converter, "(B)", defaultIntegerValue, new Byte("0"));
-
// **************************************************************************
// Convert with non-localized pattern
// **************************************************************************
convertValueWithPattern(converter, "(B)", "123", defaultIntegerPattern, new Byte("123"));
convertValueWithPattern(converter, "(B-2)", localizedIntegerValue, defaultIntegerPattern, defaultValue);
-
// **************************************************************************
// Convert with specified type
//
@@ -110,14 +104,12 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
//convertValueToType(converter, "(B)", Double.class, localizedIntegerValue, localizedIntegerPattern, expectedValue);
-
// ------------- Construct with non-localized pattern ------------
converter = new ByteLocaleConverter(defaultValue,
localizedLocale,
defaultIntegerPattern,
false);
-
convertValueNoPattern(converter, "(C)", localizedIntegerValue, expectedValue);
convertValueWithPattern(converter, "(C)", localizedIntegerValue, defaultIntegerPattern, expectedValue);
convertInvalid(converter, "(C)", defaultValue);
@@ -161,7 +153,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -178,10 +169,8 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
-
/**
* Test Converter(Locale, locPattern) constructor
*/
@@ -196,7 +185,6 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -263,7 +251,5 @@ public class ByteLocaleConverterTestCase extends BaseLocaleConverterTestCase {
}
-
-
}
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 507e1f5..7540b36 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
@@ -64,7 +64,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
final String version = System.getProperty("java.specification.version");
log.debug("JDK Version "+version);
-
try {
final SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
expectedValue = format.parse("20041001");
@@ -110,7 +109,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
super.tearDown();
}
-
public void testSetLenient() {
@@ -219,13 +217,11 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
localizedDatePattern,
true);
-
convertValueNoPattern(converter, "(A)", localizedDateValue, expectedValue);
convertValueWithPattern(converter, "(A)", localizedDateValue, localizedDatePattern, expectedValue);
convertInvalid(converter, "(A)", defaultValue);
convertNull(converter, "(A)", defaultValue);
-
// Convert value in the wrong format - should return default value
convertValueNoPattern(converter, "(B)", defaultDateValue, defaultValue);
@@ -241,14 +237,12 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
//convertValueToType(converter, "(B)", String.class, localizedDateValue, localizedDatePattern, expectedValue);
-
// ------------- Construct with non-localized pattern ------------
converter = new DateLocaleConverter(defaultValue,
localizedLocale,
defaultDatePattern,
false);
-
convertValueNoPattern(converter, "(C)", localizedDateValue, expectedValue);
convertValueWithPattern(converter, "(C)", localizedDateValue, defaultDatePattern, expectedValue);
convertInvalid(converter, "(C)", defaultValue);
@@ -292,7 +286,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -309,10 +302,8 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
-
/**
* Test Converter(Locale, locPattern) constructor
*/
@@ -333,7 +324,6 @@ public class DateLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverterTestCase.java
index e6082c6..1a8e4e5 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverterTestCase.java
@@ -24,8 +24,6 @@ package org.apache.commons.beanutils2.locale.converters;
public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
-
-
public DoubleLocaleConverterTestCase(final String name) {
@@ -55,7 +53,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
super.tearDown();
}
-
/**
@@ -69,13 +66,11 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
localizedDecimalPattern,
true);
-
convertValueNoPattern(converter, "(A)", localizedDecimalValue, expectedValue);
convertValueWithPattern(converter, "(A)", localizedDecimalValue, localizedDecimalPattern, expectedValue);
convertInvalid(converter, "(A)", defaultValue);
convertNull(converter, "(A)", defaultValue);
-
// **************************************************************************
// Convert value in the wrong format - maybe you would expect it to throw an
// exception and return the default - it doesn't, DecimalFormat parses it
@@ -84,7 +79,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
convertValueNoPattern(converter, "(B)", defaultDecimalValue, new Double("1.234"));
-
// **************************************************************************
// Convert with non-localized pattern - this causes an exception in parse()
// but it gets swallowed in convert() method and returns default.
@@ -94,7 +88,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
convertValueWithPattern(converter, "(B)", localizedDecimalValue, defaultDecimalPattern, defaultValue);
-
// **************************************************************************
// Convert with specified type
//
@@ -104,14 +97,12 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
//convertValueToType(converter, "(B)", Integer.class, localizedDecimalValue, localizedDecimalPattern, expectedValue);
-
// ------------- Construct with non-localized pattern ------------
converter = new DoubleLocaleConverter(defaultValue,
localizedLocale,
defaultDecimalPattern,
false);
-
convertValueNoPattern(converter, "(C)", localizedDecimalValue, expectedValue);
convertValueWithPattern(converter, "(C)", localizedDecimalValue, defaultDecimalPattern, expectedValue);
convertInvalid(converter, "(C)", defaultValue);
@@ -155,7 +146,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -172,10 +162,8 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
-
/**
* Test Converter(Locale, locPattern) constructor
*/
@@ -190,7 +178,6 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -257,7 +244,5 @@ public class DoubleLocaleConverterTestCase extends BaseLocaleConverterTestCase {
}
-
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverterTestCase.java
index 621ec7f..f7ac68d 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverterTestCase.java
@@ -30,8 +30,6 @@ import org.apache.commons.beanutils2.locale.LocaleConvertUtils;
public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
-
-
public FloatLocaleConverterTestCase(final String name) {
@@ -61,7 +59,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
super.tearDown();
}
-
/**
@@ -75,13 +72,11 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
localizedDecimalPattern,
true);
-
convertValueNoPattern(converter, "(A)", localizedDecimalValue, expectedValue);
convertValueWithPattern(converter, "(A)", localizedDecimalValue, localizedDecimalPattern, expectedValue);
convertInvalid(converter, "(A)", defaultValue);
convertNull(converter, "(A)", defaultValue);
-
// **************************************************************************
// Convert value in the wrong format - maybe you would expect it to throw an
// exception and return the default - it doesn't, DecimalFormat parses it
@@ -90,7 +85,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
convertValueNoPattern(converter, "(B)", defaultDecimalValue, new Float("1.234"));
-
// **************************************************************************
// Convert with non-localized pattern - this causes an exception in parse()
// but it gets swallowed in convert() method and returns default.
@@ -100,7 +94,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
convertValueWithPattern(converter, "(B)", localizedDecimalValue, defaultDecimalPattern, defaultValue);
-
// **************************************************************************
// Convert with specified type
//
@@ -110,14 +103,12 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
//convertValueToType(converter, "(B)", Integer.class, localizedDecimalValue, localizedDecimalPattern, expectedValue);
-
// ------------- Construct with non-localized pattern ------------
converter = new FloatLocaleConverter(defaultValue,
localizedLocale,
defaultDecimalPattern,
false);
-
convertValueNoPattern(converter, "(C)", localizedDecimalValue, expectedValue);
convertValueWithPattern(converter, "(C)", localizedDecimalValue, defaultDecimalPattern, expectedValue);
convertInvalid(converter, "(C)", defaultValue);
@@ -161,7 +152,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -178,10 +168,8 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
-
/**
* Test Converter(Locale, locPattern) constructor
*/
@@ -196,7 +184,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -278,7 +265,6 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
assertEquals("Negative Float.MAX_VALUE", new Float(Float.MAX_VALUE * -1), converter.convert(fmt.format(Float.MAX_VALUE * -1)));
assertEquals("Negative Float.MIN_VALUE", new Float(Float.MIN_VALUE * -1), converter.convert(fmt.format(Float.MIN_VALUE * -1)));
-
try {
converter.convert(fmt.format((double)Float.MAX_VALUE * (double)10));
fail("Positive Too Large should throw ConversionException");
@@ -319,6 +305,5 @@ public class FloatLocaleConverterTestCase extends BaseLocaleConverterTestCase {
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java
index ed1970c..588ea61 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/converters/IntegerLocaleConverterTestCase.java
@@ -24,8 +24,6 @@ package org.apache.commons.beanutils2.locale.converters;
public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase {
-
-
public IntegerLocaleConverterTestCase(final String name) {
@@ -55,7 +53,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
super.tearDown();
}
-
/**
@@ -69,13 +66,11 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
localizedIntegerPattern,
true);
-
convertValueNoPattern(converter, "(A)", localizedIntegerValue, expectedValue);
convertValueWithPattern(converter, "(A)", localizedIntegerValue, localizedIntegerPattern, expectedValue);
convertInvalid(converter, "(A)", defaultValue);
convertNull(converter, "(A)", defaultValue);
-
// **************************************************************************
// Convert value in the wrong format - maybe you would expect it to throw an
// exception and return the default - it doesn't, DecimalFormat parses it
@@ -84,7 +79,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
// **************************************************************************
convertValueNoPattern(converter, "(B)", defaultIntegerValue, new Integer("1"));
-
// **************************************************************************
// Convert with non-localized pattern - unlike the equivalent BigDecimal Test Case
// it doesn't causes an exception in parse() - DecimalFormat parses it
@@ -93,7 +87,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
// **************************************************************************
convertValueWithPattern(converter, "(B)", localizedIntegerValue, defaultIntegerPattern, new Integer("1"));
-
// **************************************************************************
// Convert with specified type
//
@@ -103,14 +96,12 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
// **************************************************************************
//convertValueToType(converter, "(B)", Double.class, localizedIntegerValue, localizedIntegerPattern, expectedValue);
-
// ------------- Construct with non-localized pattern ------------
converter = new IntegerLocaleConverter(defaultValue,
localizedLocale,
defaultIntegerPattern,
false);
-
convertValueNoPattern(converter, "(C)", localizedIntegerValue, expectedValue);
convertValueWithPattern(converter, "(C)", localizedIntegerValue, defaultIntegerPattern, expectedValue);
convertInvalid(converter, "(C)", defaultValue);
@@ -154,7 +145,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -171,10 +161,8 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
convertInvalid(converter, null);
convertNull(converter, null);
-
}
-
/**
* Test Converter(Locale, locPattern) constructor
*/
@@ -189,7 +177,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -256,7 +243,6 @@ public class IntegerLocaleConverterTestCase extends BaseLocaleConverterTestCase
}
-
/**
* Test Converting a number
*/
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java
index cad28de..1c78423 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/converters/LongLocaleConverterTestCase.java
@@ -24,8 +24,6 @@ package org.apache.commons.beanutils2.locale.converters;
public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
-
-
public LongLocaleConverterTestCase(final String name) {
@@ -55,7 +53,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
super.tearDown();
}
-
/**
@@ -69,13 +66,11 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
localizedIntegerPattern,
true);
-
convertValueNoPattern(converter, "(A)", localizedIntegerValue, expectedValue);
convertValueWithPattern(converter, "(A)", localizedIntegerValue, localizedIntegerPattern, expectedValue);
convertInvalid(converter, "(A)", defaultValue);
convertNull(converter, "(A)", defaultValue);
-
// **************************************************************************
// Convert value in the wrong format - maybe you would expect it to throw an
// exception and return the default - it doesn't, DecimalFormat parses it
@@ -84,7 +79,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
convertValueNoPattern(converter, "(B)", defaultIntegerValue, new Long("1"));
-
// **************************************************************************
// Convert with non-localized pattern - unlike the equivalent BigDecimal Test Case
// it doesn't causes an exception in parse() - DecimalFormat parses it
@@ -93,7 +87,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
convertValueWithPattern(converter, "(B)", localizedIntegerValue, defaultIntegerPattern, new Long("1"));
-
// **************************************************************************
// Convert with specified type
//
@@ -103,14 +96,12 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
//convertValueToType(converter, "(B)", Double.class, localizedIntegerValue, localizedIntegerPattern, expectedValue);
-
// ------------- Construct with non-localized pattern ------------
converter = new LongLocaleConverter(defaultValue,
localizedLocale,
defaultIntegerPattern,
false);
-
convertValueNoPattern(converter, "(C)", localizedIntegerValue, expectedValue);
convertValueWithPattern(converter, "(C)", localizedIntegerValue, defaultIntegerPattern, expectedValue);
convertInvalid(converter, "(C)", defaultValue);
@@ -154,7 +145,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -171,10 +161,8 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
-
/**
* Test Converter(Locale, locPattern) constructor
*/
@@ -189,7 +177,6 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -256,7 +243,5 @@ public class LongLocaleConverterTestCase extends BaseLocaleConverterTestCase {
}
-
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverterTestCase.java
index 45efbb5..971684e 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/converters/ShortLocaleConverterTestCase.java
@@ -24,8 +24,6 @@ package org.apache.commons.beanutils2.locale.converters;
public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
-
-
public ShortLocaleConverterTestCase(final String name) {
@@ -55,7 +53,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
super.tearDown();
}
-
/**
@@ -69,13 +66,11 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
localizedIntegerPattern,
true);
-
convertValueNoPattern(converter, "(A)", localizedIntegerValue, expectedValue);
convertValueWithPattern(converter, "(A)", localizedIntegerValue, localizedIntegerPattern, expectedValue);
convertInvalid(converter, "(A)", defaultValue);
convertNull(converter, "(A)", defaultValue);
-
// **************************************************************************
// Convert value in the wrong format - maybe you would expect it to throw an
// exception and return the default - it doesn't, DecimalFormat parses it
@@ -84,7 +79,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
convertValueNoPattern(converter, "(B)", defaultIntegerValue, new Short("1"));
-
// **************************************************************************
// Convert with non-localized pattern - unlike the equivalent BigDecimal Test Case
// it doesn't causes an exception in parse() - DecimalFormat parses it
@@ -93,7 +87,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
convertValueWithPattern(converter, "(B)", localizedIntegerValue, defaultIntegerPattern, new Short("1"));
-
// **************************************************************************
// Convert with specified type
//
@@ -103,14 +96,12 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
// **************************************************************************
//convertValueToType(converter, "(B)", Double.class, localizedIntegerValue, localizedIntegerPattern, expectedValue);
-
// ------------- Construct with non-localized pattern ------------
converter = new ShortLocaleConverter(defaultValue,
localizedLocale,
defaultIntegerPattern,
false);
-
convertValueNoPattern(converter, "(C)", localizedIntegerValue, expectedValue);
convertValueWithPattern(converter, "(C)", localizedIntegerValue, defaultIntegerPattern, expectedValue);
convertInvalid(converter, "(C)", defaultValue);
@@ -154,7 +145,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -171,10 +161,8 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
-
/**
* Test Converter(Locale, locPattern) constructor
*/
@@ -189,7 +177,6 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
convertInvalid(converter, null);
convertNull(converter, null);
-
}
/**
@@ -256,7 +243,5 @@ public class ShortLocaleConverterTestCase extends BaseLocaleConverterTestCase {
}
-
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/memoryleaktests/pojotests/SomeMappedPojo.java b/src/test/java/org/apache/commons/beanutils2/memoryleaktests/pojotests/SomeMappedPojo.java
index b6a6291..9fe08bf 100644
--- a/src/test/java/org/apache/commons/beanutils2/memoryleaktests/pojotests/SomeMappedPojo.java
+++ b/src/test/java/org/apache/commons/beanutils2/memoryleaktests/pojotests/SomeMappedPojo.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
*/
public class SomeMappedPojo {
-
private HashMap<String, String> mappedProperty = null;
public String getMappedProperty(final String key) {
diff --git a/src/test/java/org/apache/commons/beanutils2/memoryleaktests/pojotests/SomePojo.java b/src/test/java/org/apache/commons/beanutils2/memoryleaktests/pojotests/SomePojo.java
index fb226ee..2a8441f 100644
--- a/src/test/java/org/apache/commons/beanutils2/memoryleaktests/pojotests/SomePojo.java
+++ b/src/test/java/org/apache/commons/beanutils2/memoryleaktests/pojotests/SomePojo.java
@@ -22,7 +22,6 @@ package org.apache.commons.beanutils2.memoryleaktests.pojotests;
*/
public class SomePojo {
-
String name = "initialValue";
public void setName(final String name) {
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PackageBean.java b/src/test/java/org/apache/commons/beanutils2/priv/PackageBean.java
index 05d506f..e1c9f34 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PackageBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PackageBean.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2.priv;
-
/**
* <p>This class is designed to test the default access jvm problem workaround.
* The issue is that public methods of a public subclass contained in a default access
@@ -31,10 +29,8 @@ package org.apache.commons.beanutils2.priv;
class PackageBean {
-
-
/**
* Package private constructor - can only use factory method to create
* beans.
@@ -45,10 +41,8 @@ class PackageBean {
}
-
-
/**
*/
private String bar = "This is bar";
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBean.java b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBean.java
index 2d4203e..901204f 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBean.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2.priv;
-
/**
* Bean that has a private constructor that exposes properties via
* various mechanisms (based on property name):
@@ -32,10 +30,8 @@ package org.apache.commons.beanutils2.priv;
class PrivateBean implements PrivateDirect {
-
-
/**
* Package private constructor - can only use factory method to create
* beans.
@@ -46,10 +42,8 @@ class PrivateBean implements PrivateDirect {
}
-
-
/**
* A directly implemented property.
*/
@@ -61,7 +55,6 @@ class PrivateBean implements PrivateDirect {
}
-
/**
* A property accessible via a directly implemented interface.
*/
@@ -74,7 +67,6 @@ class PrivateBean implements PrivateDirect {
}
-
/**
* A method accessible via a directly implemented interface.
*/
@@ -85,7 +77,6 @@ class PrivateBean implements PrivateDirect {
}
-
/**
* A property accessible via an indirectly implemented interface.
*/
@@ -98,7 +89,6 @@ class PrivateBean implements PrivateDirect {
}
-
/**
* A method accessible via an indirectly implemented interface.
*/
@@ -109,5 +99,4 @@ class PrivateBean implements PrivateDirect {
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanFactory.java b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanFactory.java
index fdcab46..2191c8e 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanFactory.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanFactory.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2.priv;
-
/**
* Factory class for PrivateBean instances.
*
@@ -26,7 +24,6 @@ package org.apache.commons.beanutils2.priv;
public class PrivateBeanFactory {
-
/**
* Factory method to create new beans.
*/
@@ -36,7 +33,6 @@ public class PrivateBeanFactory {
}
-
/**
* Factory method to create new beans.
*/
@@ -46,5 +42,4 @@ public class PrivateBeanFactory {
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanSubclass.java b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanSubclass.java
index da95cb1..afedc43 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanSubclass.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanSubclass.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2.priv;
-
/**
* Bean that exposes methods defined by an interface that is implemented
* in the superclass.
@@ -27,10 +25,8 @@ package org.apache.commons.beanutils2.priv;
class PrivateBeanSubclass extends PrivateBean {
-
-
/**
* Create a new PrivateBeanSubclass instance.
*/
@@ -40,10 +36,8 @@ class PrivateBeanSubclass extends PrivateBean {
}
-
-
/**
* A property accessible via the superclass.
*/
@@ -54,5 +48,4 @@ class PrivateBeanSubclass extends PrivateBean {
}
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PrivateDirect.java b/src/test/java/org/apache/commons/beanutils2/priv/PrivateDirect.java
index 3a5bba4..8f5b3f6 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PrivateDirect.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PrivateDirect.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2.priv;
-
/**
* Interface that is directly implemented by PrivateBean.
*
@@ -26,16 +24,13 @@ package org.apache.commons.beanutils2.priv;
public interface PrivateDirect extends PrivateIndirect {
-
-
/**
* A property accessible via a directly implemented interface.
*/
String getBar();
-
/**
* A method accessible via a directly implemented interface.
*/
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 f665e1d..85e8273 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PrivateIndirect.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PrivateIndirect.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2.priv;
-
/**
* Interface that is indirectly implemented by PrivateBean.
*
@@ -26,20 +24,16 @@ package org.apache.commons.beanutils2.priv;
public interface PrivateIndirect {
-
-
/**
* A property accessible via an indirectly implemented interface.
*/
public String getBaz();
-
/**
* A method accessible via an indirectly implemented interface.
*/
public String methodBaz(String in);
-
}
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PublicSubBean.java b/src/test/java/org/apache/commons/beanutils2/priv/PublicSubBean.java
index c7b3605..96527fd 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PublicSubBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PublicSubBean.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-
package org.apache.commons.beanutils2.priv;
-
/**
* <p>This class is designed to test the default access jvm problem workaround.
* The issue is that public methods of a public subclass contained in a default access
@@ -31,10 +29,8 @@ package org.apache.commons.beanutils2.priv;
public class PublicSubBean extends PackageBean {
-
-
/**
* Package private constructor - can only use factory method to create
* beans.
@@ -45,10 +41,8 @@ public class PublicSubBean extends PackageBean {
}
-
-
/**
* A directly implemented property.
*/