And some more passing of JsonParser for exceptions

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java

@@ -998,14 +998,12 @@ public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
      *
      * @since 2.3
      */
-    protected Object _handleTypedObjectId(JsonParser jp, DeserializationContext ctxt,
+    protected Object _handleTypedObjectId(JsonParser p, DeserializationContext ctxt,
             Object pojo, Object rawId)
         throws IOException
     {
-        /* 07-Aug-2013, tatu: One more challenge: type of id may not be type
-         *   of property we are expecting later on; specifically, numeric ids
-         *   vs Strings.
-         */
+        // One more challenge: type of id may not be type of property we are expecting
+        // later on; specifically, numeric ids vs Strings.
         JsonDeserializer<Object> idDeser = _objectIdReader.getDeserializer();
         final Object id;
 
@@ -1014,7 +1012,7 @@ protected Object _handleTypedObjectId(JsonParser jp, DeserializationContext ctxt
             // nope: already same type
             id = rawId;
         } else {
-            id = _convertObjectId(jp, ctxt, rawId, idDeser);
+            id = _convertObjectId(p, ctxt, rawId, idDeser);
         }
 
         ReadableObjectId roid = ctxt.findObjectId(id, _objectIdReader.generator, _objectIdReader.resolver);

src/main/java/com/fasterxml/jackson/databind/exc/IgnoredPropertyException.java

@@ -18,13 +18,28 @@ public class IgnoredPropertyException
 {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * @since 2.7
+     */
+    public IgnoredPropertyException(JsonParser p, String msg, JsonLocation loc,
+            Class<?> referringClass, String propName,
+            Collection<Object> propertyIds)
+    {
+        super(p, msg, loc, referringClass, propName, propertyIds);
+    }
+
+    /**
+     * @deprecated Since 2.7
+     */
+    @Deprecated
     public IgnoredPropertyException(String msg, JsonLocation loc,
             Class<?> referringClass, String propName,
             Collection<Object> propertyIds)
     {
         super(msg, loc, referringClass, propName, propertyIds);
     }
 
+    
     /**
      * Factory method used for constructing instances of this exception type.
      * 
@@ -35,7 +50,7 @@ public IgnoredPropertyException(String msg, JsonLocation loc,
      * @param propertyIds (optional, null if not available) Set of properties that
      *    type would recognize, if completely known: null if set can not be determined.
      */
-    public static IgnoredPropertyException from(JsonParser jp,
+    public static IgnoredPropertyException from(JsonParser p,
             Object fromObjectOrClass, String propertyName,
             Collection<Object> propertyIds)
     {
@@ -50,8 +65,8 @@ public static IgnoredPropertyException from(JsonParser jp,
         }
         String msg = "Ignored field \""+propertyName+"\" (class "+ref.getName()
                 +") encountered; mapper configured not to allow this";
-        IgnoredPropertyException e = new IgnoredPropertyException(msg,
-                jp.getCurrentLocation(), ref, propertyName, propertyIds);
+        IgnoredPropertyException e = new IgnoredPropertyException(p, msg,
+                p.getCurrentLocation(), ref, propertyName, propertyIds);
         // but let's also ensure path includes this last (missing) segment
         e.prependPath(fromObjectOrClass, propertyName);
         return e;

src/main/java/com/fasterxml/jackson/databind/exc/PropertyBindingException.java

@@ -5,6 +5,7 @@
 import java.util.Iterator;
 
 import com.fasterxml.jackson.core.JsonLocation;
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.JsonMappingException;
 
 /**
@@ -28,7 +29,7 @@ public abstract class PropertyBindingException
      * reference path.
      */
     protected final String _propertyName;
-    
+
     /**
      * Set of ids of properties that are known for the type, if this
      * can be statically determined.
@@ -40,18 +41,31 @@ public abstract class PropertyBindingException
      * constructing actual message if and as needed.
      */
     protected transient String _propertiesAsString;
-    
-    protected PropertyBindingException(String msg, JsonLocation loc,
+
+    /**
+     * @since 2.7
+     */
+    protected PropertyBindingException(JsonParser p, String msg, JsonLocation loc,
             Class<?> referringClass, String propName,
             Collection<Object> propertyIds)
     {
-        
-        super(msg, loc);
+        super(p, msg, loc);
         _referringClass = referringClass;
         _propertyName = propName;
         _propertyIds = propertyIds;
     }
 
+    /**
+     * @deprecated Since 2.7
+     */
+    @Deprecated // since 2.7
+    protected PropertyBindingException(String msg, JsonLocation loc,
+            Class<?> referringClass, String propName,
+            Collection<Object> propertyIds)
+    {
+        this(null, msg, loc, referringClass, propName, propertyIds);
+    }
+
     /*
     /**********************************************************
     /* Overrides

src/main/java/com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException.java

@@ -17,6 +17,17 @@ public class UnrecognizedPropertyException
 {
     private static final long serialVersionUID = 1L;
 
+    public UnrecognizedPropertyException(JsonParser p, String msg, JsonLocation loc,
+            Class<?> referringClass, String propName,
+            Collection<Object> propertyIds)
+    {
+        super(p, msg, loc, referringClass, propName, propertyIds);
+    }
+
+    /**
+     * @deprecated Since 2.7
+     */
+    @Deprecated // since 2.7
     public UnrecognizedPropertyException(String msg, JsonLocation loc,
             Class<?> referringClass, String propName,
             Collection<Object> propertyIds)
@@ -34,7 +45,7 @@ public UnrecognizedPropertyException(String msg, JsonLocation loc,
      * @param propertyIds (optional, null if not available) Set of properties that
      *    type would recognize, if completely known: null if set can not be determined.
      */
-    public static UnrecognizedPropertyException from(JsonParser jp,
+    public static UnrecognizedPropertyException from(JsonParser p,
             Object fromObjectOrClass, String propertyName,
             Collection<Object> propertyIds)
     {
@@ -48,18 +59,10 @@ public static UnrecognizedPropertyException from(JsonParser jp,
             ref = fromObjectOrClass.getClass();
         }
         String msg = "Unrecognized field \""+propertyName+"\" (class "+ref.getName()+"), not marked as ignorable";
-        UnrecognizedPropertyException e = new UnrecognizedPropertyException(msg,
-                jp.getCurrentLocation(), ref, propertyName, propertyIds);
+        UnrecognizedPropertyException e = new UnrecognizedPropertyException(p, msg,
+                p.getCurrentLocation(), ref, propertyName, propertyIds);
         // but let's also ensure path includes this last (missing) segment
         e.prependPath(fromObjectOrClass, propertyName);
         return e;
     }
-
-    /**
-     * @deprecated Since 2.3, use {@link #getPropertyName} instead.
-     */
-    @Deprecated // since 2.3
-    public String getUnrecognizedPropertyName() {
-        return getPropertyName();
-    }    
 }