Merge pull request eugenp#7080 from rodrigolgraciano/BAEL-2936

BAEL-2936
zdougherty-softwarfare · Jun 4, 2019 · 8d5f6af · 8d5f6af
2 parents acc9c24 + 3cea8b6
commit 8d5f6af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/java-collections-conversions/src/main/java/com/baeldung/convertToMap/ConvertToMap.java b/java-collections-conversions/src/main/java/com/baeldung/convertToMap/ConvertToMap.java
@@ -15,8 +15,7 @@ public Map<Integer, Book> listToMapWithDupKeyError(List<Book> books) {
     }
 
     public Map<Integer, Book> listToMapWithDupKey(List<Book> books) {
-        return books.stream().collect(Collectors.toMap(Book::getReleaseYear, Function.identity(),
-                (o1, o2) -> o1));
+        return books.stream().collect(Collectors.toMap(Book::getReleaseYear, Function.identity(), (existing, replacement) -> existing));
     }
 
     public Map<Integer, Book> listToConcurrentMap(List<Book> books) {

diff --git a/...collections-conversions/src/test/java/com/baeldung/convertToMap/ConvertToMapUnitTest.java b/...collections-conversions/src/test/java/com/baeldung/convertToMap/ConvertToMapUnitTest.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import static org.junit.Assert.*;
@@ -34,8 +35,10 @@ public void whenMapHasDuplicateKey_without_merge_function_then_runtime_exception
     }
 
     @Test
-    public void whenMapHasDuplicateKey_with_merge_function() {
-        assertTrue(convertToMap.listToMapWithDupKey(bookList).size() == 2);
+    public void whenMapHasDuplicateKeyThenMergeFunctionHandlesCollision() {
+        Map<Integer, Book> booksByYear = convertToMap.listToMapWithDupKey(bookList);
+        assertEquals(2, booksByYear.size());
+        assertEquals("0395489318", booksByYear.get(1954).getIsbn());
     }
 
     @Test