Bump commons-collections4 from 4.5.0-M2 to 4.5.0-M3

Author: garydgregory

pom.xml

@@ -65,7 +65,7 @@
     <commons.jacoco.complexityRatio>0.61</commons.jacoco.complexityRatio>
     <commons.jacoco.lineRatio>0.72</commons.jacoco.lineRatio>
     <!-- Dependencies -->
-    <commons.collections.version>4.5.0-M2</commons.collections.version>
+    <commons.collections.version>4.5.0-M3-SNAPSHOT</commons.collections.version>
   </properties>
 
   <issueManagement>
@@ -102,7 +102,6 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
       <version>${commons.collections.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

src/changes/changes.xml

@@ -104,7 +104,7 @@
         Fix SpotBugs [ERROR] Medium: org.apache.commons.beanutils2.WrapDynaClass.getDynaProperties() may expose internal representation by returning WrapDynaClass.properties [org.apache.commons.beanutils2.WrapDynaClass] At WrapDynaClass.java:[line 172] EI_EXPOSE_REP.
       </action>
       <action dev="ggregory" type="fix" due-to="Melloware, sebbASF, Gary Gregory, Michal Landsman">
-        Replace Commons Collections Test Framework 3.2.2 with 4.5.0-M2 #40.
+        Replace Commons Collections Test Framework 3.2.2 with 4.5.0-M3 #40.
       </action>
       <action dev="ggregory" type="fix" due-to="Gary Gregory">
         Provide error index in ConversionException message in DateTimeConverter.parse(Class, Class, String, DateFormat).

src/main/java/org/apache/commons/beanutils2/BeanUtils.java

@@ -20,6 +20,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
+import org.apache.commons.collections4.map.ConcurrentReferenceHashMap;
+
 /**
  * <p>
  * Utility methods for populating JavaBeans properties via reflection.
@@ -32,7 +34,6 @@
  *
  * @see BeanUtilsBean
  */
-
 public class BeanUtils {
 
     /** An empty class array */
@@ -43,7 +44,7 @@ public class BeanUtils {
 
     /**
      * <p>
-     * Clone a bean based on the available property getters and setters, even if the bean class itself does not implement Cloneable.
+     * Clones a bean based on the available property getters and setters, even if the bean class itself does not implement Cloneable.
      * </p>
      *
      * <p>
@@ -59,14 +60,12 @@ public class BeanUtils {
      * @see BeanUtilsBean#cloneBean
      */
     public static Object cloneBean(final Object bean) throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException {
-
         return BeanUtilsBean.getInstance().cloneBean(bean);
-
     }
 
     /**
      * <p>
-     * Copy property values from the origin bean to the destination bean for all cases where the property names are the same.
+     * Copies property values from the origin bean to the destination bean for all cases where the property names are the same.
      * </p>
      *
      * <p>
@@ -82,7 +81,6 @@ public static Object cloneBean(final Object bean) throws IllegalAccessException,
      * @see BeanUtilsBean#copyProperties
      */
     public static void copyProperties(final Object dest, final Object orig) throws IllegalAccessException, InvocationTargetException {
-
         BeanUtilsBean.getInstance().copyProperties(dest, orig);
     }
 
@@ -103,20 +101,20 @@ public static void copyProperties(final Object dest, final Object orig) throws I
      * @see BeanUtilsBean#copyProperty
      */
     public static void copyProperty(final Object bean, final String name, final Object value) throws IllegalAccessException, InvocationTargetException {
-
         BeanUtilsBean.getInstance().copyProperty(bean, name, value);
     }
 
     /**
-     * Create a cache.
+     * Creates a cache.
      *
      * @param <K> the key type of the cache
      * @param <V> the value type of the cache
      * @return a new cache
      * @since 1.8.0
      */
     public static <K, V> Map<K, V> createCache() {
-        return new WeakFastHashMap<>();
+        return ConcurrentReferenceHashMap.<K, V>builder().get();
+        // return new ConcurrentHashMap<>();
     }
 
     /**
@@ -136,7 +134,6 @@ public static <K, V> Map<K, V> createCache() {
      * @see BeanUtilsBean#describe
      */
     public static Map<String, String> describe(final Object bean) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-
         return BeanUtilsBean.getInstance().describe(bean);
     }
 
@@ -159,7 +156,6 @@ public static Map<String, String> describe(final Object bean) throws IllegalAcce
      */
     public static String[] getArrayProperty(final Object bean, final String name)
             throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-
         return BeanUtilsBean.getInstance().getArrayProperty(bean, name);
     }
 
@@ -182,7 +178,6 @@ public static String[] getArrayProperty(final Object bean, final String name)
      */
     public static String getIndexedProperty(final Object bean, final String name)
             throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-
         return BeanUtilsBean.getInstance().getIndexedProperty(bean, name);
 
     }
@@ -206,7 +201,6 @@ public static String getIndexedProperty(final Object bean, final String name)
      */
     public static String getIndexedProperty(final Object bean, final String name, final int index)
             throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-
         return BeanUtilsBean.getInstance().getIndexedProperty(bean, name, index);
 
     }
@@ -230,7 +224,6 @@ public static String getIndexedProperty(final Object bean, final String name, fi
      */
     public static String getMappedProperty(final Object bean, final String name)
             throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-
         return BeanUtilsBean.getInstance().getMappedProperty(bean, name);
 
     }
@@ -255,7 +248,6 @@ public static String getMappedProperty(final Object bean, final String name)
      */
     public static String getMappedProperty(final Object bean, final String name, final String key)
             throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-
         return BeanUtilsBean.getInstance().getMappedProperty(bean, name, key);
 
     }
@@ -280,7 +272,6 @@ public static String getMappedProperty(final Object bean, final String name, fin
      */
     public static String getNestedProperty(final Object bean, final String name)
             throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-
         return BeanUtilsBean.getInstance().getNestedProperty(bean, name);
 
     }
@@ -303,7 +294,6 @@ public static String getNestedProperty(final Object bean, final String name)
      * @see BeanUtilsBean#getProperty
      */
     public static String getProperty(final Object bean, final String name) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-
         return BeanUtilsBean.getInstance().getProperty(bean, name);
 
     }
@@ -327,7 +317,6 @@ public static String getProperty(final Object bean, final String name) throws Il
      */
     public static String getSimpleProperty(final Object bean, final String name)
             throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-
         return BeanUtilsBean.getInstance().getSimpleProperty(bean, name);
 
     }
@@ -348,7 +337,6 @@ public static String getSimpleProperty(final Object bean, final String name)
      * @see BeanUtilsBean#populate
      */
     public static void populate(final Object bean, final Map<String, ? extends Object> properties) throws IllegalAccessException, InvocationTargetException {
-
         BeanUtilsBean.getInstance().populate(bean, properties);
     }
 
@@ -369,7 +357,6 @@ public static void populate(final Object bean, final Map<String, ? extends Objec
      * @see BeanUtilsBean#setProperty
      */
     public static void setProperty(final Object bean, final String name, final Object value) throws IllegalAccessException, InvocationTargetException {
-
         BeanUtilsBean.getInstance().setProperty(bean, name, value);
     }
 }

src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java

@@ -45,6 +45,7 @@
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.regex.Pattern;
@@ -215,13 +216,11 @@ protected static ConvertUtilsBean getInstance() {
     /**
      * The set of {@link Converter}s that can be used to convert Strings into objects of a specified Class, keyed by the destination Class.
      */
-    private final WeakFastHashMap<Class<?>, Converter<?>> converters = new WeakFastHashMap<>();
+    private final Map<Class<?>, Converter<?>> converters = BeanUtils.createCache();
 
     /** Constructs a bean with standard converters registered */
     public ConvertUtilsBean() {
-        converters.setFast(false);
         deregister();
-        converters.setFast(true);
     }
 
     /**

src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java

@@ -112,19 +112,17 @@ private static Map<String, Object> toPropertyMap(final Object obj) {
     /**
      * The cache of PropertyDescriptor arrays for beans we have already introspected, keyed by the java.lang.Class of this object.
      */
-    private final WeakFastHashMap<Class<?>, BeanIntrospectionData> descriptorsCache;
+    private final Map<Class<?>, BeanIntrospectionData> descriptorsCache;
 
-    private final WeakFastHashMap<Class<?>, Map> mappedDescriptorsCache;
+    private final Map<Class<?>, Map> mappedDescriptorsCache;
 
     /** The list with BeanIntrospector objects. */
     private final List<BeanIntrospector> introspectors;
 
     /** Base constructor */
     public PropertyUtilsBean() {
-        descriptorsCache = new WeakFastHashMap<>();
-        descriptorsCache.setFast(true);
-        mappedDescriptorsCache = new WeakFastHashMap<>();
-        mappedDescriptorsCache.setFast(true);
+        descriptorsCache = BeanUtils.createCache();
+        mappedDescriptorsCache = BeanUtils.createCache();
         introspectors = new CopyOnWriteArrayList<>();
         resetBeanIntrospectors();
     }