Merge branch '2.x' into 3.x

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -14,6 +14,8 @@ Project: jackson-databind
   from 2.20
 #5103: Use `writeStartObject(Object forValue, int size)` for `ObjectNode`
   serialization
+#5151: Add new exception type, `MissingInjectValueException`, to be used
+  for failed `@JacksonInject`
 - Generate SBOMs [JSTEP-14]
 
 2.19.1 (not yet released)

src/main/java/tools/jackson/databind/DeserializationContext.java

@@ -479,7 +479,7 @@ public final Object findInjectableValue(Object valueId,
                     || (optional == null && !isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_INJECT_VALUE))) {
                 return JacksonInject.Value.empty();
             }
-            throw missingInjectValueException(String.format(
+            throw missingInjectableValueException(String.format(
 "No 'injectableValues' configured, cannot inject value with id '%s'", valueId),
                     valueId, forProperty, beanInstance);
         }
@@ -2100,11 +2100,11 @@ public DatabindException missingTypeIdException(JavaType baseType,
         return InvalidTypeIdException.from(_parser, _colonConcat(msg, extraDesc), baseType, null);
     }
 
-    public DatabindException missingInjectValueException(String msg,
+    public DatabindException missingInjectableValueException(String msg,
             Object valueId,
             BeanProperty forProperty, Object beanInstance) {
-        return InvalidDefinitionException.from(_parser, msg,
-                constructType(ClassUtil.classOf(beanInstance)));
+        return MissingInjectableValueExcepion.from(_parser, msg,
+                valueId, forProperty, beanInstance);
     }
 
     /*

src/main/java/tools/jackson/databind/InjectableValues.java

@@ -82,18 +82,19 @@ public Object findInjectableValue(DeserializationContext ctxt,
                 BeanProperty forProperty, Object beanInstance, Boolean optional)
         {
             if (!(valueId instanceof String)) {
-                ctxt.reportBadDefinition(ClassUtil.classOf(valueId),
+                throw ctxt.missingInjectableValueException(
                         String.format(
-                        "Unrecognized inject value id type (%s), expecting String",
-                        ClassUtil.classNameOf(valueId)));
+                        "Unsupported injectable value id type (%s), expecting String",
+                        ClassUtil.classNameOf(valueId)),
+                        valueId, forProperty, beanInstance);
             }
             String key = (String) valueId;
             Object ob = _values.get(key);
             if (ob == null && !_values.containsKey(key)) {
                 if (Boolean.FALSE.equals(optional)
                         || ((optional == null)
                                 && ctxt.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_INJECT_VALUE))) {
-                    throw ctxt.missingInjectValueException(
+                    throw ctxt.missingInjectableValueException(
                             String.format("No injectable value with id '%s' found (for property '%s')",
                             key, forProperty.getName()),
                             valueId, forProperty, beanInstance);

src/main/java/tools/jackson/databind/exc/MissingInjectableValueExcepion.java

@@ -0,0 +1,35 @@
+package tools.jackson.databind.exc;
+
+import tools.jackson.core.JsonParser;
+
+import tools.jackson.databind.BeanProperty;
+import tools.jackson.databind.DatabindException;
+
+public class MissingInjectableValueExcepion
+    extends DatabindException
+{
+    private static final long serialVersionUID = 1L;
+
+    protected final Object _valueId;
+    protected final BeanProperty _forProperty;
+    protected final Object _beanInstance;
+
+    protected MissingInjectableValueExcepion(JsonParser p, String msg,
+            Object valueId, BeanProperty forProperty, Object beanInstance)
+    {
+        super(p, msg);
+        _valueId = valueId;
+        _forProperty = forProperty;
+        _beanInstance = beanInstance;
+    }
+
+    public static MissingInjectableValueExcepion from(JsonParser p, String msg,
+            Object valueId, BeanProperty forProperty, Object beanInstance)
+    {
+        return new MissingInjectableValueExcepion(p, msg, valueId, forProperty, beanInstance);
+    }
+
+    public Object getValueId() { return _valueId; }
+    public BeanProperty getForProperty() { return _forProperty; }
+    public Object getBeanInstance() { return _beanInstance; }
+}

src/test/java/tools/jackson/databind/deser/inject/JacksonInject3072Test.java

@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.annotation.OptBoolean;
 
 import tools.jackson.databind.*;
-import tools.jackson.databind.exc.InvalidDefinitionException;
+import tools.jackson.databind.exc.MissingInjectableValueExcepion;
 import tools.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -66,8 +66,8 @@ void testOptionalFieldNotFound() throws Exception {
 
     @Test
     void testMandatoryFieldNotFound() {
-        InvalidDefinitionException exception = assertThrows(
-                InvalidDefinitionException.class, () -> READER.readValue("{}"));
+        MissingInjectableValueExcepion exception = assertThrows(
+                MissingInjectableValueExcepion.class, () -> READER.readValue("{}"));
 
         assertThat(exception.getMessage())
             .startsWith("No 'injectableValues' configured, cannot inject value with id 'id'");
@@ -80,8 +80,8 @@ void testRequiredAnnotatedField() throws Exception {
         ObjectReader reader = READER.forType(DtoWithRequired.class)
             .without(DeserializationFeature.FAIL_ON_UNKNOWN_INJECT_VALUE);
 
-        InvalidDefinitionException exception = assertThrows(
-                InvalidDefinitionException.class, () -> reader.readValue("{}"));
+        MissingInjectableValueExcepion exception = assertThrows(
+                MissingInjectableValueExcepion.class, () -> reader.readValue("{}"));
 
         assertThat(exception.getMessage())
             .startsWith("No 'injectableValues' configured, cannot inject value with id 'requiredValue'");
@@ -91,7 +91,7 @@ void testRequiredAnnotatedField() throws Exception {
                 .addValue("id", "idValue"));
 
         exception = assertThrows(
-                    InvalidDefinitionException.class, () -> reader2.readValue("{}"));
+                MissingInjectableValueExcepion.class, () -> reader2.readValue("{}"));
 
         assertThat(exception.getMessage())
              .startsWith("No injectable value with id 'requiredValue' found (for property 'requiredField')");
@@ -108,8 +108,8 @@ void testMandatoryFieldNotFoundWithInjectableValues() {
         ObjectReader reader = READER
                 .with(new InjectableValues.Std());
 
-        InvalidDefinitionException exception = assertThrows(
-                InvalidDefinitionException.class, () -> reader.readValue("{}"));
+        MissingInjectableValueExcepion exception = assertThrows(
+                MissingInjectableValueExcepion.class, () -> reader.readValue("{}"));
 
         assertThat(exception.getMessage())
             .startsWith("No injectable value with id 'id' found (for property 'id')");