Use forEach()

Author: garydgregory

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

@@ -264,9 +264,7 @@ public void putAll(final Map<? extends K, ? extends Object> map) {
         if (isReadOnly()) {
             throw new UnsupportedOperationException("Map is read only");
         }
-        for (final Map.Entry<? extends K, ?> e : map.entrySet()) {
-            put(e.getKey(), e.getValue());
-        }
+        map.forEach(this::put);
     }
 
     /**

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

@@ -164,11 +164,11 @@ public Object clone() throws CloneNotSupportedException {
             // copy only properties that are readable and writable. If its
             // not readable, we can't get the value from the old map. If
             // its not writable, we can't write a value into the new map.
-            for (final String key : readMethods.keySet()) {
+            readMethods.keySet().forEach(key -> {
                 if (getWriteMethod(key) != null) {
                     newMap.put(key, get(key));
                 }
-            }
+            });
         } catch (final Exception exception) {
             final CloneNotSupportedException cnse = new CloneNotSupportedException(
                     "Unable to copy bean values to cloned bean map: " + exception);
@@ -186,11 +186,11 @@ public Object clone() throws CloneNotSupportedException {
      * @param map the BeanMap whose properties to put
      */
     public void putAllWriteable(final BeanMap map) {
-        for (final String key : map.readMethods.keySet()) {
+        map.readMethods.keySet().forEach(key -> {
             if (getWriteMethod(key) != null) {
                 this.put(key, map.get(key));
             }
-        }
+        });
     }
 
     /**
@@ -368,9 +368,7 @@ public int size() {
     @Override
     public Collection<Object> values() {
         final ArrayList<Object> answer = new ArrayList<>(readMethods.size());
-        for (final Iterator<Object> iter = valueIterator(); iter.hasNext();) {
-            answer.add(iter.next());
-        }
+        valueIterator().forEachRemaining(answer::add);
         return Collections.unmodifiableList(answer);
     }
 

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

@@ -22,7 +22,6 @@
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -243,9 +242,9 @@ public void copyProperties(final Object dest, final Object orig)
             // Map properties are always of type <String, Object>
             Map<String, Object> propMap = (Map<String, Object>) orig;
             for (final Map.Entry<String, Object> entry : propMap.entrySet()) {
-                final String name = entry.getKey();
-                if (getPropertyUtils().isWriteable(dest, name)) {
-                    copyProperty(dest, name, entry.getValue());
+                final String k = entry.getKey();
+                if (getPropertyUtils().isWriteable(dest, k)) {
+                    copyProperty(dest, k, entry.getValue());
                 }
             }
         } else /* if (orig is a standard JavaBean) */ {
@@ -514,16 +513,7 @@ public String[] getArrayProperty(final Object bean, final String name)
             return null;
         }
         if (value instanceof Collection) {
-            final ArrayList<String> values = new ArrayList<>();
-            for (final Object item : (Collection<?>) value) {
-                if (item == null) {
-                    values.add(null);
-                } else {
-                    // convert to string using convert utils
-                    values.add(getConvertUtils().convert(item));
-                }
-            }
-            return values.toArray(new String[values.size()]);
+            return ((Collection<?>) value).stream().map(item -> item != null ? getConvertUtils().convert(item) : null).toArray(String[]::new);
         }
         if (!value.getClass().isArray()) {
             final String[] results = new String[1];

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

@@ -292,9 +292,7 @@ public boolean addAll(final Collection<?> collection) {
 
         ensureCapacity(size() + collection.size());
 
-        for (final Object e : collection) {
-            add(e);
-        }
+        collection.forEach(this::add);
 
         return true;
     }

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

@@ -84,8 +84,6 @@ public Set<String> getSuppressedProperties() {
      */
     @Override
     public void introspect(final IntrospectionContext icontext) throws IntrospectionException {
-        for (final String property : getSuppressedProperties()) {
-            icontext.removePropertyDescriptor(property);
-        }
+        getSuppressedProperties().forEach(icontext::removePropertyDescriptor);
     }
 }