Prep work for #5151 (#5154)

Author: cowtowncoder

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

@@ -474,8 +474,9 @@ public final Object findInjectableValue(Object valueId,
                     || (optional == null && !isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_INJECT_VALUE))) {
                 return JacksonInject.Value.empty();
             }
-            return reportBadDefinition(ClassUtil.classOf(valueId), String.format(
-"No 'injectableValues' configured, cannot inject value with id '%s'", valueId));
+            throw missingInjectValueException(String.format(
+"No 'injectableValues' configured, cannot inject value with id '%s'", valueId),
+                    valueId, forProperty, beanInstance);
         }
         return _injectableValues.findInjectableValue(valueId, this, forProperty, beanInstance, optional);
     }
@@ -2095,6 +2096,16 @@ public JsonMappingException missingTypeIdException(JavaType baseType,
         return InvalidTypeIdException.from(_parser, _colonConcat(msg, extraDesc), baseType, null);
     }
 
+    /**
+     * @since 2.20
+     */
+    public JsonMappingException missingInjectValueException(String msg,
+            Object valueId,
+            BeanProperty forProperty, Object beanInstance) {
+        return InvalidDefinitionException.from(_parser, msg,
+                constructType(ClassUtil.classOf(beanInstance)));
+    }
+
     /*
     /**********************************************************
     /* Other internal methods

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

@@ -96,9 +96,10 @@ public Object findInjectableValue(Object valueId, DeserializationContext ctxt,
                 if (Boolean.FALSE.equals(optional)
                         || ((optional == null)
                                 && ctxt.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_INJECT_VALUE))) {
-                    return ctxt.reportBadDefinition(ClassUtil.classOf(valueId), String.format(
-                            "No injectable value with id '" + key + "' " +
-                            "found (for property '" + forProperty.getName() + "')"));
+                    throw ctxt.missingInjectValueException(
+                            String.format("No injectable value with id '%s' found (for property '%s')",
+                            key, forProperty.getName()),
+                            valueId, forProperty, beanInstance);
                 }
             }
             return ob;