From 82c454ff4a33428722d3ebfbfd90b3269df65f23 Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Fri, 11 Dec 2015 17:01:01 -0800
Subject: [PATCH] 8144952: add wildcards to the Map.ofEntries() method

Reviewed-by: darcy, psandoz, chegar
---
 jdk/src/java.base/share/classes/java/util/Map.java | 4 ++--
 jdk/test/java/util/Map/MapFactories.java           | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/util/Map.java b/jdk/src/java.base/share/classes/java/util/Map.java
index f958607dfc5..0967523eba3 100644
--- a/jdk/src/java.base/share/classes/java/util/Map.java
+++ b/jdk/src/java.base/share/classes/java/util/Map.java
@@ -1670,9 +1670,9 @@ public interface Map<K, V> {
      */
     @SafeVarargs
     @SuppressWarnings("varargs")
-    static <K, V> Map<K, V> ofEntries(Entry<K, V>... entries) {
+    static <K, V> Map<K, V> ofEntries(Entry<? extends K, ? extends V>... entries) {
         Map<K, V> map = new HashMap<>(entries.length * 4 / 3 + 1); // throws NPE if entries is null
-        for (Entry<K, V> e : entries) {
+        for (Entry<? extends K, ? extends V> e : entries) {
             // next line throws NPE if e is null
             map.put(Objects.requireNonNull(e.getKey()), Objects.requireNonNull(e.getValue()));
         }
diff --git a/jdk/test/java/util/Map/MapFactories.java b/jdk/test/java/util/Map/MapFactories.java
index 1bdb020680d..b8ff0c9f3f2 100644
--- a/jdk/test/java/util/Map/MapFactories.java
+++ b/jdk/test/java/util/Map/MapFactories.java
@@ -377,4 +377,13 @@ public class MapFactories {
         assertEquals(sie.toString(), kvh1.toString());
     }
 
+    // compile-time test of wildcards
+    @Test
+    public void entryWildcardTests() {
+        Map.Entry<Integer,Double> e1 = Map.entry(1, 2.0);
+        Map.Entry<Float,Long> e2 = Map.entry(3.0f, 4L);
+        Map<Number,Number> map = Map.ofEntries(e1, e2);
+        assertEquals(map.size(), 2);
+    }
+
 }