Merge branch '2.x' into 3.x

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1215,10 +1215,13 @@ Oleg Chtchoukine (oshatrk@github)
     to incorrect output
   (2.11.1)
 
-Joshua Shannon (retrodaredevil@github)
+Lavender Shannon (retrodaredevil@github)
   * Reported, contributed fix for #2785: Polymorphic subtypes not registering on copied
     ObjectMapper (2.11.1)
   (2.11.2)
+  * Requested #3072: Allow specifying `@JacksonInject` does not fail when there's no
+    corresponding value
+  (2.20.0)
 
 Daniel Hrabovcak (TheSpiritXIII@github)
   * Reported #2796: `TypeFactory.constructType()` does not take `TypeBindings` correctly
@@ -1940,3 +1943,8 @@ Will Paul (@dropofwill)
 Ryan Schmitt (@rschmitt)
  * Contributed #5099: Fix regression in `ObjectNode.with()`
   (2.19.0)
+
+Giulio Longfils (@giulong)
+ * Contributed #3072: Allow specifying `@JacksonInject` does not fail when there's no
+   corresponding value
+  (2.20.0)

release-notes/VERSION-2.x

@@ -6,6 +6,10 @@ Project: jackson-databind
 
 2.20.0 (not yet released)
 
+#3072: Allow specifying `@JacksonInject` does not fail when there's no
+  corresponding value
+ (requested by Lavender S)
+ (contributed by Giulio L)
 #4136: Drop deprecated (in 2.12) `PropertyNamingStrategy` implementations
   from 2.20
 #5103: Use `writeStartObject(Object forValue, int size)` for `ObjectNode`

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

@@ -4,6 +4,7 @@
 import java.text.ParseException;
 import java.util.*;
 
+import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.ObjectIdGenerator;
 import com.fasterxml.jackson.annotation.ObjectIdResolver;
@@ -14,25 +15,12 @@
 import tools.jackson.core.type.ResolvedType;
 import tools.jackson.core.type.TypeReference;
 import tools.jackson.core.util.JacksonFeatureSet;
-import tools.jackson.databind.cfg.CoercionAction;
-import tools.jackson.databind.cfg.CoercionInputShape;
-import tools.jackson.databind.cfg.ContextAttributes;
-import tools.jackson.databind.cfg.DatatypeFeature;
-import tools.jackson.databind.cfg.DatatypeFeatures;
+import tools.jackson.databind.cfg.*;
 import tools.jackson.databind.deser.*;
 import tools.jackson.databind.deser.impl.ObjectIdReader;
 import tools.jackson.databind.deser.impl.TypeWrappedDeserializer;
-import tools.jackson.databind.exc.InvalidDefinitionException;
-import tools.jackson.databind.exc.InvalidFormatException;
-import tools.jackson.databind.exc.InvalidTypeIdException;
-import tools.jackson.databind.exc.MismatchedInputException;
-import tools.jackson.databind.exc.UnrecognizedPropertyException;
-import tools.jackson.databind.exc.ValueInstantiationException;
-import tools.jackson.databind.introspect.Annotated;
-import tools.jackson.databind.introspect.AnnotatedClass;
-import tools.jackson.databind.introspect.AnnotatedMember;
-import tools.jackson.databind.introspect.BeanPropertyDefinition;
-import tools.jackson.databind.introspect.ClassIntrospector;
+import tools.jackson.databind.exc.*;
+import tools.jackson.databind.introspect.*;
 import tools.jackson.databind.jsontype.TypeDeserializer;
 import tools.jackson.databind.jsontype.TypeIdResolver;
 import tools.jackson.databind.node.JsonNodeFactory;
@@ -482,13 +470,19 @@ public final boolean isEnabled(StreamReadCapability cap) {
     public final JsonParser getParser() { return _parser; }
 
     public final Object findInjectableValue(Object valueId,
-            BeanProperty forProperty, Object beanInstance)
+            BeanProperty forProperty, Object beanInstance, Boolean optional)
     {
         if (_injectableValues == null) {
+            // `optional` comes from property annotation (if any); has precedence
+            // over global setting.
+            if (Boolean.TRUE.equals(optional)
+                    || (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));
+"No 'injectableValues' configured, cannot inject value with id '%s'", valueId));
         }
-        return _injectableValues.findInjectableValue(valueId, this, forProperty, beanInstance);
+        return _injectableValues.findInjectableValue(valueId, this, forProperty, beanInstance, optional);
     }
 
     /**

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

@@ -1,5 +1,7 @@
 package tools.jackson.databind;
 
+import com.fasterxml.jackson.annotation.JacksonInject;
+
 import tools.jackson.databind.cfg.ConfigFeature;
 import tools.jackson.databind.cfg.MapperBuilder;
 
@@ -234,12 +236,19 @@ public enum DeserializationFeature implements ConfigFeature
      * for binding the full value, and nothing more (except for possible ignorable
      * white space or comments, if supported by data format).
      *<p>
+<<<<<<< HEAD:src/main/java/tools/jackson/databind/DeserializationFeature.java
      * NOTE: this feature should usually be disabled when reading from
      * {@link java.io.DataInput}, since it cannot detect end-of-input efficiently
      * (but by throwing an {@link java.io.IOException}). Disabling is NOT done
      * automatically by Jackson: users are recommended to disable it.
      *<p>
      * Feature is enabled by default as of Jackson 3.0 (in 2.x it was disabled).
+=======
+     * Feature is disabled by default (so that no check is made for possible trailing
+     * token(s)) for backwards-compatibility reasons.
+     *
+     * @since 2.9
+>>>>>>> 2.x:src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java
      */
     FAIL_ON_TRAILING_TOKENS(true),
 
@@ -301,6 +310,21 @@ public enum DeserializationFeature implements ConfigFeature
      */
     FAIL_ON_UNEXPECTED_VIEW_PROPERTIES(false),
 
+    /**
+     * Feature that determines the handling of injected properties during deserialization.
+     *<p>
+     * When enabled, if an injected property without matching value is encountered
+     * during deserialization,  an exception is thrown.
+     * When disabled, no exception is thrown.
+     * See {@link JacksonInject#optional()} for per-property override
+     * of this setting.
+     *<p>
+     * This feature is enabled by default to maintain backwards-compatibility.
+     *
+     * @see JacksonInject#optional()
+     */
+    FAIL_ON_UNKNOWN_INJECT_VALUE(true),
+
     /*
     /**********************************************************************
     /* Structural conversion features

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

@@ -25,9 +25,11 @@ public abstract class InjectableValues
      * @param forProperty Bean property in which value is to be injected
      * @param beanInstance Bean instance that contains property to inject,
      *    if available; null if bean has not yet been constructed.
+     * @param optional Flag used for configuring the behavior when the value
+     *    to inject is not found
      */
     public abstract Object findInjectableValue(Object valueId, DeserializationContext ctxt,
-            BeanProperty forProperty, Object beanInstance);
+            BeanProperty forProperty, Object beanInstance, Boolean optional);
 
     /*
     /**********************************************************
@@ -75,7 +77,7 @@ public Std snapshot() {
 
         @Override
         public Object findInjectableValue(Object valueId, DeserializationContext ctxt,
-                BeanProperty forProperty, Object beanInstance)
+                BeanProperty forProperty, Object beanInstance, Boolean optional)
         {
             if (!(valueId instanceof String)) {
                 ctxt.reportBadDefinition(ClassUtil.classOf(valueId),
@@ -86,7 +88,13 @@ public Object findInjectableValue(Object valueId, DeserializationContext ctxt,
             String key = (String) valueId;
             Object ob = _values.get(key);
             if (ob == null && !_values.containsKey(key)) {
-                throw new IllegalArgumentException("No injectable value with id '"+key+"' found (for property '"+forProperty.getName()+"')");
+                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() + "')"));
+                }
             }
             return ob;
         }

src/main/java/tools/jackson/databind/deser/BeanDeserializerBuilder.java

@@ -240,10 +240,10 @@ public void  addBackReferenceProperty(String referenceName, SettableBeanProperty
 
     public void addInjectable(PropertyName propName, JavaType propType,
             Annotations contextAnnotations, AnnotatedMember member,
-            Object valueId)
+            Object valueId, Boolean optional)
     {
         if (_injectables == null) {
-            _injectables = new ArrayList<ValueInjector>();
+            _injectables = new ArrayList<>();
         }
         if ( _config.canOverrideAccessModifiers()) {
             try {
@@ -252,7 +252,7 @@ public void addInjectable(PropertyName propName, JavaType propType,
                 _handleBadAccess(e);
             }
         }
-        _injectables.add(new ValueInjector(propName, propType, member, valueId));
+        _injectables.add(new ValueInjector(propName, propType, member, valueId, optional));
     }
 
     /**
@@ -262,15 +262,13 @@ public void addInjectable(PropertyName propName, JavaType propType,
     public void addIgnorable(String propName)
     {
         if (_ignorableProps == null) {
-            _ignorableProps = new HashSet<String>();
+            _ignorableProps = new HashSet<>();
         }
         _ignorableProps.add(propName);
     }
 
     /**
      * Method that will add property name as one of the properties that will be included.
-     *
-     * @since 2.12
      */
     public void addIncludable(String propName)
     {

src/main/java/tools/jackson/databind/deser/BeanDeserializerFactory.java

@@ -1,6 +1,5 @@
 package tools.jackson.databind.deser;
 
-import java.lang.reflect.Modifier;
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.*;
@@ -774,11 +773,16 @@ protected void addInjectables(DeserializationContext ctxt,
     {
         Map<Object, AnnotatedMember> raw = beanDescRef.get().findInjectables();
         if (raw != null) {
+            final AnnotationIntrospector introspector = ctxt.getAnnotationIntrospector();
+
             for (Map.Entry<Object, AnnotatedMember> entry : raw.entrySet()) {
                 AnnotatedMember m = entry.getValue();
+                final JacksonInject.Value injectableValue = introspector.findInjectableValue(ctxt.getConfig(), m);
+                final Boolean optional = injectableValue == null ? null : injectableValue.getOptional();
+
                 builder.addInjectable(PropertyName.construct(m.getName()),
                         m.getType(),
-                        beanDescRef.getClassAnnotations(), m, entry.getKey());
+                        beanDescRef.getClassAnnotations(), m, entry.getKey(), optional);
             }
         }
     }

src/main/java/tools/jackson/databind/deser/bean/PropertyValueBuffer.java

@@ -258,7 +258,7 @@ protected Object _findMissing(SettableBeanProperty prop) throws DatabindExceptio
         Object injectableValueId = prop.getInjectableValueId();
         if (injectableValueId != null) {
             return _context.findInjectableValue(prop.getInjectableValueId(),
-                    prop, null);
+                    prop, null, null);
         }
         // Second: required?
         if (prop.isRequired()) {

src/main/java/tools/jackson/databind/deser/impl/ValueInjector.java

@@ -1,5 +1,7 @@
 package tools.jackson.databind.deser.impl;
 
+import com.fasterxml.jackson.annotation.JacksonInject;
+
 import tools.jackson.core.JacksonException;
 import tools.jackson.databind.*;
 import tools.jackson.databind.introspect.AnnotatedMember;
@@ -20,22 +22,31 @@ public class ValueInjector
      */
     protected final Object _valueId;
 
+    /**
+     * Flag used for configuring the behavior when the value to inject is not found.
+     */
+    protected final Boolean _optional;
+
     public ValueInjector(PropertyName propName, JavaType type,
-            AnnotatedMember mutator, Object valueId)
+            AnnotatedMember mutator, Object valueId, Boolean optional)
     {
         super(propName, type, null, mutator, PropertyMetadata.STD_OPTIONAL);
         _valueId = valueId;
+        _optional = optional;
     }
 
     public Object findValue(DeserializationContext context, Object beanInstance)
         throws JacksonException
     {
-        return context.findInjectableValue(_valueId, this, beanInstance);
+        return context.findInjectableValue(_valueId, this, beanInstance, _optional);
     }
 
     public void inject(DeserializationContext context, Object beanInstance)
         throws JacksonException
     {
-        _member.setValue(beanInstance, findValue(context, beanInstance));
+        final Object value = findValue(context, beanInstance);
+        if (!JacksonInject.Value.empty().equals(value)) {
+            _member.setValue(beanInstance, value);
+        }
     }
-}
+}

src/main/java/tools/jackson/databind/deser/std/StdValueInstantiator.java

@@ -629,7 +629,8 @@ private Object _createUsingDelegate(AnnotatedWithParams delegateCreator,
                 if (prop == null) { // delegate
                     args[i] = delegate;
                 } else { // nope, injectable:
-                    args[i] = ctxt.findInjectableValue(prop.getInjectableValueId(), prop, null);
+                    // 09-May-2025, tatu: Not sure where to get "optional" (last arg) value...
+                    args[i] = ctxt.findInjectableValue(prop.getInjectableValueId(), prop, null, null);
                 }
             }
             // and then try calling with full set of arguments