Convert last remaining DeserializationContext.mappingException() usage to .reportMappingException()

cowtowncoder · cowtowncoder · commit bd3c3121f1ec · 2016-05-10T19:33:23.000-07:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java b/src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java
@@ -1010,13 +1010,16 @@ public void reportMappingException(Class<?> targetClass) throws JsonMappingExcep
     
     /**
      * Helper method for constructing generic mapping exception for specified type
+     * 
+     * @deprecated Since 2.8 use {@link #reportMappingException(Class)} instead
      */
+    @Deprecated
     public JsonMappingException mappingException(Class<?> targetClass) {
         return mappingException(targetClass, _parser.getCurrentToken());
     }
 
     /**
-     * @deprecated Since 2.8 use {@link #reportMappingException(String, Object...)} instead
+     * @deprecated Since 2.8 use {@link #reportMappingException(Class, JsonToken)} instead
      */
     @Deprecated
     public JsonMappingException mappingException(Class<?> targetClass, JsonToken token) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -500,9 +500,10 @@ protected Object deserializeFromNull(JsonParser p, DeserializationContext ctxt)
             p2.close();
             return ob;
         }
-        throw ctxt.mappingException(handledType());
+        ctxt.reportMappingException(handledType());
+        return null;
     }
-    
+
     /*
     /**********************************************************
     /* Deserializing when we have to consider an active View
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java
@@ -1302,7 +1302,8 @@ public Object deserializeFromArray(JsonParser p, DeserializationContext ctxt) th
             ctxt.reportMappingException(handledType(), JsonToken.START_ARRAY);
             return null;
         }
-        throw ctxt.mappingException(handledType());
+        ctxt.reportMappingException(handledType());
+        return null;
     }
 
     public Object deserializeFromEmbedded(JsonParser p, DeserializationContext ctxt)
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
@@ -164,10 +164,11 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt)
             // these only work if there's a (delegating) creator...
             return finishBuild(ctxt, deserializeFromArray(p, ctxt));
         case FIELD_NAME:
-        case END_OBJECT: // added to resolve [JACKSON-319], possible related issues
+        case END_OBJECT:
             return finishBuild(ctxt, deserializeFromObject(p, ctxt));
         default:
-            throw ctxt.mappingException(handledType());
+            ctxt.reportMappingException(handledType());
+            return null;
         }
     }
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.java
@@ -324,7 +324,8 @@ protected final Collection<Object> handleNonArray(JsonParser p, DeserializationC
                 ((_unwrapSingle == null) &&
                         ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY));
         if (!canWrap) {
-            throw ctxt.mappingException(_collectionType.getRawClass());
+            ctxt.reportMappingException(_collectionType.getRawClass());
+            return null;
         }
         JsonDeserializer<Object> valueDes = _valueDeserializer;
         final TypeDeserializer typeDeser = _valueTypeDeserializer;
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java
@@ -211,7 +211,8 @@ protected Object _deserializeOther(JsonParser p, DeserializationContext ctxt) th
             }
             return parsed;
         }
-        throw ctxt.mappingException(_enumClass());
+        ctxt.reportMappingException(_enumClass());
+        return null;
     }
 
     protected void _failOnNumber(DeserializationContext ctxt, JsonParser p, int index)
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumSetDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumSetDeserializer.java
@@ -137,7 +137,8 @@ public EnumSet<?> deserialize(JsonParser p, DeserializationContext ctxt) throws
                  * deserializers)
                  */
                 if (t == JsonToken.VALUE_NULL) {
-                    throw ctxt.mappingException(_enumClass);
+                    ctxt.reportMappingException(_enumClass);
+                    return null;
                 }
                 Enum<?> value = _enumDeserializer.deserialize(p, ctxt);
                 /* 24-Mar-2012, tatu: As per [JACKSON-810], may actually get nulls;
@@ -177,13 +178,15 @@ protected EnumSet<?> handleNonArray(JsonParser p, DeserializationContext ctxt)
                         ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY));
 
         if (!canWrap) {
-            throw ctxt.mappingException(EnumSet.class);
+            ctxt.reportMappingException(EnumSet.class);
+            return null;
         }
 
         EnumSet result = constructSet();
         // First: since `null`s not allowed, slightly simpler...
         if (p.hasToken(JsonToken.VALUE_NULL)) {
-            throw ctxt.mappingException(_enumClass);
+            ctxt.reportMappingException(_enumClass);
+            return null;
         }
         try {
             Enum<?> value = _enumDeserializer.deserialize(p, ctxt);
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.java
@@ -152,7 +152,8 @@ public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOExcepti
             }
             return _deserializeEmbedded(ob, ctxt);
         }
-        throw ctxt.mappingException(_valueClass);
+        ctxt.reportMappingException(_valueClass);
+        return null;
     }
         
     protected abstract T _deserialize(String value, DeserializationContext ctxt) throws IOException;
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java
@@ -102,7 +102,8 @@ public ObjectNode deserialize(JsonParser p, DeserializationContext ctxt) throws
             if (p.hasToken(JsonToken.END_OBJECT)) {
                 return ctxt.getNodeFactory().objectNode();
             }
-            throw ctxt.mappingException(ObjectNode.class);
+            ctxt.reportMappingException(ObjectNode.class);
+            return null;
          }
     }
         
@@ -123,7 +124,8 @@ public ArrayNode deserialize(JsonParser p, DeserializationContext ctxt) throws I
             if (p.isExpectedStartArrayToken()) {
                 return deserializeArray(p, ctxt, ctxt.getNodeFactory());
             }
-            throw ctxt.mappingException(ArrayNode.class);
+            ctxt.reportMappingException(ArrayNode.class);
+            return null;
         }
     }
 }
@@ -332,7 +334,8 @@ protected final JsonNode deserializeAny(JsonParser p, DeserializationContext ctx
         //case END_OBJECT:
         //case END_ARRAY:
         default:
-            throw ctxt.mappingException(handledType());
+            ctxt.reportMappingException(handledType());
+            return null;
         }
     }
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
@@ -368,7 +368,8 @@ public Map<Object,Object> deserialize(JsonParser p, DeserializationContext ctxt,
         // Ok: must point to START_OBJECT or FIELD_NAME
         JsonToken t = p.getCurrentToken();
         if (t != JsonToken.START_OBJECT && t != JsonToken.FIELD_NAME) {
-            throw ctxt.mappingException(getMapClass());
+            ctxt.reportMappingException(getMapClass());
+            return null;
         }
         if (_standardStringKey) {
             _readAndBindStringMap(p, ctxt, result);
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/ObjectArrayDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/ObjectArrayDeserializer.java
@@ -271,7 +271,8 @@ protected Object[] handleNonArray(JsonParser p, DeserializationContext ctxt)
                     && _elementClass == Byte.class) {
                 return deserializeFromBase64(p, ctxt);
             }
-            throw ctxt.mappingException(_arrayType.getRawClass());
+            ctxt.reportMappingException(_arrayType.getRawClass());
+            return null;
         }
         JsonToken t = p.getCurrentToken();
         Object value;
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/PrimitiveArrayDeserializers.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/PrimitiveArrayDeserializers.java
@@ -98,7 +98,7 @@ public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
          */
         return typeDeserializer.deserializeTypedFromArray(p, ctxt);
     }
-    
+
     protected T handleNonArray(JsonParser p, DeserializationContext ctxt) throws IOException
     {
         // [JACKSON-620] Empty String can become null...
@@ -114,12 +114,13 @@ protected T handleNonArray(JsonParser p, DeserializationContext ctxt) throws IOE
         if (canWrap) {
             return handleSingleElementUnwrapped(p, ctxt);
         }
-        throw ctxt.mappingException(_valueClass);
+        ctxt.reportMappingException(_valueClass);
+        return null;
     }
 
     protected abstract T handleSingleElementUnwrapped(JsonParser p,
             DeserializationContext ctxt) throws IOException;
-    
+
     /*
     /********************************************************
     /* Actual deserializers: efficient String[], char[] deserializers
@@ -166,7 +167,8 @@ public char[] deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
                 StringBuilder sb = new StringBuilder(64);
                 while ((t = p.nextToken()) != JsonToken.END_ARRAY) {
                     if (t != JsonToken.VALUE_STRING) {
-                        throw ctxt.mappingException(Character.TYPE);
+                        ctxt.reportMappingException(Character.TYPE);
+                        return null;
                     }
                     String str = p.getText();
                     if (str.length() != 1) {
@@ -192,14 +194,16 @@ public char[] deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
                 }
                 // not recognized, just fall through
             }
-            throw ctxt.mappingException(_valueClass);
+            ctxt.reportMappingException(_valueClass);
+            return null;
         }
 
         @Override
         protected char[] handleSingleElementUnwrapped(JsonParser p,
                 DeserializationContext ctxt) throws IOException {
-            // not sure how this should work so just return `null` so:
-            throw ctxt.mappingException(_valueClass);
+            // not sure how this should work...
+            ctxt.reportMappingException(_valueClass);
+            return null;
         }
     }
 
@@ -311,9 +315,10 @@ public byte[] deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
                         // should we catch overflow exceptions?
                         value = p.getByteValue();
                     } else {
-                        // [JACKSON-79]: should probably accept nulls as 0
+                        // should probably accept nulls as 0
                         if (t != JsonToken.VALUE_NULL) {
-                            throw ctxt.mappingException(_valueClass.getComponentType());
+                            ctxt.reportMappingException(_valueClass.getComponentType());
+                            return null;
                         }
                         value = (byte) 0;
                     }
@@ -341,7 +346,8 @@ protected byte[] handleSingleElementUnwrapped(JsonParser p,
             } else {
                 // should probably accept nulls as 'false'
                 if (t != JsonToken.VALUE_NULL) {
-                    throw ctxt.mappingException(_valueClass.getComponentType());
+                    ctxt.reportMappingException(_valueClass.getComponentType());
+                    return null;
                 }
                 value = (byte) 0;
             }
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/StringArrayDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/StringArrayDeserializer.java
@@ -184,6 +184,7 @@ private final String[] handleNonArray(JsonParser p, DeserializationContext ctxt)
                 return null;
             }
         }
-        throw ctxt.mappingException(_valueClass);
+        ctxt.reportMappingException(_valueClass);
+        return null;
     }
 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/StringCollectionDeserializer.java
@@ -256,7 +256,8 @@ private final Collection<String> handleNonArray(JsonParser p, DeserializationCon
                 ((_unwrapSingle == null) &&
                         ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY));
         if (!canWrap) {
-            throw ctxt.mappingException(_collectionType.getRawClass());
+            ctxt.reportMappingException(_collectionType.getRawClass());
+            return null;
         }
         // Strings are one of "native" (intrinsic) types, so there's never type deserializer involved
         JsonDeserializer<String> valueDes = _valueDeserializer;
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java
@@ -274,7 +274,8 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
 //        case JsonTokenId.ID_END_ARRAY: // invalid
         default:
         }
-        throw ctxt.mappingException(Object.class);
+        ctxt.reportMappingException(Object.class);
+        return null;
     }
 
     @Override
@@ -330,15 +331,16 @@ public Object deserializeWithType(JsonParser p, DeserializationContext ctxt, Typ
             return null;
         default:
         }
-        throw ctxt.mappingException(Object.class);
+        ctxt.reportMappingException(Object.class);
+        return null;
     }
 
     /*
     /**********************************************************
     /* Internal methods
     /**********************************************************
      */
-    
+
     /**
      * Method called to map a JSON Array into a Java value.
      */
@@ -541,7 +543,8 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
 
             //case JsonTokenId.ID_END_ARRAY: // invalid
             default:
-                throw ctxt.mappingException(Object.class);
+                ctxt.reportMappingException(Object.class);
+                return null;
             }
         }
 
@@ -579,7 +582,8 @@ public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt, Ty
             case JsonTokenId.ID_NULL: // should not get this far really but...
                 return null;
             default:
-                throw ctxt.mappingException(Object.class);
+                ctxt.reportMappingException(Object.class);
+                return null;
             }
         }
 
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/TestValueAnnotations.java b/src/test/java/com/fasterxml/jackson/databind/deser/TestValueAnnotations.java
@@ -67,13 +67,14 @@ static class RootStringDeserializer
         public RootStringDeserializer() { super(RootString.class); }
 
         @Override
-        public RootString deserialize(JsonParser jp, DeserializationContext ctxt)
-            throws IOException, JsonProcessingException
+        public RootString deserialize(JsonParser p, DeserializationContext ctxt)
+            throws IOException
         {
-            if (jp.getCurrentToken() == JsonToken.VALUE_STRING) {
-                return new RootStringImpl(jp.getText());
+            if (p.hasToken(JsonToken.VALUE_STRING)) {
+                return new RootStringImpl(p.getText());
             }
-            throw ctxt.mappingException(_valueClass);
+            ctxt.reportMappingException(_valueClass);
+            return null;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -500,9 +500,10 @@ protected Object deserializeFromNull(JsonParser p, DeserializationContext ctxt)`
`500`	`500`	`p2.close();`
`501`	`501`	`return ob;`
`502`	`502`	`}`
`503`		`- throw ctxt.mappingException(handledType());`
	`503`	`+ ctxt.reportMappingException(handledType());`
	`504`	`+ return null;`
`504`	`505`	`}`
`505`		`-`
	`506`	`+`
`506`	`507`	`/*`
`507`	`508`	`/**********************************************************`
`508`	`509`	`/* Deserializing when we have to consider an active View`
Original file line number	Diff line number	Diff line change
`@@ -1302,7 +1302,8 @@ public Object deserializeFromArray(JsonParser p, DeserializationContext ctxt) th`
`1302`	`1302`	`ctxt.reportMappingException(handledType(), JsonToken.START_ARRAY);`
`1303`	`1303`	`return null;`
`1304`	`1304`	`}`
`1305`		`- throw ctxt.mappingException(handledType());`
	`1305`	`+ ctxt.reportMappingException(handledType());`
	`1306`	`+ return null;`
`1306`	`1307`	`}`
`1307`	`1308`
`1308`	`1309`	`public Object deserializeFromEmbedded(JsonParser p, DeserializationContext ctxt)`
Original file line number	Diff line number	Diff line change
`@@ -164,10 +164,11 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt)`
`164`	`164`	`// these only work if there's a (delegating) creator...`
`165`	`165`	`return finishBuild(ctxt, deserializeFromArray(p, ctxt));`
`166`	`166`	`case FIELD_NAME:`
`167`		`- case END_OBJECT: // added to resolve [JACKSON-319], possible related issues`
	`167`	`+ case END_OBJECT:`
`168`	`168`	`return finishBuild(ctxt, deserializeFromObject(p, ctxt));`
`169`	`169`	`default:`
`170`		`- throw ctxt.mappingException(handledType());`
	`170`	`+ ctxt.reportMappingException(handledType());`
	`171`	`+ return null;`
`171`	`172`	`}`
`172`	`173`	`}`
`173`	`174`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,8 @@ protected Object _deserializeOther(JsonParser p, DeserializationContext ctxt) th`
`211`	`211`	`}`
`212`	`212`	`return parsed;`
`213`	`213`	`}`
`214`		`- throw ctxt.mappingException(_enumClass());`
	`214`	`+ ctxt.reportMappingException(_enumClass());`
	`215`	`+ return null;`
`215`	`216`	`}`
`216`	`217`
`217`	`218`	`protected void _failOnNumber(DeserializationContext ctxt, JsonParser p, int index)`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,8 @@ public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOExcepti`
`152`	`152`	`}`
`153`	`153`	`return _deserializeEmbedded(ob, ctxt);`
`154`	`154`	`}`
`155`		`- throw ctxt.mappingException(_valueClass);`
	`155`	`+ ctxt.reportMappingException(_valueClass);`
	`156`	`+ return null;`
`156`	`157`	`}`
`157`	`158`
`158`	`159`	`protected abstract T _deserialize(String value, DeserializationContext ctxt) throws IOException;`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,8 @@ public ObjectNode deserialize(JsonParser p, DeserializationContext ctxt) throws`
`102`	`102`	`if (p.hasToken(JsonToken.END_OBJECT)) {`
`103`	`103`	`return ctxt.getNodeFactory().objectNode();`
`104`	`104`	`}`
`105`		`- throw ctxt.mappingException(ObjectNode.class);`
	`105`	`+ ctxt.reportMappingException(ObjectNode.class);`
	`106`	`+ return null;`
`106`	`107`	`}`
`107`	`108`	`}`
`108`	`109`
`@@ -123,7 +124,8 @@ public ArrayNode deserialize(JsonParser p, DeserializationContext ctxt) throws I`
`123`	`124`	`if (p.isExpectedStartArrayToken()) {`
`124`	`125`	`return deserializeArray(p, ctxt, ctxt.getNodeFactory());`
`125`	`126`	`}`
`126`		`- throw ctxt.mappingException(ArrayNode.class);`
	`127`	`+ ctxt.reportMappingException(ArrayNode.class);`
	`128`	`+ return null;`
`127`	`129`	`}`
`128`	`130`	`}`
`129`	`131`	`}`
`@@ -332,7 +334,8 @@ protected final JsonNode deserializeAny(JsonParser p, DeserializationContext ctx`
`332`	`334`	`//case END_OBJECT:`
`333`	`335`	`//case END_ARRAY:`
`334`	`336`	`default:`
`335`		`- throw ctxt.mappingException(handledType());`
	`337`	`+ ctxt.reportMappingException(handledType());`
	`338`	`+ return null;`
`336`	`339`	`}`
`337`	`340`	`}`
`338`	`341`