Fix #1000; now UUID and Enum deserializers should throw InvalidFormatException as expected

Author: cowtowncoder

release-notes/VERSION

@@ -44,6 +44,8 @@ Project: jackson-databind
  (reported by Shumpei A)
 #997: Add `MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS`
 #998: Allow use of `NON_DEFAULT` for POJOs without default constructor
+#1000: Add new mapping exception type for enums and UUIDs
+ (suggesed by natnan@github)
 #1011: Change ObjectWriter::withAttributes() to take a Map with some kind of wildcard types
  (suggested by David B)
 - Make `JsonValueFormat` (self-)serializable, deserializable, to/from valid external

src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java

@@ -905,8 +905,8 @@ public JsonMappingException instantiationException(Class<?> instClass, String ms
      */
     public JsonMappingException weirdStringException(String value, Class<?> instClass, String msg) {
         return InvalidFormatException.from(_parser,
-                String.format("Can not construct instance of %s from String value '%s': %s",
-                        instClass.getName(), _valueDesc(), msg),
+                String.format("Can not construct instance of %s from String value (%s): %s",
+                        instClass.getName(), _quotedString(value), msg),
                 value, instClass);
     }
 
@@ -917,8 +917,8 @@ public JsonMappingException weirdStringException(String value, Class<?> instClas
     public JsonMappingException weirdNumberException(Number value, Class<?> instClass, String msg) {
         return InvalidFormatException.from(_parser,
                 String.format("Can not construct instance of %s from number value (%s): %s",
-                        instClass.getName(), _valueDesc(), msg),
-                null, instClass);
+                        instClass.getName(), String.valueOf(value), msg),
+                value, instClass);
     }
 
     /**
@@ -928,8 +928,8 @@ public JsonMappingException weirdNumberException(Number value, Class<?> instClas
      */
     public JsonMappingException weirdKeyException(Class<?> keyClass, String keyValue, String msg) {
         return InvalidFormatException.from(_parser,
-                String.format("Can not construct Map key of type %s from String \"%s\": ",
-                        keyClass.getName(), _desc(keyValue), msg),
+                String.format("Can not construct Map key of type %s from String (%s): %s",
+                        keyClass.getName(), _quotedString(keyValue), msg),
                 keyValue, keyClass);
     }
 
@@ -1019,10 +1019,27 @@ protected String _valueDesc() {
     }
 
     protected String _desc(String desc) {
+        if (desc == null) {
+            return "[N/A]";
+        }
         // !!! should we quote it? (in case there are control chars, linefeeds)
         if (desc.length() > MAX_ERROR_STR_LEN) {
             desc = desc.substring(0, MAX_ERROR_STR_LEN) + "]...[" + desc.substring(desc.length() - MAX_ERROR_STR_LEN);
         }
         return desc;
     }
+
+    // @since 2.7
+    protected String _quotedString(String desc) {
+        if (desc == null) {
+            return "[N/A]";
+        }
+        // !!! should we quote it? (in case there are control chars, linefeeds)
+        if (desc.length() > MAX_ERROR_STR_LEN) {
+            return String.format("\"%s]...[%s\"",
+                    desc.substring(0, MAX_ERROR_STR_LEN),
+                    desc.substring(desc.length() - MAX_ERROR_STR_LEN));
+        }
+        return "\"" + desc + "\"";
+    }
 }

src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
 import com.fasterxml.jackson.databind.util.ClassUtil;
@@ -88,15 +89,16 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
         }
         // But let's consider int acceptable as well (if within ordinal range)
         if (curr == JsonToken.VALUE_NUMBER_INT) {
-            // ... unless told not to do that. :-) (as per [JACKSON-412])
-            _checkFailOnNumber(ctxt);
-            
+            // ... unless told not to do that
             int index = p.getIntValue();
+            if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS)) {
+                _failOnNumber(ctxt, p, index);
+            }
             if (index >= 0 && index <= _enumsByIndex.length) {
                 return _enumsByIndex[index];
             }
             if (!ctxt.isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
-                throw ctxt.weirdNumberException(Integer.valueOf(index), _enumClass(),
+                throw ctxt.weirdNumberException(index, _enumClass(),
                         "index value outside legal index range [0.."+(_enumsByIndex.length-1)+"]");
             }
             return null;
@@ -113,12 +115,14 @@ private final Object _deserializeAltString(JsonParser p, DeserializationContext
                 return null;
             }
         } else {
-            // [#149]: Allow use of 'String' indexes as well
+            // [databind#149]: Allow use of 'String' indexes as well
             char c = name.charAt(0);
             if (c >= '0' && c <= '9') {
                 try {
                     int ix = Integer.parseInt(name);
-                    _checkFailOnNumber(ctxt);
+                    if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS)) {
+                        _failOnNumber(ctxt, p, ix);
+                    }
                     if (ix >= 0 && ix <= _enumsByIndex.length) {
                         return _enumsByIndex[ix];
                     }
@@ -152,11 +156,13 @@ protected Object _deserializeOther(JsonParser p, DeserializationContext ctxt) th
         throw ctxt.mappingException(_enumClass());
     }
 
-    protected void _checkFailOnNumber(DeserializationContext ctxt) throws IOException
+    protected void _failOnNumber(DeserializationContext ctxt, JsonParser p, int index)
+        throws IOException
     {
-        if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS)) {
-            throw ctxt.mappingException("Not allowed to deserialize Enum value out of JSON number (disable DeserializationConfig.DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS to allow)");
-        }
+        throw InvalidFormatException.from(p,
+                String.format("Not allowed to deserialize Enum value out of JSON number (%d): disable DeserializationConfig.DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS to allow",
+                        index),
+                        index, _enumClass());
     }
 
     protected Class<?> _enumClass() {

src/main/java/com/fasterxml/jackson/databind/deser/std/StdKeyDeserializer.java

@@ -339,7 +339,7 @@ public Object _parse(String key, DeserializationContext ctxt) throws JsonMapping
                 }
             }
             Enum<?> e = _resolver.findEnum(key);
-            if (e == null && !ctxt.getConfig().isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
+            if ((e == null) && !ctxt.getConfig().isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
                 throw ctxt.weirdKeyException(_keyClass, key, "not one of values for Enum class");
             }
             return e;

src/test/java/com/fasterxml/jackson/databind/convert/TestBeanConversions.java

@@ -124,7 +124,7 @@ public void testErrorReporting() throws Exception
         try {
             MAPPER.readValue("{\"boolProp\":\"foobar\"}", BooleanBean.class);
         } catch (JsonMappingException e) {
-            verifyException(e, "from String value 'foobar'");
+            verifyException(e, "from String value (\"foobar\")");
         }
     }