root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Use Java 8 forEach method on Map

This commit is contained in:
Jon Borenstein 2017-04-25 18:00:38 -04:00 committed by Stephane Nicoll
parent 1ea54eb2c6
commit 13dc0cd828
8 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java
View File

@ -264,12 +264,12 @@ public abstract class BeanFactoryUtils {
if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) { if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) {
Map<String, T> parentResult = beansOfTypeIncludingAncestors( Map<String, T> parentResult = beansOfTypeIncludingAncestors(
(ListableBeanFactory) hbf.getParentBeanFactory(), type); (ListableBeanFactory) hbf.getParentBeanFactory(), type);
for (Map.Entry<String, T> entry : parentResult.entrySet()) { parentResult.entrySet().forEach(entry -> {
String beanName = entry.getKey(); String beanName = entry.getKey();
if (!result.containsKey(beanName) && !hbf.containsLocalBean(beanName)) { if (!result.containsKey(beanName) && !hbf.containsLocalBean(beanName)) {
result.put(beanName, entry.getValue()); result.put(beanName, entry.getValue());
} }
} });
} }
} }
return result; return result;
@ -313,12 +313,13 @@ public abstract class BeanFactoryUtils {
if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) { if (hbf.getParentBeanFactory() instanceof ListableBeanFactory) {
Map<String, T> parentResult = beansOfTypeIncludingAncestors( Map<String, T> parentResult = beansOfTypeIncludingAncestors(
(ListableBeanFactory) hbf.getParentBeanFactory(), type, includeNonSingletons, allowEagerInit); (ListableBeanFactory) hbf.getParentBeanFactory(), type, includeNonSingletons, allowEagerInit);
for (Map.Entry<String, T> entry : parentResult.entrySet()) {
parentResult.entrySet().forEach(entry -> {
String beanName = entry.getKey(); String beanName = entry.getKey();
if (!result.containsKey(beanName) && !hbf.containsLocalBean(beanName)) { if (!result.containsKey(beanName) && !hbf.containsLocalBean(beanName)) {
result.put(beanName, entry.getValue()); result.put(beanName, entry.getValue());
} }
} });
} }
} }
return result; return result;

4
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
View File

@ -1177,11 +1177,11 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
} }
} }
if (!this.customEditors.isEmpty()) { if (!this.customEditors.isEmpty()) {
for (Map.Entry<Class<?>, Class<? extends PropertyEditor>> entry : this.customEditors.entrySet()) { this.customEditors.entrySet().forEach(entry -> {
Class<?> requiredType = entry.getKey(); Class<?> requiredType = entry.getKey();
Class<? extends PropertyEditor> editorClass = entry.getValue(); Class<? extends PropertyEditor> editorClass = entry.getValue();
registry.registerCustomEditor(requiredType, BeanUtils.instantiateClass(editorClass)); registry.registerCustomEditor(requiredType, BeanUtils.instantiateClass(editorClass));
} });
} }
} }

4
spring-core/src/main/java/org/springframework/util/ClassUtils.java
View File

@ -107,10 +107,10 @@ public abstract class ClassUtils {
primitiveWrapperTypeMap.put(Long.class, long.class); primitiveWrapperTypeMap.put(Long.class, long.class);
primitiveWrapperTypeMap.put(Short.class, short.class); primitiveWrapperTypeMap.put(Short.class, short.class);
for (Map.Entry<Class<?>, Class<?>> entry : primitiveWrapperTypeMap.entrySet()) { primitiveWrapperTypeMap.entrySet().forEach(entry -> {
primitiveTypeToWrapperMap.put(entry.getValue(), entry.getKey()); primitiveTypeToWrapperMap.put(entry.getValue(), entry.getKey());
registerCommonClasses(entry.getKey()); registerCommonClasses(entry.getKey());
} });
Set<Class<?>> primitiveTypes = new HashSet<>(32); Set<Class<?>> primitiveTypes = new HashSet<>(32);
primitiveTypes.addAll(primitiveWrapperTypeMap.values()); primitiveTypes.addAll(primitiveWrapperTypeMap.values());

12
spring-core/src/main/java/org/springframework/util/CollectionUtils.java
View File

@ -354,10 +354,10 @@ public abstract class CollectionUtils {
public static <K, V> MultiValueMap<K, V> unmodifiableMultiValueMap(MultiValueMap<? extends K, ? extends V> map) { public static <K, V> MultiValueMap<K, V> unmodifiableMultiValueMap(MultiValueMap<? extends K, ? extends V> map) {
Assert.notNull(map, "'map' must not be null"); Assert.notNull(map, "'map' must not be null");
Map<K, List<V>> result = new LinkedHashMap<>(map.size()); Map<K, List<V>> result = new LinkedHashMap<>(map.size());
for (Map.Entry<? extends K, ? extends List<? extends V>> entry : map.entrySet()) { map.entrySet().forEach(entry -> {
List<? extends V> values = Collections.unmodifiableList(entry.getValue()); List<? extends V> values = Collections.unmodifiableList(entry.getValue());
result.put(entry.getKey(), (List<V>) values); result.put(entry.getKey(), (List<V>) values);
} });
Map<K, List<V>> unmodifiableMap = Collections.unmodifiableMap(result); Map<K, List<V>> unmodifiableMap = Collections.unmodifiableMap(result);
return toMultiValueMap(unmodifiableMap); return toMultiValueMap(unmodifiableMap);
} }
@ -431,17 +431,13 @@ public abstract class CollectionUtils {
@Override @Override
public void setAll(Map<K, V> values) { public void setAll(Map<K, V> values) {
for (Entry<K, V> entry : values.entrySet()) { values.entrySet().forEach(entry -> set(entry.getKey(), entry.getValue()));
set(entry.getKey(), entry.getValue());
}
} }
@Override @Override
public Map<K, V> toSingleValueMap() { public Map<K, V> toSingleValueMap() {
LinkedHashMap<K, V> singleValueMap = new LinkedHashMap<>(this.map.size()); LinkedHashMap<K, V> singleValueMap = new LinkedHashMap<>(this.map.size());
for (Entry<K, List<V>> entry : map.entrySet()) { map.entrySet().forEach(entry -> singleValueMap.put(entry.getKey(), entry.getValue().get(0)));
singleValueMap.put(entry.getKey(), entry.getValue().get(0));
}
return singleValueMap; return singleValueMap;
} }

5
spring-core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
View File

@ -169,9 +169,8 @@ public class LinkedCaseInsensitiveMap<V> implements Map<String, V>, Serializable
if (map.isEmpty()) { if (map.isEmpty()) {
return; return;
} }
for (Map.Entry<? extends String, ? extends V> entry : map.entrySet()) { map.entrySet().forEach(entry -> put(entry.getKey(), entry.getValue()));
put(entry.getKey(), entry.getValue());
}
} }
@Override @Override

16
spring-core/src/main/java/org/springframework/util/LinkedMultiValueMap.java
View File

@ -100,17 +100,15 @@ public class LinkedMultiValueMap<K, V> implements MultiValueMap<K, V>, Serializa
@Override @Override
public void setAll(Map<K, V> values) { public void setAll(Map<K, V> values) {
for (Entry<K, V> entry : values.entrySet()) { values.entrySet().forEach(entry -> set(entry.getKey(), entry.getValue()));
set(entry.getKey(), entry.getValue());
}
} }
@Override @Override
public Map<K, V> toSingleValueMap() { public Map<K, V> toSingleValueMap() {
LinkedHashMap<K, V> singleValueMap = new LinkedHashMap<>(this.targetMap.size()); LinkedHashMap<K, V> singleValueMap = new LinkedHashMap<>(this.targetMap.size());
for (Entry<K, List<V>> entry : this.targetMap.entrySet()) { this.targetMap.entrySet().forEach(entry ->
singleValueMap.put(entry.getKey(), entry.getValue().get(0)); singleValueMap.put(entry.getKey(), entry.getValue().get(0)));
}
return singleValueMap; return singleValueMap;
} }
@ -186,9 +184,9 @@ public class LinkedMultiValueMap<K, V> implements MultiValueMap<K, V>, Serializa
*/ */
public LinkedMultiValueMap<K, V> deepCopy() { public LinkedMultiValueMap<K, V> deepCopy() {
LinkedMultiValueMap<K, V> copy = new LinkedMultiValueMap<>(this.targetMap.size()); LinkedMultiValueMap<K, V> copy = new LinkedMultiValueMap<>(this.targetMap.size());
for (Map.Entry<K, List<V>> entry : this.targetMap.entrySet()) { this.targetMap.entrySet().forEach(entry ->
copy.put(entry.getKey(), new LinkedList<>(entry.getValue())); copy.put(entry.getKey(), new LinkedList<>(entry.getValue())));
}
return copy; return copy;
} }

5
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
View File

@ -192,11 +192,12 @@ public abstract class AbstractHandlerMethodMapping<T> extends AbstractHandlerMap
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug(methods.size() + " request handler methods found on " + userType + ": " + methods); logger.debug(methods.size() + " request handler methods found on " + userType + ": " + methods);
} }
for (Map.Entry<Method, T> entry : methods.entrySet()) {
methods.entrySet().forEach(entry -> {
Method invocableMethod = AopUtils.selectInvocableMethod(entry.getKey(), userType); Method invocableMethod = AopUtils.selectInvocableMethod(entry.getKey(), userType);
T mapping = entry.getValue(); T mapping = entry.getValue();
registerHandlerMethod(handler, invocableMethod, mapping); registerHandlerMethod(handler, invocableMethod, mapping);
} });
} }
/** /**

4
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java
View File

@ -114,7 +114,7 @@ public class SimpleUrlHandlerMapping extends AbstractUrlHandlerMapping {
logger.warn("Neither 'urlMap' nor 'mappings' set on SimpleUrlHandlerMapping"); logger.warn("Neither 'urlMap' nor 'mappings' set on SimpleUrlHandlerMapping");
} }
else { else {
for (Map.Entry<String, Object> entry : urlMap.entrySet()) { urlMap.entrySet().forEach(entry -> {
String url = entry.getKey(); String url = entry.getKey();
Object handler = entry.getValue(); Object handler = entry.getValue();
// Prepend with slash if not already present. // Prepend with slash if not already present.
@ -126,7 +126,7 @@ public class SimpleUrlHandlerMapping extends AbstractUrlHandlerMapping {
handler = ((String) handler).trim(); handler = ((String) handler).trim();
} }
registerHandler(url, handler); registerHandler(url, handler);
} });
} }
} }