Fix generics on Multimap.forEachKeyValue().

eclipse · Apr 22, 2016 · bc9500b · bc9500b
1 parent 95455be
commit bc9500b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/eclipse-collections-api/src/main/java/org/eclipse/collections/api/multimap/Multimap.java b/eclipse-collections-api/src/main/java/org/eclipse/collections/api/multimap/Multimap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Goldman Sachs.
+ * Copyright (c) 2016 Goldman Sachs.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -101,8 +101,9 @@ public interface Multimap<K, V>
      * The given procedure would be invoked with the parameters:
      * <p>
      * {@code [ ["key1", "val1"], ["key1", "val2"], ["key1", "val2"], ["key2", "val3"] ]}
+     * @param procedure
      */
-    void forEachKeyValue(Procedure2<K, V> procedure);
+    void forEachKeyValue(Procedure2<? super K, ? super V> procedure);
 
     /**
      * Calls the {@code procedure} with each <em>key-Iterable[value]</em>.
@@ -221,13 +222,15 @@ public interface Multimap<K, V>
      * <p>
      * Any two empty Multimaps are equal, because they both have empty {@link #toMap} views.
      */
+    @Override
     boolean equals(Object obj);
 
     /**
      * Returns the hash code for this Multimap.
      * <p>
      * The hash code of a Multimap is defined as the hash code of the map view, as returned by {@link #toMap}.
      */
+    @Override
     int hashCode();
 
     /**

diff --git a/...pse-collections/src/main/java/org/eclipse/collections/impl/multimap/AbstractMultimap.java b/...pse-collections/src/main/java/org/eclipse/collections/impl/multimap/AbstractMultimap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Goldman Sachs.
+ * Copyright (c) 2016 Goldman Sachs.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -207,7 +207,7 @@ public void forEachKey(Procedure<? super K> procedure)
         this.getMap().forEachKey(procedure);
     }
 
-    public void forEachKeyValue(final Procedure2<K, V> procedure)
+    public void forEachKeyValue(final Procedure2<? super K, ? super V> procedure)
     {
         final Procedure2<V, K> innerProcedure = new Procedure2<V, K>()
         {