Refact iterator of Map with Java 8 forEach

See gh-1451

Author: diguage

spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java

@@ -87,9 +87,10 @@ public MutablePropertyValues(@Nullable Map<?, ?> original) {
 		// There is no replacement of existing property values.
 		if (original != null) {
 			this.propertyValueList = new ArrayList<>(original.size());
-			for (Map.Entry<?, ?> entry : original.entrySet()) {
-				this.propertyValueList.add(new PropertyValue(entry.getKey().toString(), entry.getValue()));
-			}
+			original.forEach(
+				(attrName, attrValue)
+					-> this.propertyValueList.add(new PropertyValue(attrName.toString(), attrValue))
+			);
 		}
 		else {
 			this.propertyValueList = new ArrayList<>(0);
@@ -151,9 +152,10 @@ public MutablePropertyValues addPropertyValues(@Nullable PropertyValues other) {
 	 */
 	public MutablePropertyValues addPropertyValues(@Nullable Map<?, ?> other) {
 		if (other != null) {
-			for (Map.Entry<?, ?> entry : other.entrySet()) {
-				addPropertyValue(new PropertyValue(entry.getKey().toString(), entry.getValue()));
-			}
+			other.forEach(
+				(attrName, attrValue)
+					-> addPropertyValue(new PropertyValue(attrName.toString(), attrValue))
+			);
 		}
 		return this;
 	}

spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java

@@ -457,9 +457,7 @@ protected void copyCustomEditorsTo(PropertyEditorRegistry target, @Nullable Stri
 		String actualPropertyName =
 				(nestedProperty != null ? PropertyAccessorUtils.getPropertyName(nestedProperty) : null);
 		if (this.customEditors != null) {
-			for (Map.Entry<Class<?>, PropertyEditor> entry : this.customEditors.entrySet()) {
-				target.registerCustomEditor(entry.getKey(), entry.getValue());
-			}
+			this.customEditors.forEach((clazz, propertyEditor) -> target.registerCustomEditor(clazz, propertyEditor));
 		}
 		if (this.customEditorsForPath != null) {
 			for (Map.Entry<String, CustomEditorHolder> entry : this.customEditorsForPath.entrySet()) {

spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java

@@ -72,14 +72,12 @@ public ConstructorArgumentValues(ConstructorArgumentValues original) {
 	 */
 	public void addArgumentValues(@Nullable ConstructorArgumentValues other) {
 		if (other != null) {
-			for (Map.Entry<Integer, ValueHolder> entry : other.indexedArgumentValues.entrySet()) {
-				addOrMergeIndexedArgumentValue(entry.getKey(), entry.getValue().copy());
-			}
-			for (ValueHolder valueHolder : other.genericArgumentValues) {
-				if (!this.genericArgumentValues.contains(valueHolder)) {
-					addOrMergeGenericArgumentValue(valueHolder.copy());
-				}
-			}
+			other.indexedArgumentValues.forEach(
+				(index, argValue) -> addOrMergeIndexedArgumentValue(index, argValue.copy())
+			);
+			other.genericArgumentValues.stream()
+					.filter(valueHolder -> !this.genericArgumentValues.contains(valueHolder))
+					.forEach(valueHolder -> addOrMergeGenericArgumentValue(valueHolder));
 		}
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java

@@ -17,6 +17,7 @@
 package org.springframework.beans.factory.config;
 
 import java.beans.PropertyEditor;
+import java.util.Arrays;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -140,16 +141,10 @@ public void setCustomEditors(Map<Class<?>, Class<? extends PropertyEditor>> cust
 	@Override
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
 		if (this.propertyEditorRegistrars != null) {
-			for (PropertyEditorRegistrar propertyEditorRegistrar : this.propertyEditorRegistrars) {
-				beanFactory.addPropertyEditorRegistrar(propertyEditorRegistrar);
-			}
+			Arrays.stream(this.propertyEditorRegistrars).forEach(beanFactory::addPropertyEditorRegistrar);
 		}
 		if (this.customEditors != null) {
-			for (Map.Entry<Class<?>, Class<? extends PropertyEditor>> entry : this.customEditors.entrySet()) {
-				Class<?> requiredType = entry.getKey();
-				Class<? extends PropertyEditor> propertyEditorClass = entry.getValue();
-				beanFactory.registerCustomEditor(requiredType, propertyEditorClass);
-			}
+			this.customEditors.forEach(beanFactory::registerCustomEditor);
 		}
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/config/YamlMapFactoryBean.java

@@ -18,7 +18,6 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
@@ -123,9 +122,7 @@ protected Map<String, Object> createMap() {
 
 	@SuppressWarnings({"unchecked", "rawtypes"})
 	private void merge(Map<String, Object> output, Map<String, Object> map) {
-		for (Entry<String, Object> entry : map.entrySet()) {
-			String key = entry.getKey();
-			Object value = entry.getValue();
+		map.forEach((key, value) -> {
 			Object existing = output.get(key);
 			if (value instanceof Map && existing instanceof Map) {
 				// Inner cast required by Eclipse IDE.
@@ -136,7 +133,7 @@ private void merge(Map<String, Object> output, Map<String, Object> map) {
 			else {
 				output.put(key, value);
 			}
-		}
+		});
 	}
 
 }

spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java

@@ -202,20 +202,18 @@ private Map<String, Object> asMap(Object object) {
 		}
 
 		Map<Object, Object> map = (Map<Object, Object>) object;
-		for (Entry<Object, Object> entry : map.entrySet()) {
-			Object value = entry.getValue();
+		map.forEach((key, value) -> {
 			if (value instanceof Map) {
 				value = asMap(value);
 			}
-			Object key = entry.getKey();
 			if (key instanceof CharSequence) {
 				result.put(key.toString(), value);
 			}
 			else {
 				// It has to be a map key in this case
 				result.put("[" + key.toString() + "]", value);
 			}
-		}
+		});
 		return result;
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java

@@ -169,9 +169,7 @@ else if (value instanceof ManagedMap) {
 		else if (value instanceof ManagedProperties) {
 			Properties original = (Properties) value;
 			Properties copy = new Properties();
-			for (Map.Entry<Object, Object> propEntry : original.entrySet()) {
-				Object propKey = propEntry.getKey();
-				Object propValue = propEntry.getValue();
+			original.forEach((propKey, propValue) -> {
 				if (propKey instanceof TypedStringValue) {
 					propKey = evaluate((TypedStringValue) propKey);
 				}
@@ -184,7 +182,7 @@ else if (value instanceof ManagedProperties) {
 							"Error converting Properties key/value pair for " + argName + ": resolved to null");
 				}
 				copy.put(propKey, propValue);
-			}
+			});
 			return copy;
 		}
 		else if (value instanceof TypedStringValue) {

spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

@@ -1225,9 +1225,7 @@ private Comparator<Object> adaptDependencyComparator(Map<String, Object> matchin
 
 	private FactoryAwareOrderSourceProvider createFactoryAwareOrderSourceProvider(Map<String, Object> beans) {
 		IdentityHashMap<Object, String> instancesToBeanNames = new IdentityHashMap<>();
-		for (Map.Entry<String, Object> entry : beans.entrySet()) {
-			instancesToBeanNames.put(entry.getValue(), entry.getKey());
-		}
+		beans.forEach((beanName, instance) -> instancesToBeanNames.put(instance, beanName));
 		return new FactoryAwareOrderSourceProvider(instancesToBeanNames);
 	}
 

spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java

@@ -111,9 +111,7 @@ else if (value instanceof Map) {
 			// Convert Map elements.
 			Map<?, ?> source = (Map<?, ?>) value;
 			Map<Object, Object> target = createMap(this.mapType, source.size());
-			for (Map.Entry<?, ?> entry : source.entrySet()) {
-				target.put(convertKey(entry.getKey()), convertValue(entry.getValue()));
-			}
+			source.forEach((key, val) -> target.put(convertKey(key), convertValue(val)));
 			super.setValue(target);
 		}
 		else {

spring-context/src/main/java/org/springframework/cache/interceptor/NameMatchCacheOperationSource.java

@@ -57,9 +57,7 @@ public class NameMatchCacheOperationSource implements CacheOperationSource, Seri
 	 * @see CacheOperation
 	 */
 	public void setNameMap(Map<String, Collection<CacheOperation>> nameMap) {
-		for (Map.Entry<String, Collection<CacheOperation>> entry : nameMap.entrySet()) {
-			addCacheMethod(entry.getKey(), entry.getValue());
-		}
+		nameMap.forEach(this::addCacheMethod);
 	}
 
 	/**