Ensure that get() complies with the Map contract of returning null if…

… the element is missing, fix #98
real-logic · May 11, 2017 · 1d30e59 · 1d30e59
1 parent a99c10d
commit 1d30e59
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/agrona/src/main/java/org/agrona/collections/Int2IntHashMap.java b/agrona/src/main/java/org/agrona/collections/Int2IntHashMap.java
@@ -292,7 +292,8 @@ public int computeIfAbsent(final int key, final IntUnaryOperator mappingFunction
      */
     public Integer get(final Object key)
     {
-        return get((int)key);
+        final int primitiveResult = get((int) key);
+        return primitiveResult == missingValue ? null : primitiveResult;
     }
 
     /**

diff --git a/agrona/src/test/java/org/agrona/collections/Int2IntHashMapTest.java b/agrona/src/test/java/org/agrona/collections/Int2IntHashMapTest.java
@@ -20,7 +20,6 @@
 
 import java.util.*;
 import java.util.Map.Entry;
-import java.util.function.IntUnaryOperator;
 import java.util.stream.IntStream;
 
 import static org.hamcrest.Matchers.hasItems;
@@ -49,6 +48,12 @@ public void getShouldReturnMissingValueWhenEmpty()
         assertEquals(MISSING_VALUE, map.get(1));
     }
 
+    @Test
+    public void boxedGetShouldReturnNull()
+    {
+        assertNull(map.get((Integer) 1));
+    }
+
     @Test
     public void getShouldReturnMissingValueWhenThereIsNoElement()
     {
@@ -403,11 +408,21 @@ public void shouldComputeIfAbsent()
         final int testKey = 7;
         final int testValue = 7;
 
-        final IntUnaryOperator function = (i) -> testValue;
-
         assertEquals(map.missingValue(), map.get(testKey));
 
-        assertThat(map.computeIfAbsent(testKey, function), is(testValue));
+        assertThat(map.computeIfAbsent(testKey, (i) -> testValue), is(testValue));
+        assertThat(map.get(testKey), is(testValue));
+    }
+
+    @Test
+    public void shouldComputeIfAbsentBoxed()
+    {
+        final Map<Integer, Integer> map = this.map;
+
+        final int testKey = 7;
+        final int testValue = 7;
+
+        assertThat(map.computeIfAbsent(testKey, (i) -> testValue), is(testValue));
         assertThat(map.get(testKey), is(testValue));
     }