Merge branch 'master' into ckozak/test_reproducing_2_11_3_regression

Author: cowtowncoder

README.md

@@ -443,6 +443,34 @@ assertEquals("Hassan", person.getName());
 assertEquals(23, person.getAge().intValue());
 ```
 
+If your builder pattern implementation uses other prefixes for methods or uses other names than build() for the builder method Jackson also provide a handy way for you.
+
+For example, if you have a builder class uses the "set" prefix for its methods and use the create() method instead of build() for building the whole class, you have to annotate your class like:
+```java
+@JsonPOJOBuilder(buildMethodName = "create", withPrefix = "set")
+static class Builder {
+    String name;
+    Integer age;
+    
+    Builder setName(String name) {
+        this.name = name;
+        return this;
+    }
+    
+    Builder setAge(Integer age) {
+        this.age = age;
+        return this;
+    }
+    
+    public Person create() {
+        return new Person(name, age);
+    } 
+}
+```
+
+
+
+
 Overall, Jackson library is very powerful in deserializing objects using builder pattern.
 
 # Contribute!

pom.xml

@@ -102,7 +102,7 @@
     <dependency>
       <groupId>javax.measure</groupId>
       <artifactId>jsr-275</artifactId>
-      <version>1.0.0</version>
+      <version>0.9.1</version>
       <scope>test</scope>
     </dependency>
 

release-notes/CREDITS-2.x

@@ -1164,6 +1164,10 @@ Daniel Wu (DanielYWoo@github)
   * Reported #2840: `ObjectMapper.activateDefaultTypingAsProperty()` is not using
   (2.11.3)
 
+Łukasz Walkiewicz (lukasz-walkiewicz@github)
+  * Reported #2894: Fix type resolution for static methods (regression in 2.11.3)
+  (2.11.4)
+
 Marc Carter (drekbour@github)
   * Contributed #43 implementation: Add option to resolve type from multiple existing properties,
    `@JsonTypeInfo(use=DEDUCTION)`
@@ -1226,6 +1230,21 @@ Swayam Raina (swayamraina@github)
   * Contributed #2761: Support multiple names in `JsonSubType.Type`
   (2.12.0)
 
+Oguzhan Unlu (oguzhanunlu@github)
+  * Requested #2855: Add `JsonNode.canConvertToExactIntegral()` to indicate whether
+    floating-point/BigDecimal values could be converted to integers losslessly
+  (2.12.0)
+
+Siavash Soleymani (siavashsoleymani@github)
+  * Contributed implementation for #2855:Add `JsonNode.canConvertToExactIntegral()` to
+    indicate whether floating-point/BigDecimal values could be converted to integers losslessly
+  (2.12.0)
+
 Ilya Golovin (ilgo0413@github)
   * Contributed #2873: `MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS` should work for enum as keys
   (2.12.0)
+
+Sergiy Yevtushenko (siy@github)
+  * Contributed #2879: Add support for disabling special handling of "Creator properties" wrt
+    alphabetic property ordering
+  (2.12.0)

release-notes/VERSION-2.x

@@ -4,20 +4,28 @@ Project: jackson-databind
 === Releases === 
 ------------------------------------------------------------------------
 
-
 2.12.0-rc2 (not yet released)
 
 #1458: `@JsonAnyGetter` should be allowed on a field
  (contributed by Dominik K)
 #2775: Disabling `FAIL_ON_INVALID_SUBTYPE` breaks polymorphic deserialization of Enums
  (reported by holgerknoche@github)
+#2804: Throw `InvalidFormatException` instead of `MismatchedInputException`
+   for ACCEPT_FLOAT_AS_INT coercion failures
+ (requested by mjustin@github)
 #2878: Revert change initially made to fix #2805: change in signature
   of `ObjectMapper.treeToValue()` regarding exceptions
+#2879: Add support for disabling special handling of "Creator properties" wrt
+  alphabetic property ordering
+ (contributed by Sergiy Y)
 #2880: Revert removal of 2.7-deprecated `PropertyNamingStrategy` constants
  (reported by brettkail-wk@github)
-#2804: Throw `InvalidFormatException` instead of `MismatchedInputException`
-   for ACCEPT_FLOAT_AS_INT coercion failures
- (requested by mjustin@github)
+#2885: Add `JsonNode.canConvertToExactIntegral()` to indicate whether floating-point/BigDecimal
+  values could be converted to integers losslessly
+ (requested by Oguzhan U; implementation contributed by Siavash S)
+#2903: Allow preventing "Enum from integer" coercion using new `CoercionConfig` system
+#2909: `@JsonValue` not considered when evaluating inclusion
+ (reported by chrylis@github)
 
 2.12.0-rc1 (12-Oct-2020)
 
@@ -85,6 +93,11 @@ Project: jackson-databind
 - Add `BeanDeserializerBase.isCaseInsensitive()`
 - Some refactoring of `CollectionDeserializer` to solve CSV array handling issues
 
+2.11.4 (not yet released)
+
+#2894: Fix type resolution for static methods (regression in 2.11.3 due to #2821 fix)
+ (reported by Łukasz W)
+
 2.11.3 (02-Oct-2020)
 
 #2795: Cannot detect creator arguments of mixins for JDK types

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

@@ -393,6 +393,29 @@ public final boolean isBinary() {
      */
     public boolean canConvertToLong() { return false; }
 
+    /**
+     * Method that can be used to check whether contained value
+     * is numeric (returns true for {@link #isNumber()}) and
+     * can be losslessly converted to integral number (specifically,
+     * {@link BigInteger} but potentially others, see
+     * {@link #canConvertToInt} and {@link #canConvertToInt}).
+     * Latter part allows floating-point numbers
+     * (for which {@link #isFloatingPointNumber()} returns {@code true})
+     * that do not have fractional part.
+     * Note that "not-a-number" values of {@code double} and {@code float}
+     * will return {@code false} as they can not be converted to matching
+     * integral representations.
+     *
+     * @return True if the value is an actual number with no fractional
+     *    part; false for non-numeric types, NaN representations of floating-point
+     *    numbers, and floating-point numbers with fractional part.
+     *
+     * @since 2.12
+     */
+    public boolean canConvertToExactIntegral() {
+        return isIntegralNumber();
+    }
+
     /*
     /**********************************************************************
     /* Public API, straight value access

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

@@ -256,9 +256,8 @@ public enum MapperFeature implements ConfigFeature
 
     /**
      * Feature that defines default property serialization order used
-     * for POJO fields (note: does <b>not</b> apply to {@link java.util.Map}
-     * serialization!):
-     * if enabled, default ordering is alphabetic (similar to
+     * for POJO properties.
+     * If enabled, default ordering is alphabetic (similar to
      * how {@link com.fasterxml.jackson.annotation.JsonPropertyOrder#alphabetic()}
      * works); if disabled, order is unspecified (based on what JDK gives
      * us, which may be declaration order, but is not guaranteed).
@@ -267,10 +266,30 @@ public enum MapperFeature implements ConfigFeature
      * explicit overrides in classes (for example with
      * {@link com.fasterxml.jackson.annotation.JsonPropertyOrder} annotation)
      *<p>
+     * Note: does <b>not</b> apply to {@link java.util.Map} serialization (since
+     * entries are not considered Bean/POJO properties.
+     *<p>
      * Feature is disabled by default.
      */
     SORT_PROPERTIES_ALPHABETICALLY(false),
 
+    /**
+     * Feature that defines whether Creator properties (ones passed through
+     * constructor or static factory method) should be sorted before other properties
+     * for which no explicit order is specified, in case where alphabetic
+     * ordering is to be used for such properties.
+     * Note that in either case explicit order (whether by name or by index)
+     * will have precedence over this setting.
+     *<p>
+     * Note: does <b>not</b> apply to {@link java.util.Map} serialization (since
+     * entries are not considered Bean/POJO properties.
+     *<p>
+     * Feature is enabled by default.
+     *
+     * @since 2.12
+     */
+    SORT_CREATOR_PROPERTIES_FIRST(true),
+
     /*
     /**********************************************************************
     /* Name-related features

src/main/java/com/fasterxml/jackson/databind/cfg/CoercionConfigs.java

@@ -194,16 +194,26 @@ public CoercionAction findCoercion(DeserializationConfig config,
         }
 
         // Otherwise there are some legacy features that can provide answer
-        if (inputShape == CoercionInputShape.EmptyArray) {
+        switch (inputShape) {
+        case EmptyArray:
             // Default for setting is false
             return config.isEnabled(DeserializationFeature.ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT) ?
                     CoercionAction.AsNull : CoercionAction.Fail;
-        }
-        if ((inputShape == CoercionInputShape.Float)
-                && (targetType == LogicalType.Integer)) {
-            // Default for setting in 2.x is true
-            return config.isEnabled(DeserializationFeature.ACCEPT_FLOAT_AS_INT) ?
-                    CoercionAction.TryConvert : CoercionAction.Fail;
+        case Float:
+            if (targetType == LogicalType.Integer) {
+                // Default for setting in 2.x is true
+                return config.isEnabled(DeserializationFeature.ACCEPT_FLOAT_AS_INT) ?
+                        CoercionAction.TryConvert : CoercionAction.Fail;
+            }
+            break;
+        case Integer:
+            if (targetType == LogicalType.Enum) {
+                if (config.isEnabled(DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS)) {
+                    return CoercionAction.Fail;
+                }
+            }
+            break;
+        default:
         }
 
         // classic scalars are numbers, booleans; but date/time also considered

src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java

@@ -8,6 +8,8 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
+import com.fasterxml.jackson.databind.cfg.CoercionAction;
+import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
 import com.fasterxml.jackson.databind.deser.SettableBeanProperty;
 import com.fasterxml.jackson.databind.deser.ValueInstantiator;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
@@ -128,46 +130,38 @@ public LogicalType logicalType() {
         return LogicalType.Enum;
     }
 
+    @Override // since 2.12
+    public Object getEmptyValue(DeserializationContext ctxt) throws JsonMappingException {
+        return _enumDefaultValue;
+    }
+
     @Override
     public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException
     {
-        String text;
-        JsonToken curr = p.currentToken();
-
         // Usually should just get string value:
         // 04-Sep-2020, tatu: for 2.11.3 / 2.12.0, removed "FIELD_NAME" as allowed;
         //   did not work and gave odd error message.
-        if (curr == JsonToken.VALUE_STRING) {
-            text = p.getText();
+        if (p.hasToken(JsonToken.VALUE_STRING)) {
+            return _fromString(p, ctxt, p.getText());
+        }
+
         // But let's consider int acceptable as well (if within ordinal range)
-        } else if (curr == JsonToken.VALUE_NUMBER_INT) {
-            // ... unless told not to do that
-            int index = p.getIntValue();
-            if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS)) {
-                return ctxt.handleWeirdNumberValue(_enumClass(), index,
-                        "not allowed to deserialize Enum value out of number: disable DeserializationConfig.DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS to allow"
-                        );
-            }
-            if (index >= 0 && index < _enumsByIndex.length) {
-                return _enumsByIndex[index];
-            }
-            if ((_enumDefaultValue != null)
-                    && ctxt.isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE)) {
-                return _enumDefaultValue;
-            }
-            if (!ctxt.isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
-                return ctxt.handleWeirdNumberValue(_enumClass(), index,
-                        "index value outside legal index range [0..%s]",
-                        _enumsByIndex.length-1);
-            }
-            return null;
-        } else if (curr == JsonToken.START_OBJECT) {
-            // 29-Jun-2020, tatu: New! "Scalar from Object" (mostly for XML)
-            text = ctxt.extractScalarFromObject(p, this, _valueClass);
-        } else {
-            return _deserializeOther(p, ctxt);
+        if (p.hasToken(JsonToken.VALUE_NUMBER_INT)) {
+            return _fromInteger(p, ctxt, p.getIntValue());
         }
 
+        // 29-Jun-2020, tatu: New! "Scalar from Object" (mostly for XML)
+        if (p.isExpectedStartObjectToken()) {
+            return _fromString(p, ctxt,
+                    ctxt.extractScalarFromObject(p, this, _valueClass));
+        }
+        return _deserializeOther(p, ctxt);
+    }
+
+    protected Object _fromString(JsonParser p, DeserializationContext ctxt,
+            String text)
+        throws IOException
+    {
         CompactStringObjectMap lookup = ctxt.isEnabled(DeserializationFeature.READ_ENUMS_USING_TO_STRING)
                 ? _getToStringLookup(ctxt) : _lookupByName;
         Object result = lookup.find(text);
@@ -180,20 +174,81 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
         return result;
     }
 
+    protected Object _fromInteger(JsonParser p, DeserializationContext ctxt,
+            int index)
+        throws IOException
+    {
+        final CoercionAction act = ctxt.findCoercionAction(logicalType(), handledType(),
+                CoercionInputShape.Integer);
+
+        // First, check legacy setting for slightly different message
+        if (act == CoercionAction.Fail) {
+            if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS)) {
+                return ctxt.handleWeirdNumberValue(_enumClass(), index,
+                        "not allowed to deserialize Enum value out of number: disable DeserializationConfig.DeserializationFeature.FAIL_ON_NUMBERS_FOR_ENUMS to allow"
+                        );
+            }
+            // otherwise this will force failure with new setting
+            _checkCoercionFail(ctxt, act, handledType(), index,
+                    "Integer value ("+index+")");
+        }
+        switch (act) {
+        case AsNull:
+            return null;
+        case AsEmpty:
+            return getEmptyValue(ctxt);
+        case TryConvert:
+        default:
+        }
+        if (index >= 0 && index < _enumsByIndex.length) {
+            return _enumsByIndex[index];
+        }
+        if ((_enumDefaultValue != null)
+                && ctxt.isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE)) {
+            return _enumDefaultValue;
+        }
+        if (!ctxt.isEnabled(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)) {
+            return ctxt.handleWeirdNumberValue(_enumClass(), index,
+                    "index value outside legal index range [0..%s]",
+                    _enumsByIndex.length-1);
+        }
+        return null;
+    }
+        /*
+    return _checkCoercionFail(ctxt, act, rawTargetType, value,
+            "empty String (\"\")");
+            */
+    
     /*
     /**********************************************************
     /* Internal helper methods
     /**********************************************************
      */
 
     private final Object _deserializeAltString(JsonParser p, DeserializationContext ctxt,
-            CompactStringObjectMap lookup, String name) throws IOException
+            CompactStringObjectMap lookup, String nameOrig) throws IOException
     {
-        name = name.trim();
-        if (name.length() == 0) {
-            if (ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
+        String name = nameOrig.trim();
+        if (name.length() == 0) { // empty or blank
+            CoercionAction act;
+            if (nameOrig.length() == 0) { 
+                act = _findCoercionFromEmptyString(ctxt);
+                act = _checkCoercionFail(ctxt, act, handledType(), nameOrig,
+                        "empty String (\"\")");
+            } else {
+                act = _findCoercionFromBlankString(ctxt);
+                act = _checkCoercionFail(ctxt, act, handledType(), nameOrig,
+                        "blank String (all whitespace)");
+            }
+            switch (act) {
+            case AsEmpty:
+            case TryConvert:
                 return getEmptyValue(ctxt);
+            case AsNull:
+            default: // Fail already handled earlier
             }
+            return null;
+//            if (ctxt.isEnabled(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT)) {
         } else {
             // [databind#1313]: Case insensitive enum deserialization
             if (Boolean.TRUE.equals(_caseInsensitive)) {