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 2021/01/11 14:17:09 UTC
[commons-beanutils] branch master updated: Minor performances
improvement: (#71)
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 a24c921 Minor performances improvement: (#71)
a24c921 is described below
commit a24c9219543c0c18661c0bbfdac62821f748bfdb
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Mon Jan 11 15:17:00 2021 +0100
Minor performances improvement: (#71)
* remove redundant initialization
---
src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java | 2 +-
.../org/apache/commons/beanutils2/ContextClassLoaderLocal.java | 2 +-
.../java/org/apache/commons/beanutils2/ConversionException.java | 2 +-
src/main/java/org/apache/commons/beanutils2/DynaProperty.java | 4 ++--
src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java | 2 +-
src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java | 2 +-
src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java | 2 +-
src/main/java/org/apache/commons/beanutils2/MethodUtils.java | 2 +-
.../java/org/apache/commons/beanutils2/PropertyUtilsBean.java | 4 ++--
.../java/org/apache/commons/beanutils2/ResultSetDynaClass.java | 2 +-
.../java/org/apache/commons/beanutils2/ResultSetIterator.java | 6 +++---
src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java | 6 +++---
src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java | 4 ++--
src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java | 8 ++++----
.../apache/commons/beanutils2/converters/AbstractConverter.java | 4 ++--
.../org/apache/commons/beanutils2/locale/BaseLocaleConverter.java | 8 ++++----
.../apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java | 2 +-
.../commons/beanutils2/locale/converters/DateLocaleConverter.java | 2 +-
18 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
index 07d774e..ff0cb67 100644
--- a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
@@ -88,7 +88,7 @@ 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;
+ protected transient Constructor<?> constructor;
/**
* The method signature of the constructor we will use to create
diff --git a/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java b/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java
index 4b839ac..5e3764e 100644
--- a/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java
+++ b/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java
@@ -103,7 +103,7 @@ import java.util.WeakHashMap;
*/
public class ContextClassLoaderLocal<T> {
private final Map<ClassLoader, T> valueByClassLoader = new WeakHashMap<>();
- private boolean globalValueInitialized = false;
+ private boolean globalValueInitialized;
private T globalValue;
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/ConversionException.java b/src/main/java/org/apache/commons/beanutils2/ConversionException.java
index 91e5a31..7b0862f 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConversionException.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConversionException.java
@@ -72,7 +72,7 @@ public class ConversionException extends RuntimeException {
* The root cause of this {@code ConversionException}, compatible with
* JDK 1.4's extensions to {@code java.lang.Throwable}.
*/
- protected Throwable cause = null;
+ protected Throwable cause;
/**
* Gets the root cause of this conversion exception.
diff --git a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
index abffb83..e31ccbe 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
@@ -108,7 +108,7 @@ public class DynaProperty implements Serializable {
/** Property name */
- protected String name = null;
+ protected String name;
/**
* Get the name of this property.
* @return the name of the property
@@ -118,7 +118,7 @@ public class DynaProperty implements Serializable {
}
/** Property type */
- protected transient Class<?> type = null;
+ protected transient Class<?> type;
/**
* <p>Gets the Java class representing the data type of the underlying property
* values.</p>
diff --git a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
index 2d9c0ed..0ce593b 100644
--- a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
@@ -55,7 +55,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/beanutils2/LazyDynaClass.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
index c4b2092..8f5c64b 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
@@ -56,7 +56,7 @@ public class LazyDynaClass extends BasicDynaClass implements MutableDynaClass {
*
* <p>Default is {@code false}.
*/
- protected boolean returnNull = false;
+ protected boolean returnNull;
/**
* Constructs a new LazyDynaClass with default parameters.
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
index c0720d1..078407e 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
@@ -65,7 +65,7 @@ public class LazyDynaMap extends LazyDynaBean implements MutableDynaClass {
*
* <p>Default is {@code false}.
*/
- protected boolean returnNull = false;
+ protected boolean returnNull;
diff --git a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
index ddffe1c..a5cb102 100644
--- a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
@@ -61,7 +61,7 @@ public class MethodUtils {
* really optional we can ignore this problem; only one of the webapps
* will get the warning in its logs but that should be good enough.
*/
- private static boolean loggedAccessibleWarning = false;
+ private static boolean loggedAccessibleWarning;
/**
* Indicates whether methods should be cached for improved performance.
diff --git a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
index 6b6c786..5437db1 100644
--- a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
@@ -108,8 +108,8 @@ public class PropertyUtilsBean {
* The cache of PropertyDescriptor arrays for beans we have already
* introspected, keyed by the java.lang.Class of this object.
*/
- private WeakFastHashMap<Class<?>, BeanIntrospectionData> descriptorsCache = null;
- private WeakFastHashMap<Class<?>, Map> mappedDescriptorsCache = null;
+ private WeakFastHashMap<Class<?>, BeanIntrospectionData> descriptorsCache;
+ private WeakFastHashMap<Class<?>, Map> mappedDescriptorsCache;
/** An empty object array */
private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
diff --git a/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java b/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
index cf9eee0..09cde02 100644
--- a/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
@@ -167,7 +167,7 @@ public class ResultSetDynaClass extends JDBCDynaClass {
/**
* <p>The {@code ResultSet} we are wrapping.</p>
*/
- protected ResultSet resultSet = null;
+ protected ResultSet resultSet;
diff --git a/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java b/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java
index 0dfb478..fd6799d 100644
--- a/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java
+++ b/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java
@@ -52,18 +52,18 @@ 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;
+ protected boolean current;
/**
* <p>The {@link ResultSetDynaClass} we are associated with.</p>
*/
- protected ResultSetDynaClass dynaClass = null;
+ protected ResultSetDynaClass dynaClass;
/**
* <p>Flag indicating whether the result set has indicated that there are
* no further rows.</p>
*/
- protected boolean eof = false;
+ protected boolean eof;
diff --git a/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java b/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java
index d3be3d0..0518640 100644
--- a/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java
+++ b/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java
@@ -69,12 +69,12 @@ public class WeakFastHashMap<K, V> extends HashMap<K, V> {
/**
* The underlying map we are managing.
*/
- private volatile Map<K, V> map = null;
+ private volatile Map<K, V> map;
/**
* Are we currently operating in "fast" mode?
*/
- private boolean fast = false;
+ private boolean fast;
// Constructors
@@ -650,7 +650,7 @@ public 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() {
diff --git a/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java b/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java
index 3b8a722..8d16cdd 100644
--- a/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java
@@ -83,12 +83,12 @@ public class WrapDynaBean implements DynaBean, Serializable {
* The {@code DynaClass} "base class" that this DynaBean
* is associated with.
*/
- protected transient WrapDynaClass dynaClass = null;
+ protected transient WrapDynaClass dynaClass;
/**
* The JavaBean instance wrapped by this WrapDynaBean.
*/
- protected Object instance = null;
+ protected Object instance;
diff --git a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
index 03a0e76..eef6d1d 100644
--- a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
@@ -71,12 +71,12 @@ public class WrapDynaClass implements DynaClass {
/**
* Name of the JavaBean class represented by this WrapDynaClass.
*/
- private String beanClassName = null;
+ private String beanClassName;
/**
* 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;
@@ -84,7 +84,7 @@ public class WrapDynaClass implements DynaClass {
/**
* The set of PropertyDescriptors for this bean class.
*/
- protected PropertyDescriptor[] descriptors = null;
+ protected PropertyDescriptor[] descriptors;
/**
@@ -98,7 +98,7 @@ public class WrapDynaClass implements DynaClass {
/**
* The set of dynamic properties that are part of this DynaClass.
*/
- protected DynaProperty[] properties = null;
+ protected DynaProperty[] properties;
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java
index fe6d604..f331cc0 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java
@@ -105,12 +105,12 @@ public abstract class AbstractConverter implements Converter {
/**
* Should we return the default value on conversion errors?
*/
- private boolean useDefault = false;
+ private boolean useDefault;
/**
* The default value specified to our Constructor, if any.
*/
- private Object defaultValue = null;
+ private Object defaultValue;
/**
* Constructs a <i>Converter</i> that throws a
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 a912231..ad6beca 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/BaseLocaleConverter.java
@@ -42,19 +42,19 @@ public abstract class BaseLocaleConverter implements LocaleConverter {
private final Log log = LogFactory.getLog(BaseLocaleConverter.class);
/** The default value specified to our Constructor, if any. */
- private Object defaultValue = null;
+ private Object defaultValue;
/** Should we return the default value on conversion errors? */
- protected boolean useDefault = false;
+ protected boolean useDefault;
/** The locale specified to our Constructor, by default - system locale. */
protected Locale locale = Locale.getDefault();
/** The default pattern specified to our Constructor, if any. */
- protected String pattern = null;
+ protected String pattern;
/** The flag indicating whether the given pattern string is localized or not. */
- protected boolean locPattern = false;
+ protected boolean locPattern;
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 b59b31c..bc21992 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
@@ -98,7 +98,7 @@ public class LocaleConvertUtilsBean {
private Locale defaultLocale = Locale.getDefault();
/** Indicate whether the pattern is localized or not */
- private boolean applyLocalized = false;
+ private boolean applyLocalized;
/** The {@code Log} instance for this class. */
private final Log log = LogFactory.getLog(LocaleConvertUtilsBean.class);
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 dd402c3..5773bee 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
@@ -43,7 +43,7 @@ public class DateLocaleConverter extends BaseLocaleConverter {
private final Log log = LogFactory.getLog(DateLocaleConverter.class);
/** Should the date conversion be lenient? */
- boolean isLenient = false;
+ boolean isLenient;
/**
* Default Pattern Characters