Merge branch '2.9' of https://github.com/FasterXML/jackson-databind into 2.9

Author: cowtowncoder

release-notes/CREDITS release-notes/CREDITS-2.xrelease-notes/CREDITS renamed to release-notes/CREDITS-2.x

@@ -738,3 +738,9 @@ Alexander Skvortcov (askvortcov@github)
   * Reported #1853: Deserialise from Object (using Creator methods) returns field name
     instead of value
    (2.9.4)
+
+Joe Schafer (jschaf@github)
+  * Reported #1906: Add string format specifier for error message in `PropertyValueBuffer`
+   (2.9.4)
+  * Reported #1907: Remove `getClass()` from `_valueType` argument for error reporting
+   (2.9.4)

release-notes/VERSION-2.x

@@ -1,7 +1,8 @@
+------------------------------------------------------------------------
 Project: jackson-databind
 ------------------------------------------------------------------------
+
 === Releases === 
-------------------------------------------------------------------------
 
 2.9.4 (not yet released)
 
@@ -28,6 +29,12 @@ Project: jackson-databind
  (reported by reda-alaoui@github)
 #1895: Per-type config override "JsonFormat.Shape.OBJECT" for Map.Entry not working
  (reported by mcortella@github)
+#1899: Another two gadgets to exploit default typing issue in jackson-databind
+ (reported by OneSourceCat@github)
+#1906: Add string format specifier for error message in `PropertyValueBuffer`
+ (reported by Joe S)
+#1907: Remove `getClass()` from `_valueType` argument for error reporting
+ (reported by Joe S)
 
 2.9.3 (09-Dec-2017)
 
@@ -192,9 +199,11 @@ Project: jackson-databind
 
 2.8.11.1 (not yet released)
 
-#1872 `NullPointerException` in `SubTypeValidator.validateSubType` when
+#1872: `NullPointerException` in `SubTypeValidator.validateSubType` when
   validating Spring interface
  (reported by Rob W)
+#1899: Another two gadgets to exploit default typing issue in jackson-databind
+ (reported by OneSourceCat@github)
 
 2.8.11 (24-Dec-2017)
 

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

@@ -432,15 +432,26 @@ public BeanDeserializerBase withBeanProperties(BeanPropertyMap props) {
      * This is needed to handle recursive and transitive dependencies.
      */
     @Override
-    public void resolve(DeserializationContext ctxt)
-        throws JsonMappingException
+    public void resolve(DeserializationContext ctxt) throws JsonMappingException
     {
         ExternalTypeHandler.Builder extTypes = null;
         // if ValueInstantiator can use "creator" approach, need to resolve it here...
         SettableBeanProperty[] creatorProps;
 
         if (_valueInstantiator.canCreateFromObjectWith()) {
             creatorProps = _valueInstantiator.getFromObjectArguments(ctxt.getConfig());
+
+            // 22-Jan-2018, tatu: May need to propagate "ignorable" status (from `Access.READ_ONLY`
+            //     or perhaps class-ignorables) into Creator properties too. Can not just delete,
+            //     at this point, but is needed for further processing down the line
+            if (_ignorableProps != null) {
+                for (int i = 0, end = creatorProps.length; i < end; ++i) {
+                    SettableBeanProperty prop  = creatorProps[i];
+                    if (_ignorableProps.contains(prop.getName())) {
+                        creatorProps[i].markAsIgnorable();
+                    }
+                }
+            }
         } else {
             creatorProps = null;
         }
@@ -451,6 +462,8 @@ public void resolve(DeserializationContext ctxt)
         //   types (see [databind#1575] f.ex).
         // First loop: find deserializer if not yet known, but do not yet
         // contextualize (since that can lead to problems with self-references)
+        // 22-Jan-2018, tatu: NOTE! Need not check for `isIgnorable` as that can
+        //   only happen for props in `creatorProps`
 
         for (SettableBeanProperty prop : _beanProperties) {
             if (!prop.hasValueDeserializer()) {
@@ -524,7 +537,7 @@ public void resolve(DeserializationContext ctxt)
             }
         }
         // "any setter" may also need to be resolved now
-        if (_anySetter != null && !_anySetter.hasValueDeserializer()) {
+        if ((_anySetter != null) && !_anySetter.hasValueDeserializer()) {
             _anySetter = _anySetter.withValueDeserializer(findDeserializer(ctxt,
                     _anySetter.getType(), _anySetter.getProperty()));
         }

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

@@ -348,7 +348,6 @@ public JsonDeserializer<?> build()
     {
         Collection<SettableBeanProperty> props = _properties.values();
         _fixAccess(props);
-
         BeanPropertyMap propertyMap = BeanPropertyMap.construct(props,
                 _config.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES),
                 _collectAliases(props));

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

@@ -464,7 +464,6 @@ protected void addBeanProps(DeserializationContext ctxt,
                 .getDefaultPropertyIgnorals(beanDesc.getBeanClass(),
                         beanDesc.getClassInfo());
         Set<String> ignored;
-
         if (ignorals != null) {
             boolean ignoreAny = ignorals.getIgnoreUnknown();
             builder.setIgnoreUnknownProperties(ignoreAny);
@@ -499,7 +498,6 @@ protected void addBeanProps(DeserializationContext ctxt,
         // Ok: let's then filter out property definitions
         List<BeanPropertyDefinition> propDefs = filterBeanProps(ctxt,
                 beanDesc, builder, beanDesc.findProperties(), ignored);
-
         // After which we can let custom code change the set
         if (_factoryConfig.hasDeserializerModifiers()) {
             for (BeanDeserializerModifier mod : _factoryConfig.deserializerModifiers()) {

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

@@ -43,11 +43,6 @@ public class CreatorProperty
      */
     protected final Object _injectableValueId;
 
-    /**
-     * @since 2.1
-     */
-    protected final int _creatorIndex;
-
     /**
      * In special cases, when implementing "updateValue", we cannot use
      * constructors or factory methods, but have to fall back on using a
@@ -61,6 +56,22 @@ public class CreatorProperty
      */
     protected SettableBeanProperty _fallbackSetter;
 
+    /**
+     * @since 2.1
+     */
+    protected final int _creatorIndex;
+
+    /**
+     * Marker flag that may have to be set during construction, to indicate that
+     * although property may have been constructed and added as a placeholder,
+     * it represents something that should be ignored during deserialization.
+     * This mostly concerns Creator properties which may not be easily deleted
+     * during processing.
+     *
+     * @since 2.9.4
+     */
+    protected boolean _ignorable;
+
     /**
      * @param name Name of the logical property
      * @param type Type of the property, used to find deserializer
@@ -94,18 +105,20 @@ public CreatorProperty(PropertyName name, JavaType type, PropertyName wrapperNam
     protected CreatorProperty(CreatorProperty src, PropertyName newName) {
         super(src, newName);
         _annotated = src._annotated;
-        _creatorIndex = src._creatorIndex;
         _injectableValueId = src._injectableValueId;
         _fallbackSetter = src._fallbackSetter;
+        _creatorIndex = src._creatorIndex;
+        _ignorable = src._ignorable;
     }
 
     protected CreatorProperty(CreatorProperty src, JsonDeserializer<?> deser,
             NullValueProvider nva) {
         super(src, deser, nva);
         _annotated = src._annotated;
-        _creatorIndex = src._creatorIndex;
         _injectableValueId = src._injectableValueId;
         _fallbackSetter = src._fallbackSetter;
+        _creatorIndex = src._creatorIndex;
+        _ignorable = src._ignorable;
     }
 
     @Override
@@ -143,6 +156,22 @@ public void setFallbackSetter(SettableBeanProperty fallbackSetter) {
         _fallbackSetter = fallbackSetter;
     }
 
+    @Override
+    public void markAsIgnorable() {
+        _ignorable = true;
+    }
+
+    @Override
+    public boolean isIgnorable() {
+        return _ignorable;
+    }
+
+    /*
+    /**********************************************************
+    /* Injection support
+    /**********************************************************
+     */
+
     /**
      * Method that can be called to locate value to be injected for this
      * property, if it is configured for this.

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

@@ -331,6 +331,16 @@ public void fixAccess(DeserializationConfig config) {
         ;
     }
 
+    /**
+     * @since 2.9.4
+     */
+    public void markAsIgnorable() { }
+
+    /**
+     * @since 2.9.4
+     */
+    public boolean isIgnorable() { return false; }
+
     /*
     /**********************************************************
     /* BeanProperty impl

src/main/java/com/fasterxml/jackson/databind/deser/impl/CreatorCollector.java

@@ -178,8 +178,7 @@ public void addPropertyCreator(AnnotatedWithParams creator,
                     String name = properties[i].getName();
                     // Need to consider Injectables, which may not have
                     // a name at all, and need to be skipped
-                    if (name.length() == 0
-                            && properties[i].getInjectableValueId() != null) {
+                    if (name.isEmpty() && (properties[i].getInjectableValueId() != null)) {
                         continue;
                     }
                     Integer old = names.put(name, Integer.valueOf(i));

src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyBasedCreator.java

@@ -71,18 +71,24 @@ protected PropertyBasedCreator(DeserializationContext ctxt,
         if (addAliases) {
             final DeserializationConfig config = ctxt.getConfig();
             for (SettableBeanProperty prop : creatorProps) {
-                List<PropertyName> aliases = prop.findAliases(config);
-                if (!aliases.isEmpty()) {
-                    for (PropertyName pn : aliases) {
-                        _propertyLookup.put(pn.getSimpleName(), prop);
+                // 22-Jan-2018, tatu: ignorable entries should be ignored, even if got aliases
+                if (!prop.isIgnorable()) {
+                    List<PropertyName> aliases = prop.findAliases(config);
+                    if (!aliases.isEmpty()) {
+                        for (PropertyName pn : aliases) {
+                            _propertyLookup.put(pn.getSimpleName(), prop);
+                        }
                     }
                 }
             }
         }
         for (int i = 0; i < len; ++i) {
             SettableBeanProperty prop = creatorProps[i];
             _allProperties[i] = prop;
-            _propertyLookup.put(prop.getName(), prop);
+            // 22-Jan-2018, tatu: ignorable entries should be skipped
+            if (!prop.isIgnorable()) {
+                _propertyLookup.put(prop.getName(), prop);
+            }
         }
     }
 

src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java

@@ -131,9 +131,9 @@ public Object getParameter(SettableBeanProperty prop)
             value = _creatorParameters[prop.getCreatorIndex()] = _findMissing(prop);
         }
         if (value == null && _context.isEnabled(DeserializationFeature.FAIL_ON_NULL_CREATOR_PROPERTIES)) {
-            return _context.reportInputMismatch(prop, String.format(
-                "Null value for creator property '%s'; DeserializationFeature.FAIL_ON_NULL_FOR_CREATOR_PARAMETERS enabled",
-                prop.getName(), prop.getCreatorIndex()));
+            return _context.reportInputMismatch(prop,
+                "Null value for creator property '%s' (index %d); `DeserializationFeature.FAIL_ON_NULL_FOR_CREATOR_PARAMETERS` enabled",
+                prop.getName(), prop.getCreatorIndex());
         }
         return value;
     }
@@ -172,7 +172,7 @@ public Object[] getParameters(SettableBeanProperty[] props)
                 if (_creatorParameters[ix] == null) {
                     SettableBeanProperty prop = props[ix];
                     _context.reportInputMismatch(prop.getType(),
-                            "Null value for creator property '%s' (index %d); DeserializationFeature.FAIL_ON_NULL_FOR_CREATOR_PARAMETERS enabled",
+                            "Null value for creator property '%s' (index %d); `DeserializationFeature.FAIL_ON_NULL_FOR_CREATOR_PARAMETERS` enabled",
                             prop.getName(), props[ix].getCreatorIndex());
                 }
             }
@@ -191,14 +191,13 @@ protected Object _findMissing(SettableBeanProperty prop) throws JsonMappingExcep
         }
         // Second: required?
         if (prop.isRequired()) {
-            _context.reportInputMismatch(prop, String.format(
-                    "Missing required creator property '%s' (index %d)",
-                    prop.getName(), prop.getCreatorIndex()));
+            _context.reportInputMismatch(prop, "Missing required creator property '%s' (index %d)",
+                    prop.getName(), prop.getCreatorIndex());
         }
         if (_context.isEnabled(DeserializationFeature.FAIL_ON_MISSING_CREATOR_PROPERTIES)) {
-            _context.reportInputMismatch(prop, String.format(
-                    "Missing creator property '%s' (index %d); DeserializationFeature.FAIL_ON_MISSING_CREATOR_PROPERTIES enabled",
-                    prop.getName(), prop.getCreatorIndex()));
+            _context.reportInputMismatch(prop,
+                    "Missing creator property '%s' (index %d); `DeserializationFeature.FAIL_ON_MISSING_CREATOR_PROPERTIES` enabled",
+                    prop.getName(), prop.getCreatorIndex());
         }
         // Third: default value
         JsonDeserializer<Object> deser = prop.getValueDeserializer();