diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index ad865d614..35c330e6b 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -38,6 +38,7 @@ limitations under the License.
+
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
index 696136498..0ff0dc048 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
@@ -47,8 +47,8 @@ public static Test suite() {
// Input objects that have identical sets of properties and values.
private BenchBean inBean;
private DynaBean inDyna;
- private Map inMap = null; // Map of Objects requiring no conversion
- private Map inStrs = null; // Map of Strings requiring conversion
+ private Map inMap; // Map of Objects requiring no conversion
+ private Map inStrs; // Map of Strings requiring conversion
// Output objects that have identical sets of properties.
private BenchBean outBean;
diff --git a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
index 58c5ba835..3432958fe 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
@@ -49,7 +49,7 @@ public static Test suite() {
// Input objects that have identical sets of properties and values.
private BenchBean inBean;
private DynaBean inDyna;
- private Map inMap = null;
+ private Map inMap;
// Output objects that have identical sets of properties.
private BenchBean outBean;
diff --git a/src/test/java/org/apache/commons/beanutils2/TestBean.java b/src/test/java/org/apache/commons/beanutils2/TestBean.java
index 1b4e3f6d8..3c5f319a0 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestBean.java
@@ -45,7 +45,7 @@ public void setValue(final String key, final String val) {
/**
* A static variable that is accessed and updated via static methods for MethodUtils testing.
*/
- private static int counter = 0;
+ private static int counter;
/**
* Gets the current value of the counter.
@@ -151,22 +151,22 @@ public static void incrementCounter(final Number amount) {
/**
* A mapped property with only a getter and setter for a Map.
*/
- private Map mapProperty = null;
+ private Map mapProperty;
/**
* A mapped property that has String keys and Object values.
*/
- private HashMap mappedObjects = null;
+ private HashMap mappedObjects;
/**
* A mapped property that has String keys and String values.
*/
- private HashMap mappedProperty = null;
+ private HashMap mappedProperty;
/**
* A mapped property that has String keys and int values.
*/
- private HashMap mappedIntProperty = null;
+ private HashMap mappedIntProperty;
/**
* A nested reference to another test bean (populated as needed).
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 1db3d1699..94318f654 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
@@ -43,7 +43,7 @@ public static TestSuite suite() {
return new TestSuite(BigDecimalConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public BigDecimalConverterTestCase(final String name) {
super(name);
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 d911a274a..9af3d25d7 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
@@ -32,7 +32,7 @@ public static TestSuite suite() {
return new TestSuite(BigIntegerConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public BigIntegerConverterTestCase(final String name) {
super(name);
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 1544f53ba..90753c50d 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
@@ -30,7 +30,7 @@ public static TestSuite suite() {
return new TestSuite(ByteConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public ByteConverterTestCase(final String name) {
super(name);
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 717f44cb2..f098546a0 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
@@ -30,7 +30,7 @@ public static TestSuite suite() {
return new TestSuite(DoubleConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public DoubleConverterTestCase(final String name) {
super(name);
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 be808ce15..93806a35b 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
@@ -30,7 +30,7 @@ public static TestSuite suite() {
return new TestSuite(FloatConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public FloatConverterTestCase(final String name) {
super(name);
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 d28c9a152..44322b46d 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
@@ -30,7 +30,7 @@ public static TestSuite suite() {
return new TestSuite(LongConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public LongConverterTestCase(final String name) {
super(name);
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 4ce34be81..1a8e1e9cf 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java
@@ -34,7 +34,7 @@ public static TestSuite suite() {
return new TestSuite(OffsetTimeConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public OffsetTimeConverterTestCase(final String name) {
super(name);
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 1f6b5b588..124f80263 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java
@@ -37,7 +37,7 @@ public static TestSuite suite() {
return new TestSuite(PathConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public PathConverterTestCase(final String name) {
super(name);
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 eb73e9372..5616adfd7 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java
@@ -35,7 +35,7 @@ public static TestSuite suite() {
return new TestSuite(PeriodConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public PeriodConverterTestCase(final String name) {
super(name);
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 4cd062662..139560016 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java
@@ -35,7 +35,7 @@ public static TestSuite suite() {
return new TestSuite(URIConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public URIConverterTestCase(final String name) {
super(name);
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 13b872bad..5a6b73cb9 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java
@@ -35,7 +35,7 @@ public static TestSuite suite() {
return new TestSuite(UUIDConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public UUIDConverterTestCase(final String name) {
super(name);
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 7d275f8ee..2fd5bc14c 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java
@@ -34,7 +34,7 @@ public static TestSuite suite() {
return new TestSuite(YearConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public YearConverterTestCase(final String name) {
super(name);
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 74faacd24..e162fa83b 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java
@@ -35,7 +35,7 @@ public static TestSuite suite() {
return new TestSuite(ZoneOffsetConverterTestCase.class);
}
- private Converter converter = null;
+ private Converter converter;
public ZoneOffsetConverterTestCase(final String name) {
super(name);
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 9fe08bfe0..d96c8def0 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,7 @@
*/
public class SomeMappedPojo {
- private HashMap mappedProperty = null;
+ private HashMap mappedProperty;
public String getMappedProperty(final String key) {
// Create the map the very first time