This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch 1.X in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
commit 317b066597060b026777d0d924d37aa32d1dd66f Author: Gary D. Gregory <[email protected]> AuthorDate: Wed Dec 25 18:24:40 2024 -0500 Don't initialize instance variables to their default values --- src/main/java/org/apache/commons/beanutils/BasicDynaClass.java | 2 +- src/main/java/org/apache/commons/beanutils/DynaProperty.java | 2 +- src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java | 2 +- .../java/org/apache/commons/beanutils/WeakFastHashMap.java | 6 +++--- src/main/java/org/apache/commons/beanutils/WrapDynaBean.java | 2 +- src/main/java/org/apache/commons/beanutils/WrapDynaClass.java | 8 ++++---- .../java/org/apache/commons/beanutils/BeanUtilsBenchCase.java | 4 ++-- .../org/apache/commons/beanutils/LazyDynaBeanTestCase.java | 2 +- .../java/org/apache/commons/beanutils/LazyDynaMapTestCase.java | 2 +- .../org/apache/commons/beanutils/PropertyUtilsBenchCase.java | 2 +- src/test/java/org/apache/commons/beanutils/TestBean.java | 10 +++++----- .../beanutils/memoryleaktests/pojotests/SomeMappedPojo.java | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java b/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java index 63390b0c..0984cae6 100644 --- a/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java +++ b/src/main/java/org/apache/commons/beanutils/BasicDynaClass.java @@ -45,7 +45,7 @@ public class BasicDynaClass implements DynaClass, Serializable { * The constructor of the <code>dynaBeanClass</code> that we will use * for creating new instances. */ - protected transient Constructor<?> constructor = null; + protected transient Constructor<?> constructor; /** * The argument values to be passed to the constructore we will use diff --git a/src/main/java/org/apache/commons/beanutils/DynaProperty.java b/src/main/java/org/apache/commons/beanutils/DynaProperty.java index 5465cab0..ff819658 100644 --- a/src/main/java/org/apache/commons/beanutils/DynaProperty.java +++ b/src/main/java/org/apache/commons/beanutils/DynaProperty.java @@ -69,7 +69,7 @@ public class DynaProperty implements Serializable { /** Property type */ - protected transient Class<?> type = null; + protected transient Class<?> type; /** The <em>(optional)</em> type of content elements for indexed <code>DynaProperty</code> */ protected transient Class<?> contentType; diff --git a/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java b/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java index 7c231db1..f34bc78b 100644 --- a/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java +++ b/src/main/java/org/apache/commons/beanutils/JDBCDynaClass.java @@ -53,7 +53,7 @@ abstract class JDBCDynaClass implements DynaClass, Serializable { * <p>The set of dynamic properties that are part of this * {@link DynaClass}.</p> */ - protected DynaProperty[] properties = null; + protected DynaProperty[] properties; /** * <p>The set of dynamic properties that are part of this diff --git a/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java b/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java index 9ff37bbb..274ef406 100644 --- a/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java +++ b/src/main/java/org/apache/commons/beanutils/WeakFastHashMap.java @@ -72,7 +72,7 @@ class WeakFastHashMap<K, V> extends HashMap<K, V> { private class CollectionViewIterator implements Iterator<E> { private Map<K, V> expected; - private Map.Entry<K, V> lastReturned = null; + private Map.Entry<K, V> lastReturned; private final Iterator<Map.Entry<K, V>> iterator; public CollectionViewIterator() { @@ -342,12 +342,12 @@ class WeakFastHashMap<K, V> extends HashMap<K, V> { /** * The underlying map we are managing. */ - private Map<K, V> map = null; + private Map<K, V> map; /** * Are we currently operating in "fast" mode? */ - private boolean fast = false; + private boolean fast; // Property access diff --git a/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java b/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java index 9c66efda..ebf10857 100644 --- a/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java +++ b/src/main/java/org/apache/commons/beanutils/WrapDynaBean.java @@ -50,7 +50,7 @@ public class WrapDynaBean implements DynaBean, Serializable { * The <code>DynaClass</code> "base class" that this DynaBean * is associated with. */ - protected transient WrapDynaClass dynaClass = null; + protected transient WrapDynaClass dynaClass; /** * The JavaBean instance wrapped by this WrapDynaBean. diff --git a/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java b/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java index 81621025..dec0a632 100644 --- a/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java +++ b/src/main/java/org/apache/commons/beanutils/WrapDynaClass.java @@ -274,7 +274,7 @@ public class WrapDynaClass implements DynaClass { /** * Reference to the JavaBean class represented by this WrapDynaClass. */ - private Reference<Class<?>> beanClassRef = null; + private Reference<Class<?>> beanClassRef; /** Stores the associated {@code PropertyUtilsBean} instance. */ private final PropertyUtilsBean propertyUtilsBean; @@ -286,12 +286,12 @@ public class WrapDynaClass implements DynaClass { * @deprecated No longer initialized, use getBeanClass() method instead */ @Deprecated - protected Class<?> beanClass = null; + protected Class<?> beanClass; /** * The set of PropertyDescriptors for this bean class. */ - protected PropertyDescriptor[] descriptors = null; + protected PropertyDescriptor[] descriptors; /** * The set of PropertyDescriptors for this bean class, keyed by the @@ -303,7 +303,7 @@ public class WrapDynaClass implements DynaClass { /** * The set of dynamic properties that are part of this DynaClass. */ - protected DynaProperty[] properties = null; + protected DynaProperty[] properties; /** * The set of dynamic properties that are part of this DynaClass, diff --git a/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java index 0a4898af..bbbd7f0c 100644 --- a/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java +++ b/src/test/java/org/apache/commons/beanutils/BeanUtilsBenchCase.java @@ -59,8 +59,8 @@ public class BeanUtilsBenchCase extends TestCase { // Input objects that have identical sets of properties and values. private BenchBean inBean; private DynaBean inDyna; - private Map<String, Object> inMap = null; // Map of Objects requiring no conversion - private Map<String, String> inStrs = null; // Map of Strings requiring conversion + private Map<String, Object> inMap; // Map of Objects requiring no conversion + private Map<String, String> 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/beanutils/LazyDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTestCase.java index c2d2842f..b2e0ea01 100644 --- a/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/LazyDynaBeanTestCase.java @@ -44,7 +44,7 @@ public class LazyDynaBeanTestCase extends TestCase { public static Test suite() { return new TestSuite(LazyDynaBeanTestCase.class); } - protected LazyDynaBean bean = null; + protected LazyDynaBean bean; protected LazyDynaClass dynaClass; protected String testProperty = "myProperty"; protected String testPropertyA = "myProperty-A"; diff --git a/src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java b/src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java index e49a88a6..8b858e38 100644 --- a/src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/LazyDynaMapTestCase.java @@ -46,7 +46,7 @@ public class LazyDynaMapTestCase extends TestCase { public static Test suite() { return new TestSuite(LazyDynaMapTestCase.class); } - protected LazyDynaMap dynaMap = null; + protected LazyDynaMap dynaMap; protected String testProperty = "myProperty"; protected String testPropertyA = "myProperty-A"; protected String testPropertyB = "myProperty-B"; diff --git a/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java index f983f651..2715d24b 100644 --- a/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java +++ b/src/test/java/org/apache/commons/beanutils/PropertyUtilsBenchCase.java @@ -58,7 +58,7 @@ public class PropertyUtilsBenchCase extends TestCase { // Input objects that have identical sets of properties and values. private BenchBean inBean; private DynaBean inDyna; - private Map<String, Object> inMap = null; + private Map<String, Object> inMap; // Output objects that have identical sets of properties. private BenchBean outBean; diff --git a/src/test/java/org/apache/commons/beanutils/TestBean.java b/src/test/java/org/apache/commons/beanutils/TestBean.java index 23e7dc90..e64d1a19 100644 --- a/src/test/java/org/apache/commons/beanutils/TestBean.java +++ b/src/test/java/org/apache/commons/beanutils/TestBean.java @@ -48,7 +48,7 @@ public class TestBean implements Serializable { * A static variable that is accessed and updated via static methods * for MethodUtils testing. */ - private static int counter = 0; + private static int counter; /** * Return the current value of the counter. @@ -162,23 +162,23 @@ private java.util.Date dateProperty; /** * A mapped property with only a getter and setter for a Map. */ - private Map<String, Object> mapProperty = null; + private Map<String, Object> mapProperty; /** * A mapped property that has String keys and Object values. */ - private HashMap<String, Object> mappedObjects = null; + private HashMap<String, Object> mappedObjects; /** * A mapped property that has String keys and String values. */ - private HashMap<String, String> mappedProperty = null; + private HashMap<String, String> mappedProperty; /** * A mapped property that has String keys and int values. */ - private HashMap<String, Integer> mappedIntProperty = null; + private HashMap<String, Integer> mappedIntProperty; /** diff --git a/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomeMappedPojo.java b/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomeMappedPojo.java index 084a40ac..4bc92a7c 100644 --- a/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomeMappedPojo.java +++ b/src/test/java/org/apache/commons/beanutils/memoryleaktests/pojotests/SomeMappedPojo.java @@ -25,7 +25,7 @@ import java.util.HashMap; public class SomeMappedPojo { - private HashMap<String, String> mappedProperty = null; + private HashMap<String, String> mappedProperty; public String getMappedProperty(final String key) { // Create the map the very first time
