Resolves spring-projectsgh-25140

midumitrescu · May 28, 2020 · 6db35fd · 6db35fd
1 parent d706899
commit 6db35fd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java
@@ -483,8 +483,7 @@ public MultiValueMapAdapter(Map<K, List<V>> map) {
 		@Override
 		@Nullable
 		public V getFirst(K key) {
-			List<V> values = this.map.get(key);
-			return (values != null ? values.get(0) : null);
+			return firstElement(this.map.get(key));
 		}
 
 		@Override
@@ -521,7 +520,7 @@ public void setAll(Map<K, V> values) {
 		@Override
 		public Map<K, V> toSingleValueMap() {
 			LinkedHashMap<K, V> singleValueMap = new LinkedHashMap<>(this.map.size());
-			this.map.forEach((key, value) -> singleValueMap.put(key, value.get(0)));
+			this.map.forEach((key, value) -> singleValueMap.put(key, firstElement(value)));
 			return singleValueMap;
 		}
 
@@ -603,5 +602,4 @@ public String toString() {
 			return this.map.toString();
 		}
 	}
-
 }
diff --git a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java
@@ -17,6 +17,7 @@
 package org.springframework.util;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -28,6 +29,8 @@
 import java.util.Properties;
 import java.util.Set;
 
+import org.assertj.core.util.Maps;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -210,6 +213,21 @@ void hasUniqueObject() {
 		assertThat(CollectionUtils.hasUniqueObject(list)).isFalse();
 	}
 
+	@Test
+	void noArrayIndexOutOfBoundsException() {
+		HashMap<String, List<Object>> mostlyEmptyMap = new HashMap<>();
+		mostlyEmptyMap.put("test", new ArrayList<>());
+
+
+		MultiValueMap<String, Object> multiValueMap = CollectionUtils.toMultiValueMap(mostlyEmptyMap);
+		Assertions.assertAll(
+				() -> assertThat(multiValueMap.getFirst(null)).isNull(),
+				() -> assertThat(multiValueMap.getFirst("test")).isNull(),
+				() -> assertThat(multiValueMap.toSingleValueMap().get(null)).isNull(),
+				() -> assertThat(multiValueMap.toSingleValueMap().get("test")).isNull()
+		);
+	}
+
 
 	private static final class Instance {