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

Collections.unmodifiableMultiValueMap explicitly casts to List<V> (for compatibility with JDK 9 build 53) 

Issue: SPR-12549
This commit is contained in:
Juergen Hoeller 2015-03-06 11:52:51 +01:00
parent 9b25d6ad8b
commit ff4ac5b837
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -335,9 +335,10 @@ public abstract class CollectionUtils {
} }
/** /**
* Adapt a {@code Map<K, List<V>>} to an {@code MultiValueMap<K,V>}. * Adapt a {@code Map<K, List<V>>} to an {@code MultiValueMap<K, V>}.
* @param map the map * @param map the original map
* @return the multi-value map * @return the multi-value map
* @since 3.1
*/ */
public static <K, V> MultiValueMap<K, V> toMultiValueMap(Map<K, List<V>> map) { public static <K, V> MultiValueMap<K, V> toMultiValueMap(Map<K, List<V>> map) {
return new MultiValueMapAdapter<K, V>(map); return new MultiValueMapAdapter<K, V>(map);
@ -348,13 +349,15 @@ public abstract class CollectionUtils {
* Return an unmodifiable view of the specified multi-value map. * Return an unmodifiable view of the specified multi-value map.
* @param map the map for which an unmodifiable view is to be returned. * @param map the map for which an unmodifiable view is to be returned.
* @return an unmodifiable view of the specified multi-value map. * @return an unmodifiable view of the specified multi-value map.
* @since 3.1
*/ */
public static <K,V> MultiValueMap<K,V> unmodifiableMultiValueMap(MultiValueMap<? extends K, ? extends V> map) { @SuppressWarnings("unchecked")
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<K, List<V>>(map.size()); Map<K, List<V>> result = new LinkedHashMap<K, List<V>>(map.size());
for (Map.Entry<? extends K, ? extends List<? extends V>> entry : map.entrySet()) { for (Map.Entry<? extends K, ? extends List<? extends V>> entry : map.entrySet()) {
List<V> values = Collections.unmodifiableList(entry.getValue()); List<? extends V> values = Collections.unmodifiableList(entry.getValue());
result.put(entry.getKey(), 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);
@ -366,7 +369,7 @@ public abstract class CollectionUtils {
*/ */
private static class EnumerationIterator<E> implements Iterator<E> { private static class EnumerationIterator<E> implements Iterator<E> {
private Enumeration<E> enumeration; private final Enumeration<E> enumeration;
public EnumerationIterator(Enumeration<E> enumeration) { public EnumerationIterator(Enumeration<E> enumeration) {
this.enumeration = enumeration; this.enumeration = enumeration;
@ -476,8 +479,8 @@ public abstract class CollectionUtils {
} }
@Override @Override
public void putAll(Map<? extends K, ? extends List<V>> m) { public void putAll(Map<? extends K, ? extends List<V>> map) {
this.map.putAll(m); this.map.putAll(map);
} }
@Override @Override