Merge pull request #127 from thoricha91/improve_error_handling_of_decodeMapIntoMap

Issue #126 - Improve error handling in Decoder.decodeMapIntoMap()

Author: oschwald

src/main/java/com/maxmind/db/Decoder.java

@@ -372,7 +372,12 @@ private <T, V> Map<String, V> decodeMapIntoMap(
         for (int i = 0; i < size; i++) {
             String key = (String) this.decode(String.class, null).getValue();
             Object value = this.decode(valueClass, null).getValue();
-            map.put(key, valueClass.cast(value));
+            try {
+                map.put(key, valueClass.cast(value));
+            } catch (ClassCastException e) {
+                throw new DeserializationException(
+                        "Error creating map entry for '" + key + "': " + e.getMessage(), e);
+            }
         }
 
         return map;

src/test/java/com/maxmind/db/ReaderTest.java

@@ -1,6 +1,7 @@
 package com.maxmind.db;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -620,6 +621,17 @@ public void testDecodeWrongTypeWithWrongArguments() throws IOException {
         assertThat(ex.getMessage(), containsString("Error getting record for IP"));
     }
 
+    @Test
+    public void testDecodeWithDataTypeMismatchInModel() throws IOException {
+        this.testReader = new Reader(getFile("GeoIP2-City-Test.mmdb"));
+        DeserializationException ex = assertThrows(DeserializationException.class,
+                () -> this.testReader.get(InetAddress.getByName("2.125.160.216"),
+                        TestDataTypeMismatchInModel.class));
+        assertThat(ex.getMessage(), containsString("Error getting record for IP"));
+        assertThat(ex.getMessage(), containsString("Error creating map entry for"));
+        assertThat(ex.getCause().getCause().getClass(), equalTo(ClassCastException.class));
+    }
+
     static class TestWrongModelSubdivisions {
         List<TestWrongModelSubdivision> subdivisions;
 
@@ -644,6 +656,18 @@ public TestWrongModelSubdivision(
         }
     }
 
+    static class TestDataTypeMismatchInModel {
+        Map<String, Float> location;
+
+        @MaxMindDbConstructor
+        public TestDataTypeMismatchInModel(
+                @MaxMindDbParameter(name = "location")
+                Map<String, Float> location
+        ) {
+            this.location = location;
+        }
+    }
+
     @Test
     public void testDecodeConcurrentHashMap() throws IOException {
         this.testReader = new Reader(getFile("GeoIP2-City-Test.mmdb"));