and bit more work for #229...

Author: cowtowncoder

yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLFactory.java

@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.core.format.InputAccessor;
 import com.fasterxml.jackson.core.format.MatchStrength;
 import com.fasterxml.jackson.core.io.IOContext;
+import com.fasterxml.jackson.dataformat.yaml.util.StringQuotingChecker;
 
 @SuppressWarnings("resource")
 public class YAMLFactory extends JsonFactory
@@ -50,13 +51,21 @@ public class YAMLFactory extends JsonFactory
 
     protected int _yamlGeneratorFeatures = DEFAULT_YAML_GENERATOR_FEATURE_FLAGS;
 
+    /**
+     * Helper object used to determine whether property names, String values
+     * must be quoted or not.
+     *
+     * @since 2.12
+     */
+    protected StringQuotingChecker _quotingChecker;
+
+    protected DumperOptions.Version _version;
+
     /*
     /**********************************************************************
     /* Factory construction, configuration
     /**********************************************************************
      */
-
-    protected DumperOptions.Version _version;
 
     /**
      * Default constructor used to create factory instances.
@@ -75,22 +84,23 @@ public YAMLFactory(ObjectCodec oc)
         super(oc);
         _yamlParserFeatures = DEFAULT_YAML_PARSER_FEATURE_FLAGS;
         _yamlGeneratorFeatures = DEFAULT_YAML_GENERATOR_FEATURE_FLAGS;
-        /* 26-Jul-2013, tatu: Seems like we should force output as 1.1 but
-         *   that adds version declaration which looks ugly...
-         */
+        // 26-Jul-2013, tatu: Seems like we should force output as 1.1 but
+        //   that adds version declaration which looks ugly...
         //_version = DumperOptions.Version.V1_1;
         _version = null;
+        _quotingChecker = StringQuotingChecker.Default.instance();
     }
 
     /**
-     * @since 2.2.1
+     * @since 2.2
      */
     public YAMLFactory(YAMLFactory src, ObjectCodec oc)
     {
         super(src, oc);
         _version = src._version;
         _yamlParserFeatures = src._yamlParserFeatures;
         _yamlGeneratorFeatures = src._yamlGeneratorFeatures;
+        _quotingChecker = src._quotingChecker;
     }
 
     /**
@@ -102,6 +112,7 @@ protected YAMLFactory(YAMLFactoryBuilder b)
     {
         super(b, false);
         _yamlGeneratorFeatures = b.formatGeneratorFeaturesMask();
+        _quotingChecker = b.stringQuotingChecker();
     }
 
     @Override

yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLFactoryBuilder.java

@@ -1,13 +1,12 @@
 package com.fasterxml.jackson.dataformat.yaml;
 
 import com.fasterxml.jackson.core.TSFBuilder;
+import com.fasterxml.jackson.dataformat.yaml.util.StringQuotingChecker;
 
 /**
  * {@link com.fasterxml.jackson.core.TSFBuilder}
  * implementation for constructing {@link YAMLFactory}
  * instances.
- *
- * @since 3.0
  */
 public class YAMLFactoryBuilder extends TSFBuilder<YAMLFactory, YAMLFactoryBuilder>
 {
@@ -24,6 +23,14 @@ public class YAMLFactoryBuilder extends TSFBuilder<YAMLFactory, YAMLFactoryBuild
      */
     protected int _formatGeneratorFeatures;
 
+    /**
+     * Helper object used to determine whether property names, String values
+     * must be quoted or not.
+     *
+     * @since 2.12
+     */
+    protected StringQuotingChecker _quotingChecker;
+
     /*
     /**********************************************************
     /* Life cycle
@@ -37,6 +44,7 @@ protected YAMLFactoryBuilder() {
     public YAMLFactoryBuilder(YAMLFactory base) {
         super(base);
         _formatGeneratorFeatures = base._yamlGeneratorFeatures;
+        _quotingChecker = base._quotingChecker;
     }
 
     // // // Parser features NOT YET defined
@@ -45,39 +53,51 @@ public YAMLFactoryBuilder(YAMLFactory base) {
 
     public YAMLFactoryBuilder enable(YAMLGenerator.Feature f) {
         _formatGeneratorFeatures |= f.getMask();
-        return _this();
+        return this;
     }
 
     public YAMLFactoryBuilder enable(YAMLGenerator.Feature first, YAMLGenerator.Feature... other) {
         _formatGeneratorFeatures |= first.getMask();
         for (YAMLGenerator.Feature f : other) {
             _formatGeneratorFeatures |= f.getMask();
         }
-        return _this();
+        return this;
     }
 
     public YAMLFactoryBuilder disable(YAMLGenerator.Feature f) {
         _formatGeneratorFeatures &= ~f.getMask();
-        return _this();
+        return this;
     }
 
     public YAMLFactoryBuilder disable(YAMLGenerator.Feature first, YAMLGenerator.Feature... other) {
         _formatGeneratorFeatures &= ~first.getMask();
         for (YAMLGenerator.Feature f : other) {
             _formatGeneratorFeatures &= ~f.getMask();
         }
-        return _this();
+        return this;
     }
 
     public YAMLFactoryBuilder configure(YAMLGenerator.Feature f, boolean state) {
         return state ? enable(f) : disable(f);
     }
 
+    public YAMLFactoryBuilder stringQuotingChecker(StringQuotingChecker sqc) {
+        _quotingChecker = sqc;
+        return this;
+    }
+
     // // // Accessors
 
 //    public int formatParserFeaturesMask() { return _formatParserFeatures; }
     public int formatGeneratorFeaturesMask() { return _formatGeneratorFeatures; }
 
+    public StringQuotingChecker stringQuotingChecker() {
+        if (_quotingChecker != null) {
+            return _quotingChecker;
+        }
+        return StringQuotingChecker.Default.instance();
+    }
+
     @Override
     public YAMLFactory build() {
         return new YAMLFactory(this);

yaml/src/main/java/com/fasterxml/jackson/dataformat/yaml/util/StringQuotingChecker.java

@@ -14,7 +14,10 @@
  * @since 2.12
  */
 public abstract class StringQuotingChecker
+    implements java.io.Serializable
 {
+    private static final long serialVersionUID = 1L;
+
     /* As per <a href="https://yaml.org/type/bool.html">YAML Spec</a> there are a few
      * aliases for booleans, and we better quote such values as keys; although Jackson
      * itself has no problems dealing with them, some other tools do have.
@@ -165,7 +168,10 @@ protected boolean valueHasQuotableChar(String inputStr)
      */
     public final static class Default
         extends StringQuotingChecker
+        implements java.io.Serializable
     {
+        private static final long serialVersionUID = 1L;
+
         private final static Default INSTANCE = new Default();
 
         public Default() { }