Minor improvement to DatabindException.wrapWithPath()

cowtowncoder · cowtowncoder · commit 1d11481910d2 · 2025-04-10T19:58:24.000-07:00
diff --git a/src/main/java/tools/jackson/databind/DatabindException.java b/src/main/java/tools/jackson/databind/DatabindException.java
@@ -74,6 +74,29 @@ public static DatabindException from(DeserializationContext ctxt, String msg) {
         return new DatabindException(_parser(ctxt), msg);
     }
 
+    // // "Overrides": methods with name same as ones from JacksonException
+    // // (but for static methods no real overriding, static dispatch)
+
+    public static JacksonException wrapWithPath(Throwable src, Object refFrom,
+            String refPropertyName) {
+        return wrapWithPath(src, new Reference(refFrom, refPropertyName));
+    }
+
+    public static JacksonException wrapWithPath(Throwable src, Object refFrom, int index) {
+        return wrapWithPath(src, new Reference(refFrom, index));
+    }
+
+    public static JacksonException wrapWithPath(Throwable src, Reference ref) {
+        return JacksonException.wrapWithPath(src, ref,
+                (msg, cause) -> new DatabindException(msg, null, cause));
+    }
+
+    /*
+    /**********************************************************************
+    /* Helper methods
+    /**********************************************************************
+     */
+
     private static JsonParser _parser(DeserializationContext ctxt) {
         return (ctxt == null) ? null : ctxt.getParser();
     }
diff --git a/src/main/java/tools/jackson/databind/deser/bean/BeanAsArrayBuilderDeserializer.java b/src/main/java/tools/jackson/databind/deser/bean/BeanAsArrayBuilderDeserializer.java
@@ -120,7 +120,7 @@ protected final Object finishBuild(DeserializationContext ctxt, Object builder)
         try {
             return _buildMethod.getMember().invoke(builder, (Object[]) null);
         } catch (Exception e) {
-            return wrapInstantiationProblem(e, ctxt);
+            return wrapInstantiationProblem(ctxt, e);
         }
     }
 
@@ -330,7 +330,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,
             try {
                 builder = creator.build(ctxt, buffer);
             } catch (Exception e) {
-                return wrapInstantiationProblem(e, ctxt);
+                return wrapInstantiationProblem(ctxt, e);
             }
         }
         return builder;
diff --git a/src/main/java/tools/jackson/databind/deser/bean/BeanAsArrayDeserializer.java b/src/main/java/tools/jackson/databind/deser/bean/BeanAsArrayDeserializer.java
@@ -449,7 +449,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p, final
             try {
                 bean = creator.build(ctxt, buffer);
             } catch (Exception e) {
-                return wrapInstantiationProblem(e, ctxt);
+                return wrapInstantiationProblem(ctxt, e);
             }
         }
         return bean;
diff --git a/src/main/java/tools/jackson/databind/deser/bean/BeanDeserializer.java b/src/main/java/tools/jackson/databind/deser/bean/BeanDeserializer.java
@@ -597,7 +597,7 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
                     try {
                         bean = creator.build(ctxt, buffer);
                     } catch (Exception e) {
-                        bean = wrapInstantiationProblem(e, ctxt);
+                        bean = wrapInstantiationProblem(ctxt, e);
                     }
                     // [databind#631]: Assign current value, to be accessible by custom serializers
                     p.assignCurrentValue(bean);
@@ -687,7 +687,7 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
         try {
             bean = creator.build(ctxt, buffer);
         } catch (Exception e) {
-            return wrapInstantiationProblem(e, ctxt);
+            return wrapInstantiationProblem(ctxt, e);
         }
         p.assignCurrentValue(bean);
         // [databind#4938] Since 2.19, allow returning `null` from creator,
@@ -1047,7 +1047,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri
                     try {
                         bean = creator.build(ctxt, buffer);
                     } catch (Exception e) {
-                        bean = wrapInstantiationProblem(e, ctxt);
+                        bean = wrapInstantiationProblem(ctxt, e);
                     }
                     // [databind#631]: Assign current value, to be accessible by custom serializers
                     p.assignCurrentValue(bean);
@@ -1129,7 +1129,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri
         try {
             bean = creator.build(ctxt, buffer);
         } catch (Exception e) {
-            return wrapInstantiationProblem(e, ctxt);
+            return wrapInstantiationProblem(ctxt, e);
         }
         // [databind#4938] Since 2.19, allow returning `null` from creator,
         //  but if so, need to skip all possibly relevant content
@@ -1309,7 +1309,7 @@ protected Object deserializeUsingPropertyBasedWithExternalTypeId(JsonParser p, D
         try {
             return ext.complete(p, ctxt, buffer, creator);
         } catch (Exception e) {
-            return wrapInstantiationProblem(e, ctxt);
+            return wrapInstantiationProblem(ctxt, e);
         }
     }
 
diff --git a/src/main/java/tools/jackson/databind/deser/bean/BeanDeserializerBase.java b/src/main/java/tools/jackson/databind/deser/bean/BeanDeserializerBase.java
@@ -1841,18 +1841,19 @@ protected ValueDeserializer<Object> _findSubclassDeserializer(DeserializationCon
      * this method throw an exception; otherwise they would be required
      * to return.
      */
-    public DatabindException wrapAndThrow(Throwable t, Object bean, String fieldName, DeserializationContext ctxt)
+    public DatabindException wrapAndThrow(Throwable t, Object bean, String fieldName,
+            DeserializationContext ctxt)
     {
         // 23-Aug-2022, tatu: Due to fix to prevent "double-array-wrapping", looks
         //    like 'fieldName' may occasionally be `null`; hence
         if (fieldName == null) {
             fieldName = "";
         }
-        throw DatabindException.wrapWithPath(throwOrReturnThrowable(t, ctxt),
+        throw DatabindException.wrapWithPath(throwOrReturnThrowable(ctxt, t),
                 bean, fieldName);
     }
 
-    private Throwable throwOrReturnThrowable(Throwable t, DeserializationContext ctxt)
+    private Throwable throwOrReturnThrowable(DeserializationContext ctxt, Throwable t)
         throws JacksonException
     {
         // 05-Mar-2009, tatu: But one nasty edge is when we get
@@ -1875,7 +1876,7 @@ private Throwable throwOrReturnThrowable(Throwable t, DeserializationContext ctx
         return t;
     }
 
-    protected Object wrapInstantiationProblem(Throwable t, DeserializationContext ctxt)
+    protected Object wrapInstantiationProblem(DeserializationContext ctxt,Throwable t)
         throws JacksonException
     {
         while (t instanceof InvocationTargetException && t.getCause() != null) {
diff --git a/src/main/java/tools/jackson/databind/deser/bean/BuilderBasedDeserializer.java b/src/main/java/tools/jackson/databind/deser/bean/BuilderBasedDeserializer.java
@@ -228,7 +228,7 @@ protected Object finishBuild(DeserializationContext ctxt, Object builder)
         try {
             return _buildMethod.getMember().invoke(builder, (Object[]) null);
         } catch (Exception e) {
-            return wrapInstantiationProblem(e, ctxt);
+            return wrapInstantiationProblem(ctxt, e);
         }
     }
 
@@ -473,7 +473,7 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p,
         try {
             builder = creator.build(ctxt, buffer);
         } catch (Exception e) {
-            builder = wrapInstantiationProblem(e, ctxt);
+            builder = wrapInstantiationProblem(ctxt, e);
         }
         if (unknown != null) {
             // polymorphic?
@@ -799,7 +799,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p,
         try {
             builder = creator.build(ctxt, buffer);
         } catch (Exception e) {
-            return wrapInstantiationProblem(e, ctxt);
+            return wrapInstantiationProblem(ctxt, e);
 
         }
         return _unwrappedPropertyHandler.processUnwrapped(p, ctxt, builder, tokens);
diff --git a/src/test/java/tools/jackson/databind/exc/UnwrapRootCause4603Test.java b/src/test/java/tools/jackson/databind/exc/UnwrapRootCause4603Test.java
@@ -66,8 +66,7 @@ public void testExceptionWrappingConfiguration()
         throws Exception
     {
         JacksonException disabledResult = _tryDeserializeWith(MAPPER);
-        // !!! TODO: ought to be DatabindException
-        assertInstanceOf(JacksonException.class, disabledResult);
+        assertInstanceOf(DatabindException.class, disabledResult);
         // We are throwing exception inside a setter, but InvocationTargetException
         // will still be unwrapped
         assertInstanceOf(CustomException.class, disabledResult.getCause());
diff --git a/src/test/java/tools/jackson/databind/introspect/TestAutoDetect.java b/src/test/java/tools/jackson/databind/introspect/TestAutoDetect.java
@@ -183,6 +183,7 @@ public void testVisibilityConfigOverridesForDeser() throws Exception
             MAPPER.readValue(JSON, Feature1347DeserBean.class);
             fail("Should not pass");
         } catch (JacksonException e) { // should probably be something more specific but...
+            assertInstanceOf(DatabindException.class, e);
             verifyException(e, "Should NOT get called");
         }
 

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ protected final Object finishBuild(DeserializationContext ctxt, Object builder)`
`120`	`120`	`try {`
`121`	`121`	`return _buildMethod.getMember().invoke(builder, (Object[]) null);`
`122`	`122`	`} catch (Exception e) {`
`123`		`- return wrapInstantiationProblem(e, ctxt);`
	`123`	`+ return wrapInstantiationProblem(ctxt, e);`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
`@@ -330,7 +330,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,`
`330`	`330`	`try {`
`331`	`331`	`builder = creator.build(ctxt, buffer);`
`332`	`332`	`} catch (Exception e) {`
`333`		`- return wrapInstantiationProblem(e, ctxt);`
	`333`	`+ return wrapInstantiationProblem(ctxt, e);`
`334`	`334`	`}`
`335`	`335`	`}`
`336`	`336`	`return builder;`
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p, final`
`449`	`449`	`try {`
`450`	`450`	`bean = creator.build(ctxt, buffer);`
`451`	`451`	`} catch (Exception e) {`
`452`		`- return wrapInstantiationProblem(e, ctxt);`
	`452`	`+ return wrapInstantiationProblem(ctxt, e);`
`453`	`453`	`}`
`454`	`454`	`}`
`455`	`455`	`return bean;`
Original file line number	Diff line number	Diff line change
`@@ -1841,18 +1841,19 @@ protected ValueDeserializer<Object> _findSubclassDeserializer(DeserializationCon`
`1841`	`1841`	`* this method throw an exception; otherwise they would be required`
`1842`	`1842`	`* to return.`
`1843`	`1843`	`*/`
`1844`		`- public DatabindException wrapAndThrow(Throwable t, Object bean, String fieldName, DeserializationContext ctxt)`
	`1844`	`+ public DatabindException wrapAndThrow(Throwable t, Object bean, String fieldName,`
	`1845`	`+ DeserializationContext ctxt)`
`1845`	`1846`	`{`
`1846`	`1847`	`// 23-Aug-2022, tatu: Due to fix to prevent "double-array-wrapping", looks`
`1847`	`1848`	// like 'fieldName' may occasionally be `null`; hence
`1848`	`1849`	`if (fieldName == null) {`
`1849`	`1850`	`fieldName = "";`
`1850`	`1851`	`}`
`1851`		`- throw DatabindException.wrapWithPath(throwOrReturnThrowable(t, ctxt),`
	`1852`	`+ throw DatabindException.wrapWithPath(throwOrReturnThrowable(ctxt, t),`
`1852`	`1853`	`bean, fieldName);`
`1853`	`1854`	`}`
`1854`	`1855`
`1855`		`- private Throwable throwOrReturnThrowable(Throwable t, DeserializationContext ctxt)`
	`1856`	`+ private Throwable throwOrReturnThrowable(DeserializationContext ctxt, Throwable t)`
`1856`	`1857`	`throws JacksonException`
`1857`	`1858`	`{`
`1858`	`1859`	`// 05-Mar-2009, tatu: But one nasty edge is when we get`
`@@ -1875,7 +1876,7 @@ private Throwable throwOrReturnThrowable(Throwable t, DeserializationContext ctx`
`1875`	`1876`	`return t;`
`1876`	`1877`	`}`
`1877`	`1878`
`1878`		`- protected Object wrapInstantiationProblem(Throwable t, DeserializationContext ctxt)`
	`1879`	`+ protected Object wrapInstantiationProblem(DeserializationContext ctxt,Throwable t)`
`1879`	`1880`	`throws JacksonException`
`1880`	`1881`	`{`
`1881`	`1882`	`while (t instanceof InvocationTargetException && t.getCause() != null) {`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ protected Object finishBuild(DeserializationContext ctxt, Object builder)`
`228`	`228`	`try {`
`229`	`229`	`return _buildMethod.getMember().invoke(builder, (Object[]) null);`
`230`	`230`	`} catch (Exception e) {`
`231`		`- return wrapInstantiationProblem(e, ctxt);`
	`231`	`+ return wrapInstantiationProblem(ctxt, e);`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`
`@@ -473,7 +473,7 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p,`
`473`	`473`	`try {`
`474`	`474`	`builder = creator.build(ctxt, buffer);`
`475`	`475`	`} catch (Exception e) {`
`476`		`- builder = wrapInstantiationProblem(e, ctxt);`
	`476`	`+ builder = wrapInstantiationProblem(ctxt, e);`
`477`	`477`	`}`
`478`	`478`	`if (unknown != null) {`
`479`	`479`	`// polymorphic?`
`@@ -799,7 +799,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p,`
`799`	`799`	`try {`
`800`	`800`	`builder = creator.build(ctxt, buffer);`
`801`	`801`	`} catch (Exception e) {`
`802`		`- return wrapInstantiationProblem(e, ctxt);`
	`802`	`+ return wrapInstantiationProblem(ctxt, e);`
`803`	`803`
`804`	`804`	`}`
`805`	`805`	`return _unwrappedPropertyHandler.processUnwrapped(p, ctxt, builder, tokens);`
Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ public void testVisibilityConfigOverridesForDeser() throws Exception`
`183`	`183`	`MAPPER.readValue(JSON, Feature1347DeserBean.class);`
`184`	`184`	`fail("Should not pass");`
`185`	`185`	`} catch (JacksonException e) { // should probably be something more specific but...`
	`186`	`+ assertInstanceOf(DatabindException.class, e);`
`186`	`187`	`verifyException(e, "Should NOT get called");`
`187`	`188`	`}`
`188`	`189`