Minor change to exception handling to account for behavioural change in

FasterXML/jackson-databind#1675
aws-cloudformation · Nov 20, 2019 · a331e75 · a331e75
1 parent 688a421
commit a331e75
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/software/amazon/cloudformation/proxy/StdCallbackContext.java b/src/main/java/software/amazon/cloudformation/proxy/StdCallbackContext.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -148,7 +149,8 @@ private Map<String, Object> readMap(Class<?> type, JsonParser p, Deserialization
                 }
                 return value;
             } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-                throw new IOException("Can not create empty map for class " + type + " @ " + p.getCurrentLocation(), e);
+                throw new JsonMappingException(p, "Can not create empty map for class " + type + " @ " + p.getCurrentLocation(),
+                                               e);
             }
         }
 

diff --git a/src/test/java/software/amazon/cloudformation/proxy/StdCallackContextTest.java b/src/test/java/software/amazon/cloudformation/proxy/StdCallackContextTest.java
@@ -236,6 +236,7 @@ public void testIncorrectJSONException() throws IOException {
             });
         });
         assertThat(ioException.getMessage()).contains("Can not create empty map");
+        assertThat(ioException.getCause()).isExactlyInstanceOf(NoSuchMethodException.class);
 
         String json = "{\"callGraphs\": {\"foo\": 1, \"bar\": [\"java.util.ArrayList\", [1, 2, 3]]}}";
         StdCallbackContext cxt = serializer.deserialize(json, new TypeReference<StdCallbackContext>() {