Implement #819; now configuration of FormatFeatures should work, but needs to be tested for CSV (for example)

Author: cowtowncoder

release-notes/VERSION

@@ -6,6 +6,7 @@ Project: jackson-databind
 
 2.7.0 (not yet released)
 
+#819: Add support for setting `FormatFeature` via `ObjectReader`, `ObjectWriter`
 #918: Add `MapperFeature.ALLOW_EXPLICIT_PROPERTY_RENAMING`
  (contributed by David H)
 #933:Close some gaps to allow using the tryToResolveUnresolved flows

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

@@ -717,14 +717,13 @@ public DeserializationConfig withNoProblemHandlers() {
      */
     public void initialize(JsonParser p) {
         if (_parserFeaturesToChange != 0) {
-            int orig = p.getFeatureMask();
-            int newFlags = (orig & ~_parserFeaturesToChange) | _parserFeatures;
-            if (orig != newFlags) {
-                p.setFeatureMask(newFlags);
-            }
+            p.overrideStdFeatures(_parserFeatures, _parserFeaturesToChange);
+        }
+        if (_formatReadFeaturesToChange != 0) {
+            p.overrideFormatFeatures(_formatReadFeatures, _formatReadFeaturesToChange);
         }
     }
-    
+
     /*
     /**********************************************************
     /* MapperConfig implementation

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

@@ -3770,9 +3770,8 @@ protected JsonToken _initForReading(JsonParser p) throws IOException
             // and then we must get something...
             t = p.nextToken();
             if (t == null) {
-                /* [JACKSON-546] Throw mapping exception, since it's failure to map,
-                 *   not an actual parsing problem
-                 */
+                // Throw mapping exception, since it's failure to map,
+                //   not an actual parsing problem
                 throw JsonMappingException.from(p, "No content to map due to end-of-input");
             }
         }

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

@@ -475,12 +475,65 @@ public ObjectReader withoutFeatures(JsonParser.Feature... features) {
         return _with(_config.withoutFeatures(features));
     }
 
+    /*
+    /**********************************************************
+    /* Life-cycle, fluent factory methods for FormatFeature (2.7)
+    /**********************************************************
+     */
+
+    /**
+     * Method for constructing a new reader instance that is configured
+     * with specified feature enabled.
+     *
+     * @since 2.7
+     */
+    public ObjectReader with(FormatFeature feature) {
+        return _with(_config.with(feature));
+    }
+
+    /**
+     * Method for constructing a new reader instance that is configured
+     * with specified features enabled.
+     *
+     * @since 2.7
+     */
+    public ObjectReader withFeatures(FormatFeature... features) {
+        return _with(_config.withFeatures(features));
+    }    
+
+    /**
+     * Method for constructing a new reader instance that is configured
+     * with specified feature disabled.
+     *
+     * @since 2.7
+     */
+    public ObjectReader without(FormatFeature feature) {
+        return _with(_config.without(feature)); 
+    }
+
+    /**
+     * Method for constructing a new reader instance that is configured
+     * with specified features disabled.
+     *
+     * @since 2.7
+     */
+    public ObjectReader withoutFeatures(FormatFeature... features) {
+        return _with(_config.withoutFeatures(features));
+    }
+    
     /*
     /**********************************************************
     /* Life-cycle, fluent factory methods, other
     /**********************************************************
      */
 
+    /**
+     * Mutant factory method that will construct a new instance that has
+     * specified underlying {@link DeserializationConfig}.
+     *<p>
+     * NOTE: use of this method is not recommended, as there are many other
+     * re-configuration methods available.
+     */
     public ObjectReader with(DeserializationConfig config) {
         return _with(config);
     }    

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

@@ -314,7 +314,7 @@ public ObjectWriter withoutFeatures(SerializationFeature... features) {
 
     /*
     /**********************************************************
-    /* Life-cycle, fluent factories for JsonGenerator.Feature
+    /* Life-cycle, fluent factories for JsonGenerator.Feature (2.5)
     /**********************************************************
      */
 
@@ -350,6 +350,44 @@ public ObjectWriter withoutFeatures(JsonGenerator.Feature... features) {
         return (newConfig == _config) ? this : _new(this, newConfig);
     }
 
+    /*
+    /**********************************************************
+    /* Life-cycle, fluent factories for FormatFeature (2.7)
+    /**********************************************************
+     */
+
+    /**
+     * @since 2.7
+     */
+    public ObjectWriter with(FormatFeature feature)  {
+        SerializationConfig newConfig = _config.with(feature);
+        return (newConfig == _config) ? this : _new(this, newConfig);
+    }
+
+    /**
+     * @since 2.7
+     */
+    public ObjectWriter withFeatures(FormatFeature... features) {
+        SerializationConfig newConfig = _config.withFeatures(features);
+        return (newConfig == _config) ? this : _new(this, newConfig);
+    }
+
+    /**
+     * @since 2.7
+     */
+    public ObjectWriter without(FormatFeature feature) {
+        SerializationConfig newConfig = _config.without(feature);
+        return (newConfig == _config) ? this : _new(this, newConfig);
+    }
+
+    /**
+     * @since 2.7
+     */
+    public ObjectWriter withoutFeatures(FormatFeature... features) {
+        SerializationConfig newConfig = _config.withoutFeatures(features);
+        return (newConfig == _config) ? this : _new(this, newConfig);
+    }
+    
     /*
     /**********************************************************
     /* Life-cycle, fluent factories, type-related