Fix #15 (wrt exception message)

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/datatype/jsonorg/JSONArrayDeserializer.java

@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.fasterxml.jackson.databind.util.ClassUtil;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -25,6 +26,14 @@ public JSONArrayDeserializer()
     public JSONArray deserialize(JsonParser p, DeserializationContext ctxt)
         throws IOException
     {
+        // 07-Jan-2019, tatu: As per [datatype-json-org#15], need to verify it's an Array
+        if (!p.isExpectedStartArrayToken()) {
+            final JsonToken t = p.currentToken();
+            return (JSONArray) ctxt.handleUnexpectedToken(handledType(), t, p,
+                    "Unexpected token (%s), expected START_ARRAY for %s value",
+                    t, ClassUtil.nameOf(handledType()));
+        }
+        
         JSONArray array = new JSONArray();
         JsonToken t;
         while ((t = p.nextToken()) != JsonToken.END_ARRAY) {

src/main/java/com/fasterxml/jackson/datatype/jsonorg/JSONBaseSerializer.java

@@ -4,5 +4,7 @@
 
 abstract class JSONBaseSerializer<T> extends StdSerializer<T>
 {
+    private static final long serialVersionUID = 1L;
+
     protected JSONBaseSerializer(Class<T> cls) { super(cls); }
 }

src/test/java/com/fasterxml/jackson/datatype/jsonorg/ConvertTest.java

@@ -0,0 +1,43 @@
+package com.fasterxml.jackson.datatype.jsonorg;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+
+public class ConvertTest extends ModuleTestBase
+{
+    static class TestDomain {
+        public Integer id;
+        public String name;
+        public Double da;
+        public Map<String,Object> ldt;
+        public Map<String,Object> ld;
+        public Map<String,Object> lt;
+        public JSONObject jsn;
+        public JSONArray jsa;
+    }
+
+    private final ObjectMapper MAPPER = newMapper();
+    
+    public void testIssue15() throws Exception
+    {
+        Map<String,Object> map = new HashMap<>();
+        map.put("name", "zpj");
+        map.put("id", 111);
+        map.put("jsa", "[1, 34, 32, \"zpj\", {\"age\": 18, \"name\": \"zpj\", \"child\": {\"name\": \"zzy\", \"gender\": \"nan\"}}, {\"url\": \"test\", \"name\": \"suhu\"}]");
+        final String json = MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(map);
+        try {
+            MAPPER.readValue(json, TestDomain.class);
+            fail("Should not pass");
+        } catch (MismatchedInputException e) {
+            verifyException(e, "Unexpected token");
+            verifyException(e, "org.json.JSONArray");
+            verifyException(e, "START_ARRAY");
+        }
+    }
+}

src/test/java/com/fasterxml/jackson/datatype/jsonorg/ModuleTestBase.java

@@ -0,0 +1,26 @@
+package com.fasterxml.jackson.datatype.jsonorg;
+
+import java.util.Arrays;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public abstract class ModuleTestBase extends junit.framework.TestCase
+{
+    public ObjectMapper newMapper() {
+        return new ObjectMapper()
+                .registerModule(new JsonOrgModule());
+    }
+
+    protected void verifyException(Throwable e, String... matches)
+    {
+        String msg = e.getMessage();
+        String lmsg = (msg == null) ? "" : msg.toLowerCase();
+        for (String match : matches) {
+            String lmatch = match.toLowerCase();
+            if (lmsg.indexOf(lmatch) >= 0) {
+                return;
+            }
+        }
+        throw new Error("Expected an exception with one of substrings ("+Arrays.asList(matches)+"): got one with message \""+msg+"\"");
+    }
+}

src/test/java/com/fasterxml/jackson/datatype/jsonorg/SimpleReadTest.java

@@ -6,7 +6,7 @@
 
 import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
 
-public class SimpleReadTest extends TestBase
+public class SimpleReadTest extends ModuleTestBase
 {
     public void testReadObject() throws Exception
     {

src/test/java/com/fasterxml/jackson/datatype/jsonorg/SimpleWriteTest.java

@@ -4,14 +4,11 @@
 
 import org.json.*;
 
-import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
-
-public class SimpleWriteTest extends TestBase
+public class SimpleWriteTest extends ModuleTestBase
 {
     public void testWriteObject() throws Exception
     {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.registerModule(new JsonOrgModule());
+        final ObjectMapper mapper = newMapper();
 
         // Ok: let's create JSONObject from JSON text
         String JSON = "{\"a\":{\"b\":3}}";
@@ -28,8 +25,7 @@ public void testWriteObject() throws Exception
 
     public void testWriteArray() throws Exception
     {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.registerModule(new JsonOrgModule());
+        final ObjectMapper mapper = newMapper();
 
         // Ok: let's create JSONObject from JSON text
         String JSON = "[1,true,\"text\",[null,3],{\"a\":[1.25]}]";

src/test/java/com/fasterxml/jackson/datatype/jsonorg/TestBase.java

@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.core.Versioned;
 
-public class TestVersions extends TestBase
+public class TestVersions extends ModuleTestBase
 {
     public void testMapperVersions() throws IOException
     {

src/test/java/com/fasterxml/jackson/datatype/jsonorg/TestVersions.java

@@ -10,7 +10,7 @@
  * Tests to verify that we can also use JSONObject and JSONArray
  * with polymorphic type information.
  */
-public class TypeInformationTest extends TestBase
+public class TypeInformationTest extends ModuleTestBase
 {
     static class ObjectWrapper {
         public Object value;