Merge branch '2.13'

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -15,6 +15,7 @@ Project: jackson-databind
 #3002: Add `DeserializationContext.readTreeAsValue()` methods for more convenient
   conversions for deserializers to use
 #3011: Clean up support of typed "unmodifiable", "singleton" Maps/Sets/Collections
+#3033: Extend internal bitfield of `MapperFeature` to be `long`
 #3035: Add `removeMixIn()` method in `MapperBuilder`
 #3036: Backport `MapperBuilder` lambda-taking methods: `withConfigOverride()`,
   `withCoercionConfig()`, `withCoercionConfigDefaults()`

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

@@ -89,7 +89,7 @@ public final class DeserializationConfig
     /**
      * @since 3.0
      */
-    public DeserializationConfig(MapperBuilder<?,?> b, int mapperFeatures,
+    public DeserializationConfig(MapperBuilder<?,?> b, long mapperFeatures,
             int deserFeatures, int streamReadFeatures, int formatReadFeatures,
             ConfigOverrides configOverrides, CoercionConfigs coercionConfigs,
             TypeFactory tf, ClassIntrospector classIntr, MixInHandler mixins, SubtypeResolver str,

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

@@ -1,20 +1,14 @@
 package com.fasterxml.jackson.databind;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.cfg.ConfigFeature;
 
 /**
  * Enumeration that defines simple on/off features to set
  * for {@link ObjectMapper}, and accessible (but not changeable)
  * via {@link ObjectReader} and {@link ObjectWriter} (as well as
  * through various convenience methods through context objects).
- *<p>
- * Note that in addition to being only mutable via {@link ObjectMapper},
- * changes only take effect when done <b>before any serialization or
- * deserialization</b> calls -- that is, caller must follow
- * "configure-then-use" pattern.
  */
-public enum MapperFeature implements ConfigFeature
+public enum MapperFeature
 {
     /*
     /**********************************************************************
@@ -285,8 +279,6 @@ public enum MapperFeature implements ConfigFeature
      * entries are not considered Bean/POJO properties.
      *<p>
      * Feature is enabled by default.
-     *
-     * @since 2.12
      */
     SORT_CREATOR_PROPERTIES_FIRST(true),
 
@@ -403,19 +395,30 @@ public enum MapperFeature implements ConfigFeature
     ;
 
     private final boolean _defaultState;
-    private final int _mask;
-    
+    private final long _mask;
+
+    public static long collectLongDefaults() {
+        int flags = 0;
+        for (MapperFeature value : MapperFeature.values()) {
+            if (value.enabledByDefault()) {
+                flags |= value.getLongMask();
+            }
+        }
+        return flags;
+    }
+
     private MapperFeature(boolean defaultState) {
         _defaultState = defaultState;
-        _mask = (1 << ordinal());
+        _mask = (1L << ordinal());
     }
 
-    @Override
     public boolean enabledByDefault() { return _defaultState; }
 
-    @Override
-    public int getMask() { return _mask; }
+    public long getLongMask() {
+        return _mask;
+    }
 
-    @Override
-    public boolean enabledIn(int flags) { return (flags & _mask) != 0; }
+    public boolean enabledIn(long flags) {
+        return (flags & _mask) != 0;
+    }
 }

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

@@ -80,7 +80,7 @@ public final class SerializationConfig
      * @since 3.0
      */
     public SerializationConfig(MapperBuilder<?,?> b,
-            int mapperFeatures, int serFeatures, int streamWriteFeatures, int formatWriteFeatures,
+            long mapperFeatures, int serFeatures, int streamWriteFeatures, int formatWriteFeatures,
             ConfigOverrides configOverrides,
             TypeFactory tf, ClassIntrospector classIntr, MixInHandler mixins, SubtypeResolver str,
             ContextAttributes defaultAttrs, RootNameLookup rootNames,

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

@@ -41,7 +41,7 @@
 public abstract class MapperBuilder<M extends ObjectMapper,
     B extends MapperBuilder<M,B>>
 {
-    protected final static int DEFAULT_MAPPER_FEATURES = ConfigFeature.collectFeatureDefaults(MapperFeature.class);
+    protected final static long DEFAULT_MAPPER_FEATURES = MapperFeature.collectLongDefaults();
     protected final static int DEFAULT_SER_FEATURES = ConfigFeature.collectFeatureDefaults(SerializationFeature.class);
     protected final static int DEFAULT_DESER_FEATURES = ConfigFeature.collectFeatureDefaults(DeserializationFeature.class);
 
@@ -202,7 +202,7 @@ public abstract class MapperBuilder<M extends ObjectMapper,
     /**
      * Set of shared mapper features enabled.
      */
-    protected int _mapperFeatures;
+    protected long _mapperFeatures;
 
     /**
      * Set of {@link SerializationFeature}s enabled.
@@ -276,7 +276,7 @@ protected MapperBuilder(TokenStreamFactory streamFactory)
         _mapperFeatures = DEFAULT_MAPPER_FEATURES;
         // Some overrides we may need based on format
         if (streamFactory.requiresPropertyOrdering()) {
-            _mapperFeatures |= MapperFeature.SORT_PROPERTIES_ALPHABETICALLY.getMask();
+            _mapperFeatures |= MapperFeature.SORT_PROPERTIES_ALPHABETICALLY.getLongMask();
         }
         _deserFeatures = DEFAULT_DESER_FEATURES;
         _serFeatures = DEFAULT_SER_FEATURES;
@@ -700,24 +700,24 @@ public LinkedNode<DeserializationProblemHandler> deserializationProblemHandlers(
 
     public B enable(MapperFeature... features) {
         for (MapperFeature f : features) {
-            _mapperFeatures |= f.getMask();
+            _mapperFeatures |= f.getLongMask();
         }
         return _this();
     }
 
     public B disable(MapperFeature... features) {
         for (MapperFeature f : features) {
-            _mapperFeatures &= ~f.getMask();
+            _mapperFeatures &= ~f.getLongMask();
         }
         return _this();
     }
 
     public B configure(MapperFeature feature, boolean state)
     {
         if (state) {
-            _mapperFeatures |= feature.getMask();
+            _mapperFeatures |= feature.getLongMask();
         } else {
-            _mapperFeatures &= ~feature.getMask();
+            _mapperFeatures &= ~feature.getLongMask();
         }
         return _this();
     }

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

@@ -51,7 +51,8 @@ public abstract class MapperBuilderState
     /**********************************************************************
      */
 
-    protected final int _mapperFeatures, _serFeatures, _deserFeatures;
+    protected final long _mapperFeatures;
+    protected final int _serFeatures, _deserFeatures;
     protected final int _streamReadFeatures, _streamWriteFeatures;
     protected final int _formatReadFeatures, _formatWriteFeatures;
 

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

@@ -47,7 +47,7 @@ public abstract class MapperConfig<T extends MapperConfig<T>>
     /**
      * Set of shared mapper features enabled.
      */
-    protected final int _mapperFeatures;
+    protected final long _mapperFeatures;
 
     /**
      * Immutable container object for simple configuration settings.
@@ -60,7 +60,7 @@ public abstract class MapperConfig<T extends MapperConfig<T>>
     /**********************************************************************
      */
 
-    protected MapperConfig(BaseSettings base, int mapperFeatures)
+    protected MapperConfig(BaseSettings base, long mapperFeatures)
     {
         _base = base;
         _mapperFeatures = mapperFeatures;
@@ -89,7 +89,7 @@ protected MapperConfig(MapperConfig<T> src)
      * serialization, deserialization)
      */
     public final boolean isEnabled(MapperFeature f) {
-        return (_mapperFeatures & f.getMask()) != 0;
+        return (_mapperFeatures & f.getLongMask()) != 0;
     }
 
     /**

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

@@ -110,7 +110,7 @@ public abstract class MapperConfigBase<CFG extends ConfigFeature,
      * Constructor used when creating a new instance (compared to
      * that of creating fluent copies)
      */
-    protected MapperConfigBase(MapperBuilder<?,?> b, int mapperFeatures,
+    protected MapperConfigBase(MapperBuilder<?,?> b, long mapperFeatures,
             TypeFactory tf, ClassIntrospector classIntr, MixInHandler mixins, SubtypeResolver str,
             ConfigOverrides configOverrides, ContextAttributes defaultAttrs,
             RootNameLookup rootNames)