Implement MutableMultimap.putAllPairs(Iterable<Pair<K, V>> keyValuePa…

…ir).

Fixes #43.

Signed-off-by: Nikhil Nanivadekar <nikhil.nanivadekar@gs.com>

RELEASE_NOTE_DRAFT.md

@@ -6,6 +6,7 @@ New Functionality
 
 * Changed MutableBagIterable.addOccurrences(T item, int occurrences) to return the updated number of occurrences instead of void.
 * Implemented Multimap.keySet() to return an unmodifiable SetIterable of keys.
+* Implemented MutableMultimap.putAllPairs(Iterable<Pair<K, V>> keyValuePairs).
 
 Optimizations
 -------------

eclipse-collections-api/src/main/java/org/eclipse/collections/api/multimap/MutableMultimap.java

@@ -46,6 +46,8 @@ public interface MutableMultimap<K, V>
     // Bulk Operations
     boolean putAllPairs(Pair<K, V>... pairs);
 
+    boolean putAllPairs(Iterable<Pair<K, V>> pairs);
+
     boolean putAll(K key, Iterable<? extends V> values);
 
     <KK extends K, VV extends V> boolean putAll(Multimap<KK, VV> multimap);

eclipse-collections/src/main/java/org/eclipse/collections/impl/multimap/AbstractMutableMultimap.java

@@ -202,6 +202,16 @@ public boolean putAllPairs(Pair<K, V>... pairs)
         return changed;
     }
 
+    public boolean putAllPairs(Iterable<Pair<K, V>> pairs)
+    {
+        boolean changed = false;
+        for (Pair<K, V> pair : pairs)
+        {
+            changed |= this.put(pair.getOne(), pair.getTwo());
+        }
+        return changed;
+    }
+
     public boolean putAll(K key, Iterable<? extends V> values)
     {
         return Iterate.notEmpty(values) && this.putAllNotEmpty(key, values);

unit-tests/src/test/java/org/eclipse/collections/impl/multimap/AbstractMutableMultimapTestCase.java

@@ -12,6 +12,8 @@
 
 import org.eclipse.collections.api.RichIterable;
 import org.eclipse.collections.api.bag.MutableBag;
+import org.eclipse.collections.api.list.ImmutableList;
+import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.map.MutableMap;
 import org.eclipse.collections.api.multimap.ImmutableMultimap;
 import org.eclipse.collections.api.multimap.Multimap;
@@ -22,6 +24,7 @@
 import org.eclipse.collections.impl.block.procedure.CollectionAddProcedure;
 import org.eclipse.collections.impl.factory.Bags;
 import org.eclipse.collections.impl.factory.Lists;
+import org.eclipse.collections.impl.factory.Sets;
 import org.eclipse.collections.impl.map.mutable.UnifiedMap;
 import org.eclipse.collections.impl.set.mutable.UnifiedSet;
 import org.eclipse.collections.impl.test.Verify;
@@ -131,6 +134,43 @@ public void testPutAll()
         Assert.assertEquals(expected, multimap);
     }
 
+    @Test
+    public void testPutAllPairs()
+    {
+        MutableMultimap<Integer, String> multimap1 = this.newMultimapWithKeysValues(1, "One", 2, "2");
+        MutableList<Pair<Integer, String>> pairs1 = Lists.mutable.of(Tuples.pair(1, "One"), Tuples.pair(2, "Two"), Tuples.pair(3, "Three"));
+        Assert.assertTrue(multimap1.putAllPairs(pairs1));
+        MutableMultimap<Integer, String> expected1 = this.newMultimap();
+        expected1.put(1, "One");
+        expected1.put(1, "One");
+        expected1.put(2, "2");
+        expected1.put(2, "Two");
+        expected1.put(3, "Three");
+        Assert.assertEquals(expected1, multimap1);
+
+        MutableMultimap<Integer, String> multimap2 = this.newMultimapWithKeysValues(1, "One", 2, "2");
+        ImmutableList<Pair<Integer, String>> pairs2 = Lists.immutable.of(Tuples.pair(1, "One"), Tuples.pair(2, "Two"), Tuples.pair(3, "Three"));
+        Assert.assertTrue(multimap2.putAllPairs(pairs2));
+        MutableMultimap<Integer, String> expected2 = this.newMultimap();
+        expected2.put(1, "One");
+        expected2.put(1, "One");
+        expected2.put(2, "2");
+        expected2.put(2, "Two");
+        expected2.put(3, "Three");
+        Assert.assertEquals(expected2, multimap2);
+
+        MutableMultimap<String, Integer> multimap3 = this.newMultimapWithKeysValues("One", 1, "Two", 2);
+        MutableSet<Pair<String, Integer>> pairs3 = Sets.mutable.of(Tuples.pair("One", 1), Tuples.pair("Two", 2), Tuples.pair("Three", 3));
+        Assert.assertTrue(multimap3.putAllPairs(pairs3));
+        MutableMultimap<String, Integer> expected3 = this.newMultimap();
+        expected3.put("One", 1);
+        expected3.put("One", 1);
+        expected3.put("Two", 2);
+        expected3.put("Two", 2);
+        expected3.put("Three", 3);
+        Assert.assertEquals(expected3, multimap3);
+    }
+
     @Test
     public void testPutAllFromCollection()
     {

unit-tests/src/test/java/org/eclipse/collections/impl/multimap/set/AbstractMutableSetMultimapTestCase.java

@@ -10,11 +10,14 @@
 
 package org.eclipse.collections.impl.multimap.set;
 
+import org.eclipse.collections.api.list.MutableList;
+import org.eclipse.collections.api.multimap.MutableMultimap;
 import org.eclipse.collections.api.multimap.bag.MutableBagMultimap;
 import org.eclipse.collections.api.multimap.set.MutableSetMultimap;
 import org.eclipse.collections.api.multimap.set.SetMultimap;
 import org.eclipse.collections.api.set.MutableSet;
 import org.eclipse.collections.api.tuple.Pair;
+import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.impl.factory.Sets;
 import org.eclipse.collections.impl.list.mutable.FastList;
 import org.eclipse.collections.impl.multimap.AbstractMutableMultimapTestCase;
@@ -58,6 +61,18 @@ protected abstract <K, V> MutableSetMultimap<K, V> newMultimapWithKeysValues(
     @Override
     protected abstract <V> MutableSet<V> createCollection(V... args);
 
+    @Override
+    public void testPutAllPairs()
+    {
+        super.testPutAllPairs();
+
+        MutableMultimap<Integer, String> multimap = this.newMultimapWithKeysValues(1, "One", 2, "2");
+        MutableList<Pair<Integer, String>> pairs = Lists.mutable.of(Tuples.pair(1, "One"));
+        Assert.assertFalse(multimap.putAllPairs(pairs));
+        MutableMultimap<Integer, String> expected = this.newMultimapWithKeysValues(1, "One", 2, "2");
+        Assert.assertEquals(expected, multimap);
+    }
+
     @Override
     @Test
     public void flip()