From f0aa287907feee6dd71c8034e0621539bafa549a Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Fri, 29 Nov 2024 19:30:53 -0800
Subject: [PATCH] Implement #512: refactory YAML read/write features

---
 release-notes/VERSION                         |   2 +
 .../dataformat/toml/TomlReadFeature.java      |   7 +-
 .../dataformat/toml/TomlWriteFeature.java     |   7 +-
 .../jackson/dataformat/yaml/YAMLFactory.java  |  20 +-
 .../dataformat/yaml/YAMLFactoryBuilder.java   |  40 ++--
 .../dataformat/yaml/YAMLGenerator.java        | 176 ++----------------
 .../jackson/dataformat/yaml/YAMLMapper.java   |  20 +-
 .../jackson/dataformat/yaml/YAMLParser.java   |  59 +-----
 .../dataformat/yaml/YAMLReadFeature.java      |  49 +++++
 .../dataformat/yaml/YAMLWriteFeature.java     | 154 +++++++++++++++
 .../deser/NullFromEmptyString130Test.java     |   6 +-
 .../yaml/failing/SimpleGeneration366Test.java |   8 +-
 .../dataformat/yaml/misc/ObjectIdTest.java    |   4 +-
 .../yaml/ser/CustomNodeStyleTest.java         |   6 +-
 .../yaml/ser/CustomStringQuoting229Test.java  |   6 +-
 .../yaml/ser/GeneratorFeature175Test.java     |   8 +-
 .../yaml/ser/GeneratorFeature34Test.java      |   4 +-
 .../yaml/ser/GeneratorFeatureTest.java        |   6 +-
 .../yaml/ser/GeneratorWithMinimizeTest.java   |  18 +-
 .../yaml/ser/GeneratorWithSplitLinesTest.java |   4 +-
 .../yaml/ser/SimpleGeneration215Test.java     |   6 +-
 .../yaml/ser/SimpleGenerationTest.java        |  16 +-
 .../dataformat/yaml/type/TypeIdTest.java      |   4 +-
 23 files changed, 317 insertions(+), 313 deletions(-)
 create mode 100644 yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLReadFeature.java
 create mode 100644 yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLWriteFeature.java

diff --git a/release-notes/VERSION b/release-notes/VERSION
index b123d9eb5..49eb2d36b 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -22,6 +22,8 @@ implementations)
  (suggested by @SebastianSolidwork)
 #510: JSTEP-8: rename `CsvParser.Feature` as `CsvReadFeature`,
   `CsvGenerator.Feature` as `CsvWriteFeature`
+#512: JSTEP-8: rename `YAMLParser.Feature` as `YAMLReadFeature`,
+  `YAMLGenerator.Feature` as `YAMLWriteFeature`
 - Add `XxxMapper.shared()` methods for getting globally shared default instances
 
 CSV:
diff --git a/toml/src/main/java/tools/jackson/dataformat/toml/TomlReadFeature.java b/toml/src/main/java/tools/jackson/dataformat/toml/TomlReadFeature.java
index 8c7619ed6..5a4afb5f8 100644
--- a/toml/src/main/java/tools/jackson/dataformat/toml/TomlReadFeature.java
+++ b/toml/src/main/java/tools/jackson/dataformat/toml/TomlReadFeature.java
@@ -6,7 +6,8 @@
  * Enumeration that defines all togglable features for TOML parsers.
  */
 public enum TomlReadFeature
-        implements FormatFeature {
+    implements FormatFeature
+{
     /**
      * TOML has special syntax for time types corresponding to {@link java.time.LocalDate}, {@link java.time.LocalTime},
      * {@link java.time.LocalDateTime} and {@link java.time.OffsetDateTime}. By default, the TOML parser just returns
@@ -17,8 +18,8 @@ public enum TomlReadFeature
      */
     PARSE_JAVA_TIME(false);
 
-    final boolean _defaultState;
-    final int _mask;
+    private final boolean _defaultState;
+    private final int _mask;
 
     // Method that calculates bit set (flags) of all features that
     // are enabled by default.
diff --git a/toml/src/main/java/tools/jackson/dataformat/toml/TomlWriteFeature.java b/toml/src/main/java/tools/jackson/dataformat/toml/TomlWriteFeature.java
index 2c6a48242..df4209b3b 100644
--- a/toml/src/main/java/tools/jackson/dataformat/toml/TomlWriteFeature.java
+++ b/toml/src/main/java/tools/jackson/dataformat/toml/TomlWriteFeature.java
@@ -6,7 +6,8 @@
 /**
  * Enumeration that defines all togglable features for TOML generators.
  */
-public enum TomlWriteFeature implements FormatFeature {
+public enum TomlWriteFeature implements FormatFeature
+{
     /**
      * The TOML spec does not allow null values. We instead write an empty string when
      * {@link JsonGenerator#writeNull()} by default.
@@ -20,8 +21,8 @@ public enum TomlWriteFeature implements FormatFeature {
      */
     static final int INTERNAL_PROHIBIT_INTERNAL_BUFFER_ALLOCATE = 0x80000000;
 
-    final boolean _defaultState;
-    final int _mask;
+    private final boolean _defaultState;
+    private final int _mask;
 
     // Method that calculates bit set (flags) of all features that
     // are enabled by default.
diff --git a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLFactory.java b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLFactory.java
index 00da38c9b..9ee1193df 100644
--- a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLFactory.java
+++ b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLFactory.java
@@ -29,13 +29,13 @@ public class YAMLFactory
      * Bitfield (set of flags) of all generator features that are enabled
      * by default.
      */
-    protected final static int DEFAULT_YAML_PARSER_FEATURE_FLAGS = YAMLParser.Feature.collectDefaults();
+    protected final static int DEFAULT_YAML_PARSER_FEATURE_FLAGS = YAMLReadFeature.collectDefaults();
 
     /**
      * Bitfield (set of flags) of all generator features that are enabled
      * by default.
      */
-    protected final static int DEFAULT_YAML_GENERATOR_FEATURE_FLAGS = YAMLGenerator.Feature.collectDefaults();
+    protected final static int DEFAULT_YAML_GENERATOR_FEATURE_FLAGS = YAMLWriteFeature.collectDefaults();
 
     /*
     /**********************************************************************
@@ -64,9 +64,9 @@ public class YAMLFactory
     /**
      * Configuration for underlying generator to follow, if specified;
      * left as {@code null} for backwards compatibility (which means
-     * the dumper options are derived based on {@link YAMLGenerator.Feature}s).
+     * the dumper options are derived based on {@link YAMLWriteFeature}s).
      * <p>
-     *     These {@link YAMLGenerator.Feature}s are ignored if you provide your own DumperOptions:
+     *     These {@link YAMLWriteFeature}s are ignored if you provide your own DumperOptions:
      *     <ul>
      *         <li>{@code YAMLGenerator.Feature.ALLOW_LONG_KEYS}</li>
      *         <li>{@code YAMLGenerator.Feature.CANONICAL_OUTPUT}</li>
@@ -204,13 +204,13 @@ public boolean canUseSchema(FormatSchema schema) {
     }
 
     @Override
-    public Class<YAMLParser.Feature> getFormatReadFeatureType() {
-        return YAMLParser.Feature.class;
+    public Class<YAMLReadFeature> getFormatReadFeatureType() {
+        return YAMLReadFeature.class;
     }
 
     @Override
-    public Class<YAMLGenerator.Feature> getFormatWriteFeatureType() {
-        return YAMLGenerator.Feature.class;
+    public Class<YAMLWriteFeature> getFormatWriteFeatureType() {
+        return YAMLWriteFeature.class;
     }
 
     @Override
@@ -219,11 +219,11 @@ public Class<YAMLGenerator.Feature> getFormatWriteFeatureType() {
     @Override
     public int getFormatWriteFeatures() { return _formatWriteFeatures; }
 
-    public boolean isEnabled(YAMLParser.Feature f) {
+    public boolean isEnabled(YAMLReadFeature f) {
         return (_formatReadFeatures & f.getMask()) != 0;
     }
 
-    public boolean isEnabled(YAMLGenerator.Feature f) {
+    public boolean isEnabled(YAMLWriteFeature f) {
         return (_formatWriteFeatures & f.getMask()) != 0;
     }
 
diff --git a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLFactoryBuilder.java b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLFactoryBuilder.java
index 7b68302b0..a9d689d8a 100644
--- a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLFactoryBuilder.java
+++ b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLFactoryBuilder.java
@@ -56,9 +56,9 @@ public class YAMLFactoryBuilder
     /**
      * Configuration for underlying generator to follow, if specified;
      * left as {@code null} for backwards compatibility (which means
-     * the dumper options are derived based on {@link YAMLGenerator.Feature}s).
+     * the dumper options are derived based on {@link YAMLWriteFeature}s).
      * <p>
-     *     These {@link YAMLGenerator.Feature}s are ignored if you provide your own DumperOptions:
+     *     These {@link YAMLWriteFeature}s are ignored if you provide your own DumperOptions:
      *     <ul>
      *         <li>{@code YAMLGenerator.Feature.ALLOW_LONG_KEYS}</li>
      *         <li>{@code YAMLGenerator.Feature.CANONICAL_OUTPUT}</li>
@@ -97,33 +97,33 @@ public YAMLFactoryBuilder(YAMLFactory base) {
     /**********************************************************
      */
 
-    public YAMLFactoryBuilder enable(YAMLGenerator.Feature f) {
+    public YAMLFactoryBuilder enable(YAMLWriteFeature f) {
         _formatWriteFeatures |= f.getMask();
         return this;
     }
 
-    public YAMLFactoryBuilder enable(YAMLGenerator.Feature first, YAMLGenerator.Feature... other) {
+    public YAMLFactoryBuilder enable(YAMLWriteFeature first, YAMLWriteFeature... other) {
         _formatWriteFeatures |= first.getMask();
-        for (YAMLGenerator.Feature f : other) {
+        for (YAMLWriteFeature f : other) {
             _formatWriteFeatures |= f.getMask();
         }
         return this;
     }
 
-    public YAMLFactoryBuilder disable(YAMLGenerator.Feature f) {
+    public YAMLFactoryBuilder disable(YAMLWriteFeature f) {
         _formatWriteFeatures &= ~f.getMask();
         return this;
     }
 
-    public YAMLFactoryBuilder disable(YAMLGenerator.Feature first, YAMLGenerator.Feature... other) {
+    public YAMLFactoryBuilder disable(YAMLWriteFeature first, YAMLWriteFeature... other) {
         _formatWriteFeatures &= ~first.getMask();
-        for (YAMLGenerator.Feature f : other) {
+        for (YAMLWriteFeature f : other) {
             _formatWriteFeatures &= ~f.getMask();
         }
         return this;
     }
 
-    public YAMLFactoryBuilder configure(YAMLGenerator.Feature f, boolean state) {
+    public YAMLFactoryBuilder configure(YAMLWriteFeature f, boolean state) {
         return state ? enable(f) : disable(f);
     }
 
@@ -133,33 +133,33 @@ public YAMLFactoryBuilder configure(YAMLGenerator.Feature f, boolean state) {
     /**********************************************************
      */
 
-    public YAMLFactoryBuilder enable(YAMLParser.Feature f) {
+    public YAMLFactoryBuilder enable(YAMLReadFeature f) {
         _formatReadFeatures |= f.getMask();
         return this;
     }
 
-    public YAMLFactoryBuilder enable(YAMLParser.Feature first, YAMLParser.Feature... other) {
+    public YAMLFactoryBuilder enable(YAMLReadFeature first, YAMLReadFeature... other) {
         _formatReadFeatures |= first.getMask();
-        for (YAMLParser.Feature f : other) {
+        for (YAMLReadFeature f : other) {
             _formatReadFeatures |= f.getMask();
         }
         return this;
     }
 
-    public YAMLFactoryBuilder disable(YAMLParser.Feature f) {
+    public YAMLFactoryBuilder disable(YAMLReadFeature f) {
         _formatReadFeatures &= ~f.getMask();
         return this;
     }
 
-    public YAMLFactoryBuilder disable(YAMLParser.Feature first, YAMLParser.Feature... other) {
+    public YAMLFactoryBuilder disable(YAMLReadFeature first, YAMLReadFeature... other) {
         _formatReadFeatures &= ~first.getMask();
-        for (YAMLParser.Feature f : other) {
+        for (YAMLReadFeature f : other) {
             _formatReadFeatures &= ~f.getMask();
         }
         return this;
     }
 
-    public YAMLFactoryBuilder configure(YAMLParser.Feature f, boolean state) {
+    public YAMLFactoryBuilder configure(YAMLReadFeature f, boolean state) {
         return state ? enable(f) : disable(f);
     }
 
@@ -226,9 +226,9 @@ public YAMLFactoryBuilder loadSettings(LoadSettings settings) {
     /**
      * Configuration for underlying generator to follow, if specified;
      * left as {@code null} for backwards compatibility (which means
-     * the dumper options are derived based on {@link YAMLGenerator.Feature}s).
+     * the dumper options are derived based on {@link YAMLWriteFeature}s).
      * <p>
-     *     These {@link YAMLGenerator.Feature}s are ignored if you provide your own DumperOptions:
+     *     These {@link YAMLWriteFeature}s are ignored if you provide your own DumperOptions:
      *     <ul>
      *         <li>{@code YAMLGenerator.Feature.ALLOW_LONG_KEYS}</li>
      *         <li>{@code YAMLGenerator.Feature.CANONICAL_OUTPUT}</li>
@@ -283,9 +283,9 @@ public LoadSettings loadSettings() {
     /**
      * Configuration for underlying generator to follow, if specified;
      * left as {@code null} for backwards compatibility (which means
-     * the dumper options are derived based on {@link YAMLGenerator.Feature}s).
+     * the dumper options are derived based on {@link YAMLWriteFeature}s).
      * <p>
-     *     These {@link YAMLGenerator.Feature}s are ignored if you provide your own DumperOptions:
+     *     These {@link YAMLWriteFeature}s are ignored if you provide your own DumperOptions:
      *     <ul>
      *         <li>{@code YAMLGenerator.Feature.ALLOW_LONG_KEYS}</li>
      *         <li>{@code YAMLGenerator.Feature.CANONICAL_OUTPUT}</li>
diff --git a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLGenerator.java b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLGenerator.java
index eb369f06e..0a4da047e 100644
--- a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLGenerator.java
+++ b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLGenerator.java
@@ -29,156 +29,6 @@
 
 public class YAMLGenerator extends GeneratorBase
 {
-    /**
-     * Enumeration that defines all togglable features for YAML generators
-     */
-    public enum Feature implements FormatFeature
-    {
-        /**
-         * Whether we are to write an explicit document start marker ("---")
-         * or not.
-         */
-        WRITE_DOC_START_MARKER(true),
-
-        /**
-         * Whether to use YAML native Object Id construct for indicating type (true);
-         * or "generic" Object Id mechanism (false). Former works better for systems that
-         * are YAML-centric; latter may be better choice for interoperability, when
-         * converting between formats or accepting other formats.
-         */
-        USE_NATIVE_OBJECT_ID(true),
-
-        /**
-         * Whether to use YAML native Type Id construct for indicating type (true);
-         * or "generic" type property (false). Former works better for systems that
-         * are YAML-centric; latter may be better choice for interoperability, when
-         * converting between formats or accepting other formats.
-         */
-        USE_NATIVE_TYPE_ID(true),
-
-        /**
-         * Do we try to force so-called canonical output or not.
-         * <p>
-         *     Ignored if you provide your own {@code DumperOptions}.
-         * </p>
-         */
-        CANONICAL_OUTPUT(false),
-
-        /**
-         * Options passed to SnakeYAML that determines whether longer textual content
-         * gets automatically split into multiple lines or not.
-         * <p>
-         *     Feature is enabled by default to conform to SnakeYAML defaults as well as
-         *     backwards compatibility with 2.5 and earlier versions.
-         * </p>
-         * <p>
-         *     Ignored if you provide your own {@code DumperOptions}.
-         * </p>
-         */
-        SPLIT_LINES(true),
-
-        /**
-         * Whether strings will be rendered without quotes (true) or
-         * with quotes (false, default).
-         * <p>
-         *     Minimized quote usage makes for more human readable output; however, content is
-         *     limited to printable characters according to the rules of
-         *     <a href="http://www.yaml.org/spec/1.2/spec.html#style/block/literal">literal block style</a>.
-         * </p>
-         */
-        MINIMIZE_QUOTES(false),
-
-        /**
-         * Whether numbers stored as strings will be rendered with quotes (true) or
-         * without quotes (false, default) when MINIMIZE_QUOTES is enabled.
-         * <p>
-         *     Minimized quote usage makes for more human readable output; however, content is
-         *     limited to printable characters according to the rules of
-         *     <a href="http://www.yaml.org/spec/1.2/spec.html#style/block/literal">literal block style</a>.
-         * </p>
-         */
-        ALWAYS_QUOTE_NUMBERS_AS_STRINGS(false),
-
-        /**
-         * Whether for string containing newlines a
-         * <a href="http://www.yaml.org/spec/1.2/spec.html#style/block/literal">literal block style</a>
-         * should be used. This automatically enabled when {@link #MINIMIZE_QUOTES} is set.
-         * <p>
-         *     The content of such strings is limited to printable characters according to the rules of
-         *     <a href="http://www.yaml.org/spec/1.2/spec.html#style/block/literal">literal block style</a>.
-         * </p>
-         */
-        LITERAL_BLOCK_STYLE(false),
-
-        /**
-         * Feature enabling of which adds indentation for array entry generation
-         * (default indentation being 2 spaces).
-         * <p>
-         *     Default value is {@code false} for backwards compatibility
-         * </p>
-         * <p>
-         *     Ignored if you provide your own {@code DumperOptions}.
-         * </p>
-         *
-         */
-        INDENT_ARRAYS(false),
-
-        /**
-         * Feature enabling of which adds indentation with indicator for array entry generation
-         * (default indentation being 2 spaces).
-         * <p>
-         *     Default value is {@code false} for backwards compatibility
-         * </p>
-         * <p>
-         *     Ignored if you provide your own {@code DumperOptions}.
-         * </p>
-         *
-         */
-        INDENT_ARRAYS_WITH_INDICATOR(false),
-
-        /**
-         * Option passed to SnakeYAML to allows writing key longer that 128 characters
-         * (up to 1024 characters).
-         * If disabled, the max key length is left as 128 characters: longer names
-         * are truncated. If enabled, limit is raised to 1024 characters.
-         * <p>
-         *     Ignored if you provide your own {@code DumperOptions}.
-         * </p>
-         */
-        ALLOW_LONG_KEYS(false),
-        ;
-
-        protected final boolean _defaultState;
-        protected final int _mask;
-
-        /**
-         * Method that calculates bit set (flags) of all features that
-         * are enabled by default.
-         */
-        public static int collectDefaults()
-        {
-            int flags = 0;
-            for (Feature f : values()) {
-                if (f.enabledByDefault()) {
-                    flags |= f.getMask();
-                }
-            }
-            return flags;
-        }
-
-        private Feature(boolean defaultState) {
-            _defaultState = defaultState;
-            _mask = (1 << ordinal());
-        }
-
-        @Override
-        public boolean enabledByDefault() { return _defaultState; }
-        @Override
-        public boolean enabledIn(int flags) { return (flags & _mask) != 0; }
-        @Override
-        public int getMask() { return _mask; }
-    }
-
     /*
     /**********************************************************************
     /* Internal constants
@@ -213,7 +63,7 @@ private Feature(boolean defaultState) {
      */
 
     /**
-     * Bit flag composed of bits that indicate which {@link YAMLGenerator.Feature}s
+     * Bit flag composed of bits that indicate which {@link YAMLWriteFeature}s
      * are enabled.
      */
     protected int _formatWriteFeatures;
@@ -270,7 +120,7 @@ public YAMLGenerator(ObjectWriteContext writeContext, IOContext ioCtxt,
         _streamWriteContext = SimpleStreamWriteContext.createRootContext(dups);
 
         _formatWriteFeatures = yamlFeatures;
-        _cfgMinimizeQuotes = Feature.MINIMIZE_QUOTES.enabledIn(_formatWriteFeatures);
+        _cfgMinimizeQuotes = YAMLWriteFeature.MINIMIZE_QUOTES.enabledIn(_formatWriteFeatures);
         _quotingChecker = quotingChecker;
         _writer = out;
         _docVersion = version;
@@ -291,7 +141,7 @@ protected DumpSettings buildDumperOptions(int streamWriteFeatures, int yamlFeatu
     {
         DumpSettingsBuilder opt = DumpSettings.builder();
         // would we want canonical?
-        if (Feature.CANONICAL_OUTPUT.enabledIn(_formatWriteFeatures)) {
+        if (YAMLWriteFeature.CANONICAL_OUTPUT.enabledIn(_formatWriteFeatures)) {
             opt.setCanonical(true);
         } else {
             opt.setCanonical(false);
@@ -299,9 +149,9 @@ protected DumpSettings buildDumperOptions(int streamWriteFeatures, int yamlFeatu
             opt.setDefaultFlowStyle(FlowStyle.BLOCK);
         }
         // split-lines for text blocks?
-        opt.setSplitLines(Feature.SPLIT_LINES.enabledIn(_formatWriteFeatures));
+        opt.setSplitLines(YAMLWriteFeature.SPLIT_LINES.enabledIn(_formatWriteFeatures));
         // array indentation?
-        if (Feature.INDENT_ARRAYS.enabledIn(_formatWriteFeatures)) {
+        if (YAMLWriteFeature.INDENT_ARRAYS.enabledIn(_formatWriteFeatures)) {
             // But, wrt [dataformats-text#34]: need to set both to diff values to work around bug
             // (otherwise indentation level is "invisible". Note that this should NOT be necessary
             // but is needed up to at least SnakeYAML 1.18.
@@ -310,11 +160,11 @@ protected DumpSettings buildDumperOptions(int streamWriteFeatures, int yamlFeatu
             opt.setIndent(2);
         }
         // [dataformats-text#175]: further configurability that overrides prev setting
-        if (Feature.INDENT_ARRAYS_WITH_INDICATOR.enabledIn(_formatWriteFeatures)) {
+        if (YAMLWriteFeature.INDENT_ARRAYS_WITH_INDICATOR.enabledIn(_formatWriteFeatures)) {
             opt.setIndicatorIndent(2);
             opt.setIndentWithIndicator(true);
         }
-        if (Feature.ALLOW_LONG_KEYS.enabledIn(_formatWriteFeatures)) {
+        if (YAMLWriteFeature.ALLOW_LONG_KEYS.enabledIn(_formatWriteFeatures)) {
             opt.setMaxSimpleKeyLength(1024);
         }
 
@@ -385,7 +235,7 @@ public JacksonFeatureSet<StreamWriteCapability> streamWriteCapabilities() {
     /**********************************************************************
      */
 
-    public final boolean isEnabled(Feature f) {
+    public final boolean isEnabled(YAMLWriteFeature f) {
         return (_formatWriteFeatures & f.getMask()) != 0;
     }
 
@@ -594,7 +444,7 @@ public JsonGenerator writeString(String text) throws JacksonException
                 style = STYLE_LITERAL;
             // If one of reserved values ("true", "null"), or, number, preserve quoting:
             } else if (_quotingChecker.needToQuoteValue(text)
-                || (Feature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS.enabledIn(_formatWriteFeatures)
+                || (YAMLWriteFeature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS.enabledIn(_formatWriteFeatures)
                         && PLAIN_NUMBER_P.matcher(text).matches())
                 ) {
                 style = STYLE_QUOTED;
@@ -602,7 +452,7 @@ public JsonGenerator writeString(String text) throws JacksonException
                 style = STYLE_PLAIN;
             }
         } else {
-            if (Feature.LITERAL_BLOCK_STYLE.enabledIn(_formatWriteFeatures)
+            if (YAMLWriteFeature.LITERAL_BLOCK_STYLE.enabledIn(_formatWriteFeatures)
                     && text.indexOf('\n') >= 0) {
                 style = STYLE_LITERAL;
             } else {
@@ -809,14 +659,14 @@ public JsonGenerator writeNull() throws JacksonException
     public boolean canWriteObjectId() {
         // yes, YAML does support Native Type Ids!
         // 10-Sep-2014, tatu: Except as per [#23] might not want to...
-        return Feature.USE_NATIVE_OBJECT_ID.enabledIn(_formatWriteFeatures);
+        return YAMLWriteFeature.USE_NATIVE_OBJECT_ID.enabledIn(_formatWriteFeatures);
     }
 
     @Override
     public boolean canWriteTypeId() {
         // yes, YAML does support Native Type Ids!
         // 10-Sep-2014, tatu: Except as per [#22] might not want to...
-        return Feature.USE_NATIVE_TYPE_ID.enabledIn(_formatWriteFeatures);
+        return YAMLWriteFeature.USE_NATIVE_TYPE_ID.enabledIn(_formatWriteFeatures);
     }
 
     @Override
@@ -927,7 +777,7 @@ protected String _lf() {
     protected void _emitStartDocument() throws JacksonException
     {
         Map<String,String> noTags = Collections.emptyMap();
-        boolean startMarker = Feature.WRITE_DOC_START_MARKER.enabledIn(_formatWriteFeatures);
+        boolean startMarker = YAMLWriteFeature.WRITE_DOC_START_MARKER.enabledIn(_formatWriteFeatures);
         _emit(new DocumentStartEvent(startMarker, _outputOptions.getYamlDirective(),
                  // for 1.10 was: ((version == null) ? null : version.getArray()),
                 noTags));
diff --git a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLMapper.java b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLMapper.java
index 15d5c1a92..78e9731d3 100644
--- a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLMapper.java
+++ b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLMapper.java
@@ -47,21 +47,21 @@ protected MapperBuilderState _saveState() {
         /******************************************************************
          */
 
-        public Builder enable(YAMLParser.Feature... features) {
-            for (YAMLParser.Feature f : features) {
+        public Builder enable(YAMLReadFeature... features) {
+            for (YAMLReadFeature f : features) {
                 _formatReadFeatures |= f.getMask();
             }
             return this;
         }
 
-        public Builder disable(YAMLParser.Feature... features) {
-            for (YAMLParser.Feature f : features) {
+        public Builder disable(YAMLReadFeature... features) {
+            for (YAMLReadFeature f : features) {
                 _formatReadFeatures &= ~f.getMask();
             }
             return this;
         }
 
-        public Builder configure(YAMLParser.Feature feature, boolean state)
+        public Builder configure(YAMLReadFeature feature, boolean state)
         {
             if (state) {
                 _formatReadFeatures |= feature.getMask();
@@ -71,21 +71,21 @@ public Builder configure(YAMLParser.Feature feature, boolean state)
             return this;
         }
 
-        public Builder enable(YAMLGenerator.Feature... features) {
-            for (YAMLGenerator.Feature f : features) {
+        public Builder enable(YAMLWriteFeature... features) {
+            for (YAMLWriteFeature f : features) {
                 _formatWriteFeatures |= f.getMask();
             }
             return this;
         }
 
-        public Builder disable(YAMLGenerator.Feature... features) {
-            for (YAMLGenerator.Feature f : features) {
+        public Builder disable(YAMLWriteFeature... features) {
+            for (YAMLWriteFeature f : features) {
                 _formatWriteFeatures &= ~f.getMask();
             }
             return this;
         }
 
-        public Builder configure(YAMLGenerator.Feature feature, boolean state)
+        public Builder configure(YAMLWriteFeature feature, boolean state)
         {
             if (state) {
                 _formatWriteFeatures |= feature.getMask();
diff --git a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLParser.java b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLParser.java
index 8c43b20c8..c9c7658f7 100644
--- a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLParser.java
+++ b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLParser.java
@@ -35,59 +35,6 @@
  */
 public class YAMLParser extends ParserBase
 {
-    /**
-     * Enumeration that defines all togglable features for YAML parsers.
-     */
-    public enum Feature implements FormatFeature
-    {
-        /**
-         * Feature that determines whether an empty {@link String} will be parsed
-         * as {@code null}. Logic is part of YAML 1.1 
-         * <a href="https://yaml.org/type/null.html">Null Language-Independent Type</a>.
-         *<p>
-         * Feature is enabled by default in Jackson 2.12 for backwards-compatibility
-         * reasons.
-         */
-        EMPTY_STRING_AS_NULL(true)
-        ;
-
-        private final boolean _defaultState;
-        private final int _mask;
-
-        // Method that calculates bit set (flags) of all features that
-        // are enabled by default.
-        public static int collectDefaults()
-        {
-            int flags = 0;
-            for (Feature f : values()) {
-                if (f.enabledByDefault()) {
-                    flags |= f.getMask();
-                }
-            }
-            return flags;
-        }
-
-        private Feature(boolean defaultState) {
-            _defaultState = defaultState;
-            _mask = (1 << ordinal());
-        }
-
-        @Override
-        public boolean enabledByDefault() { return _defaultState; }
-        @Override
-        public boolean enabledIn(int flags) { return (flags & _mask) != 0; }
-        @Override
-        public int getMask() { return _mask; }
-    }
-
-    // note: does NOT include '0', handled separately
-//    private final static Pattern PATTERN_INT = Pattern.compile("-?[1-9][0-9]*");
-
-    // 22-Nov-2020, tatu: Not needed as of 2.12 since SnakeYAML tags
-    //    doubles correctly
-//    private final static Pattern PATTERN_FLOAT = Pattern.compile(
-//            "[-+]?([0-9][0-9_]*)?\\.[0-9]*([eE][-+][0-9]+)?");
-    
     /*
     /**********************************************************************
     /* Configuration
@@ -190,7 +137,7 @@ protected YAMLParser(ObjectReadContext readCtxt, IOContext ioCtxt, BufferRecycle
         _formatFeatures = formatFeatures;
         _reader = reader;
         _yamlParser = yamlParser;
-        _cfgEmptyStringsToNull = Feature.EMPTY_STRING_AS_NULL.enabledIn(formatFeatures);
+        _cfgEmptyStringsToNull = YAMLReadFeature.EMPTY_STRING_AS_NULL.enabledIn(formatFeatures);
         DupDetector dups = StreamReadFeature.STRICT_DUPLICATE_DETECTION.enabledIn(streamReadFeatures)
                 ? DupDetector.rootDetector(this) : null;
         _streamReadContext = SimpleStreamReadContext.createRootContext(dups);
@@ -289,10 +236,10 @@ protected void _closeInput() throws IOException {
      */
 
     /**
-     * Method for checking whether specified {@link YAMLParser.Feature}
+     * Method for checking whether specified {@link YAMLReadFeature}
      * is enabled.
      */
-    public boolean isEnabled(YAMLParser.Feature f) {
+    public boolean isEnabled(YAMLReadFeature f) {
         return (_formatFeatures & f.getMask()) != 0;
     }
 
diff --git a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLReadFeature.java b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLReadFeature.java
new file mode 100644
index 000000000..1618f17a0
--- /dev/null
+++ b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLReadFeature.java
@@ -0,0 +1,49 @@
+package tools.jackson.dataformat.yaml;
+
+import tools.jackson.core.FormatFeature;
+
+/**
+ * Enumeration that defines all togglable features for YAML parsers.
+ *<p>
+ * NOTE: in Jackson 2.x this was named {@code YAMLParser.Feature}.
+ */
+public enum YAMLReadFeature implements FormatFeature
+{
+    /**
+     * Feature that determines whether an empty {@link String} will be parsed
+     * as {@code null}. Logic is part of YAML 1.1 
+     * <a href="https://yaml.org/type/null.html">Null Language-Independent Type</a>.
+     *<p>
+     * Feature is enabled by default for backwards-compatibility reasons.
+     */
+    EMPTY_STRING_AS_NULL(true)
+    ;
+
+    private final boolean _defaultState;
+    private final int _mask;
+
+    // Method that calculates bit set (flags) of all features that
+    // are enabled by default.
+    public static int collectDefaults()
+    {
+        int flags = 0;
+        for (YAMLReadFeature f : values()) {
+            if (f.enabledByDefault()) {
+                flags |= f.getMask();
+            }
+        }
+        return flags;
+    }
+
+    private YAMLReadFeature(boolean defaultState) {
+        _defaultState = defaultState;
+        _mask = (1 << ordinal());
+    }
+
+    @Override
+    public boolean enabledByDefault() { return _defaultState; }
+    @Override
+    public boolean enabledIn(int flags) { return (flags & _mask) != 0; }
+    @Override
+    public int getMask() { return _mask; }
+}
diff --git a/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLWriteFeature.java b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLWriteFeature.java
new file mode 100644
index 000000000..ded3726a2
--- /dev/null
+++ b/yaml/src/main/java/tools/jackson/dataformat/yaml/YAMLWriteFeature.java
@@ -0,0 +1,154 @@
+package tools.jackson.dataformat.yaml;
+
+import tools.jackson.core.FormatFeature;
+
+/**
+ * Enumeration that defines all togglable features for YAML generators
+ *<p>
+ * NOTE: in Jackson 2.x this was named {@code YAMLGenerator.Feature}.
+ */
+public enum YAMLWriteFeature implements FormatFeature
+{
+    /**
+     * Whether we are to write an explicit document start marker ("---")
+     * or not.
+     */
+    WRITE_DOC_START_MARKER(true),
+
+    /**
+     * Whether to use YAML native Object Id construct for indicating type (true);
+     * or "generic" Object Id mechanism (false). Former works better for systems that
+     * are YAML-centric; latter may be better choice for interoperability, when
+     * converting between formats or accepting other formats.
+     */
+    USE_NATIVE_OBJECT_ID(true),
+
+    /**
+     * Whether to use YAML native Type Id construct for indicating type (true);
+     * or "generic" type property (false). Former works better for systems that
+     * are YAML-centric; latter may be better choice for interoperability, when
+     * converting between formats or accepting other formats.
+     */
+    USE_NATIVE_TYPE_ID(true),
+
+    /**
+     * Do we try to force so-called canonical output or not.
+     * <p>
+     *     Ignored if you provide your own {@code DumperOptions}.
+     * </p>
+     */
+    CANONICAL_OUTPUT(false),
+
+    /**
+     * Options passed to SnakeYAML that determines whether longer textual content
+     * gets automatically split into multiple lines or not.
+     * <p>
+     * Feature is enabled by default to conform to SnakeYAML defaults.
+     * </p>
+     * <p>
+     *     Ignored if you provide your own {@code DumperOptions}.
+     * </p>
+     */
+    SPLIT_LINES(true),
+
+    /**
+     * Whether strings will be rendered without quotes (true) or
+     * with quotes (false, default).
+     * <p>
+     *     Minimized quote usage makes for more human readable output; however, content is
+     *     limited to printable characters according to the rules of
+     *     <a href="http://www.yaml.org/spec/1.2/spec.html#style/block/literal">literal block style</a>.
+     * </p>
+     */
+    MINIMIZE_QUOTES(false),
+
+    /**
+     * Whether numbers stored as strings will be rendered with quotes (true) or
+     * without quotes (false, default) when MINIMIZE_QUOTES is enabled.
+     * <p>
+     *     Minimized quote usage makes for more human readable output; however, content is
+     *     limited to printable characters according to the rules of
+     *     <a href="http://www.yaml.org/spec/1.2/spec.html#style/block/literal">literal block style</a>.
+     * </p>
+     */
+    ALWAYS_QUOTE_NUMBERS_AS_STRINGS(false),
+
+    /**
+     * Whether for string containing newlines a
+     * <a href="http://www.yaml.org/spec/1.2/spec.html#style/block/literal">literal block style</a>
+     * should be used. This automatically enabled when {@link #MINIMIZE_QUOTES} is set.
+     * <p>
+     *     The content of such strings is limited to printable characters according to the rules of
+     *     <a href="http://www.yaml.org/spec/1.2/spec.html#style/block/literal">literal block style</a>.
+     * </p>
+     */
+    LITERAL_BLOCK_STYLE(false),
+
+    /**
+     * Feature enabling of which adds indentation for array entry generation
+     * (default indentation being 2 spaces).
+     * <p>
+     *     Default value is {@code false} for backwards compatibility
+     * </p>
+     * <p>
+     *     Ignored if you provide your own {@code DumperOptions}.
+     * </p>
+     *
+     */
+    INDENT_ARRAYS(false),
+
+    /**
+     * Feature enabling of which adds indentation with indicator for array entry generation
+     * (default indentation being 2 spaces).
+     * <p>
+     *     Default value is {@code false} for backwards compatibility
+     * </p>
+     * <p>
+     *     Ignored if you provide your own {@code DumperOptions}.
+     * </p>
+     *
+     */
+    INDENT_ARRAYS_WITH_INDICATOR(false),
+
+    /**
+     * Option passed to SnakeYAML to allows writing key longer that 128 characters
+     * (up to 1024 characters).
+     * If disabled, the max key length is left as 128 characters: longer names
+     * are truncated. If enabled, limit is raised to 1024 characters.
+     * <p>
+     *     Ignored if you provide your own {@code DumperOptions}.
+     * </p>
+     */
+    ALLOW_LONG_KEYS(false),
+    ;
+
+    private final boolean _defaultState;
+    private final int _mask;
+
+    /**
+     * Method that calculates bit set (flags) of all features that
+     * are enabled by default.
+     */
+    public static int collectDefaults()
+    {
+        int flags = 0;
+        for (YAMLWriteFeature f : values()) {
+            if (f.enabledByDefault()) {
+                flags |= f.getMask();
+            }
+        }
+        return flags;
+    }
+
+    private YAMLWriteFeature(boolean defaultState) {
+        _defaultState = defaultState;
+        _mask = (1 << ordinal());
+    }
+
+    @Override
+    public boolean enabledByDefault() { return _defaultState; }
+    @Override
+    public boolean enabledIn(int flags) { return (flags & _mask) != 0; }
+    @Override
+    public int getMask() { return _mask; }
+}
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/deser/NullFromEmptyString130Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/deser/NullFromEmptyString130Test.java
index f00e49f64..89f90515c 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/deser/NullFromEmptyString130Test.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/deser/NullFromEmptyString130Test.java
@@ -2,7 +2,7 @@
 
 import tools.jackson.dataformat.yaml.ModuleTestBase;
 import tools.jackson.dataformat.yaml.YAMLMapper;
-import tools.jackson.dataformat.yaml.YAMLParser;
+import tools.jackson.dataformat.yaml.YAMLReadFeature;
 
 public class NullFromEmptyString130Test extends ModuleTestBase
 {
@@ -20,7 +20,7 @@ public void setValue(String str) {
     public void testEmptyValueToNull130() throws Exception
     {
         // by default, empty Strings are coerced:
-        assertTrue(MAPPER.tokenStreamFactory().isEnabled(YAMLParser.Feature.EMPTY_STRING_AS_NULL));
+        assertTrue(MAPPER.tokenStreamFactory().isEnabled(YAMLReadFeature.EMPTY_STRING_AS_NULL));
 
         {
             Value130 v = MAPPER.readValue("value:   \n", Value130.class);
@@ -33,7 +33,7 @@ public void testEmptyValueToNull130() throws Exception
         // but can change that:
         {
             Value130 v = MAPPER.readerFor(Value130.class)
-                .without(YAMLParser.Feature.EMPTY_STRING_AS_NULL)
+                .without(YAMLReadFeature.EMPTY_STRING_AS_NULL)
                 .readValue("value:   \n");
             assertEquals("", v.value);
         }
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/SimpleGeneration366Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/SimpleGeneration366Test.java
index c3dabf0e2..4ce33e742 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/SimpleGeneration366Test.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/failing/SimpleGeneration366Test.java
@@ -12,10 +12,10 @@ public void testLiteralBlockStyleMultilineWithTrailingSpace() throws Exception
     {
         YAMLFactory f = new YAMLFactory();
         // verify default settings
-        assertFalse(f.isEnabled(YAMLGenerator.Feature.LITERAL_BLOCK_STYLE));
+        assertFalse(f.isEnabled(YAMLWriteFeature.LITERAL_BLOCK_STYLE));
 
         YAMLMapper mapper = YAMLMapper.builder()
-                .configure(YAMLGenerator.Feature.LITERAL_BLOCK_STYLE, true)
+                .configure(YAMLWriteFeature.LITERAL_BLOCK_STYLE, true)
                 .build();
 
         Map<String, Object> content = new HashMap<String, Object>();
@@ -31,10 +31,10 @@ public void testLiteralBlockStyleMultiline() throws Exception
     {
         YAMLFactory f = new YAMLFactory();
         // verify default settings
-        assertFalse(f.isEnabled(YAMLGenerator.Feature.LITERAL_BLOCK_STYLE));
+        assertFalse(f.isEnabled(YAMLWriteFeature.LITERAL_BLOCK_STYLE));
 
         YAMLMapper mapper = YAMLMapper.builder()
-                .configure(YAMLGenerator.Feature.LITERAL_BLOCK_STYLE, true)
+                .configure(YAMLWriteFeature.LITERAL_BLOCK_STYLE, true)
                 .build();
 
         Map<String, Object> content = new HashMap<String, Object>();
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/misc/ObjectIdTest.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/misc/ObjectIdTest.java
index db18642c3..15ed2184d 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/misc/ObjectIdTest.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/misc/ObjectIdTest.java
@@ -5,8 +5,8 @@
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.util.TokenBuffer;
 import tools.jackson.dataformat.yaml.ModuleTestBase;
-import tools.jackson.dataformat.yaml.YAMLGenerator;
 import tools.jackson.dataformat.yaml.YAMLMapper;
+import tools.jackson.dataformat.yaml.YAMLWriteFeature;
 
 public class ObjectIdTest extends ModuleTestBase
 {
@@ -134,7 +134,7 @@ public void testNonNativeSerialization() throws Exception
         first.next = second;
         second.next = first;
         String yaml = mapper.writer()
-                .without(YAMLGenerator.Feature.USE_NATIVE_OBJECT_ID)
+                .without(YAMLWriteFeature.USE_NATIVE_OBJECT_ID)
                 .writeValueAsString(first);
         assertYAML(SIMPLE_YAML_NON_NATIVE, yaml);
     }
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/CustomNodeStyleTest.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/CustomNodeStyleTest.java
index 9b1d1ab8d..ddb10aa63 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/CustomNodeStyleTest.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/CustomNodeStyleTest.java
@@ -3,8 +3,8 @@
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.dataformat.yaml.ModuleTestBase;
 import tools.jackson.dataformat.yaml.YAMLFactory;
-import tools.jackson.dataformat.yaml.YAMLGenerator;
 import tools.jackson.dataformat.yaml.YAMLMapper;
+import tools.jackson.dataformat.yaml.YAMLWriteFeature;
 
 import org.snakeyaml.engine.v2.api.DumpSettings;
 import org.snakeyaml.engine.v2.common.FlowStyle;
@@ -49,8 +49,8 @@ private ObjectMapper createMapper(FlowStyle flowStyle) {
         }
         YAMLFactory yamlFactory = YAMLFactory.builder().dumperOptions(dumperOptions).build();
         return YAMLMapper.builder(yamlFactory)
-                .enable(YAMLGenerator.Feature.MINIMIZE_QUOTES)
-                .disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER)
+                .enable(YAMLWriteFeature.MINIMIZE_QUOTES)
+                .disable(YAMLWriteFeature.WRITE_DOC_START_MARKER)
                 .build();
     }
 }
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/CustomStringQuoting229Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/CustomStringQuoting229Test.java
index 3be58c849..2792432ec 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/CustomStringQuoting229Test.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/CustomStringQuoting229Test.java
@@ -5,8 +5,8 @@
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.dataformat.yaml.ModuleTestBase;
 import tools.jackson.dataformat.yaml.YAMLFactory;
-import tools.jackson.dataformat.yaml.YAMLGenerator;
 import tools.jackson.dataformat.yaml.YAMLMapper;
+import tools.jackson.dataformat.yaml.YAMLWriteFeature;
 import tools.jackson.dataformat.yaml.util.StringQuotingChecker;
 
 @SuppressWarnings("serial")
@@ -30,14 +30,14 @@ public boolean needToQuoteValue(String value) {
                 // null -> use default:
                 .stringQuotingChecker(null)
                 .build())
-            .enable(YAMLGenerator.Feature.MINIMIZE_QUOTES)
+            .enable(YAMLWriteFeature.MINIMIZE_QUOTES)
             .build();
 
     private final YAMLMapper CUSTOM_MAPPER = YAMLMapper.builder(
             YAMLFactory.builder()
                 .stringQuotingChecker(new CustomChecker())
                 .build())
-            .enable(YAMLGenerator.Feature.MINIMIZE_QUOTES)
+            .enable(YAMLWriteFeature.MINIMIZE_QUOTES)
             .build();
 
     public void testNameQuotingDefault() throws Exception
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeature175Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeature175Test.java
index 0b7e658ff..644a20739 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeature175Test.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeature175Test.java
@@ -1,8 +1,8 @@
 package tools.jackson.dataformat.yaml.ser;
 
 import tools.jackson.dataformat.yaml.ModuleTestBase;
-import tools.jackson.dataformat.yaml.YAMLGenerator;
 import tools.jackson.dataformat.yaml.YAMLMapper;
+import tools.jackson.dataformat.yaml.YAMLWriteFeature;
 
 import java.util.Map;
 
@@ -27,7 +27,7 @@ public void testArrayWithIndicatorIndentation() throws Exception {
             "      name: \"Mathematics\"";
 
         YAMLMapper defaultArrayMapper = YAMLMapper.builder()
-            .enable(YAMLGenerator.Feature.INDENT_ARRAYS)
+            .enable(YAMLWriteFeature.INDENT_ARRAYS)
             .build();
         Map<?, ?> stuff = defaultArrayMapper.readValue(yamlBefore, Map.class);
         String defaultYaml = defaultArrayMapper.writeValueAsString(stuff);
@@ -36,8 +36,8 @@ public void testArrayWithIndicatorIndentation() throws Exception {
         assertNotSame(yamlBefore, defaultYaml);
 
         YAMLMapper arrayWithIndicatorMapper = YAMLMapper.builder()
-            .enable(YAMLGenerator.Feature.INDENT_ARRAYS)
-            .enable(YAMLGenerator.Feature.INDENT_ARRAYS_WITH_INDICATOR)
+            .enable(YAMLWriteFeature.INDENT_ARRAYS)
+            .enable(YAMLWriteFeature.INDENT_ARRAYS_WITH_INDICATOR)
             .build();
 
         String arrayWithIndicatorYaml = arrayWithIndicatorMapper.writeValueAsString(stuff);
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeature34Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeature34Test.java
index 1ec7d6ea4..2bb0cc15a 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeature34Test.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeature34Test.java
@@ -3,8 +3,8 @@
 import java.util.Map;
 
 import tools.jackson.dataformat.yaml.ModuleTestBase;
-import tools.jackson.dataformat.yaml.YAMLGenerator;
 import tools.jackson.dataformat.yaml.YAMLMapper;
+import tools.jackson.dataformat.yaml.YAMLWriteFeature;
 
 public class GeneratorFeature34Test extends ModuleTestBase
 {
@@ -29,7 +29,7 @@ public void testArrayIndentation67() throws Exception
         Map<?,?> stuff = yamlMapper
                 .readValue(yamlBefore, Map.class);
         String yamlAfter = yamlMapper.writer()
-                .with(YAMLGenerator.Feature.INDENT_ARRAYS)
+                .with(YAMLWriteFeature.INDENT_ARRAYS)
                 .writeValueAsString(stuff);
         // and do it again to ensure it is parseable (no need to be identical)
         Map<?,?> stuff2 = yamlMapper.readValue(yamlAfter, Map.class);
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeatureTest.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeatureTest.java
index 2d1b40cd1..94e249a28 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeatureTest.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorFeatureTest.java
@@ -10,8 +10,8 @@
 import tools.jackson.databind.ObjectWriter;
 import tools.jackson.dataformat.yaml.ModuleTestBase;
 import tools.jackson.dataformat.yaml.YAMLFactory;
-import tools.jackson.dataformat.yaml.YAMLGenerator;
 import tools.jackson.dataformat.yaml.YAMLMapper;
+import tools.jackson.dataformat.yaml.YAMLWriteFeature;
 
 public class GeneratorFeatureTest extends ModuleTestBase
 {
@@ -43,7 +43,7 @@ public void testArrayIndentation() throws Exception
         assertEquals("words:\n- \"first\"\n- \"second\"\n- \"third\"", yaml);
 
         // and then with different config
-        ObjectWriter w = MAPPER.writer().with(YAMLGenerator.Feature.INDENT_ARRAYS);
+        ObjectWriter w = MAPPER.writer().with(YAMLWriteFeature.INDENT_ARRAYS);
 
         yaml = w.writeValueAsString(input);
         if (yaml.startsWith("---")) {
@@ -70,7 +70,7 @@ public void testLongKeys() throws Exception
         assertEquals("---\n? " + LONG_KEY + "\n: \"value\"",
         _trim(defaultMapper.writeValueAsString(inputValue)));
         
-        ObjectMapper longKeysMapper = YAMLMapper.builder().enable(YAMLGenerator.Feature.ALLOW_LONG_KEYS).build();
+        ObjectMapper longKeysMapper = YAMLMapper.builder().enable(YAMLWriteFeature.ALLOW_LONG_KEYS).build();
         assertEquals("---\n" + LONG_KEY + ": \"value\"",
                 _trim(longKeysMapper.writeValueAsString(inputValue)));
     }
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorWithMinimizeTest.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorWithMinimizeTest.java
index 92173c8c3..21e4faa11 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorWithMinimizeTest.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorWithMinimizeTest.java
@@ -6,8 +6,8 @@
 
 import tools.jackson.dataformat.yaml.ModuleTestBase;
 import tools.jackson.dataformat.yaml.YAMLFactory;
-import tools.jackson.dataformat.yaml.YAMLGenerator;
 import tools.jackson.dataformat.yaml.YAMLMapper;
+import tools.jackson.dataformat.yaml.YAMLWriteFeature;
 
 public class GeneratorWithMinimizeTest extends ModuleTestBase
 {
@@ -15,7 +15,7 @@ public class GeneratorWithMinimizeTest extends ModuleTestBase
     private final static YAMLMapper MINIM_MAPPER;
     static {
         MINIM_MAPPER = new YAMLMapper(YAMLFactory.builder()
-                .enable(YAMLGenerator.Feature.MINIMIZE_QUOTES)
+                .enable(YAMLWriteFeature.MINIMIZE_QUOTES)
                 .build()
         );
     }
@@ -23,12 +23,12 @@ public class GeneratorWithMinimizeTest extends ModuleTestBase
 
     public void testDefaultSetting() {
         YAMLFactory f = new YAMLFactory();
-        assertFalse(f.isEnabled(YAMLGenerator.Feature.MINIMIZE_QUOTES));
+        assertFalse(f.isEnabled(YAMLWriteFeature.MINIMIZE_QUOTES));
 
         f = YAMLFactory.builder()
-                .enable(YAMLGenerator.Feature.MINIMIZE_QUOTES)
+                .enable(YAMLWriteFeature.MINIMIZE_QUOTES)
                 .build();
-        assertTrue(f.isEnabled(YAMLGenerator.Feature.MINIMIZE_QUOTES));
+        assertTrue(f.isEnabled(YAMLWriteFeature.MINIMIZE_QUOTES));
     }
 
     public void testLiteralStringsSingleLine() throws Exception
@@ -187,12 +187,12 @@ public void testQuoteNumberStoredAsString() throws Exception
 
         YAMLFactory f = new YAMLFactory();
         // verify default settings
-        assertFalse(f.isEnabled(YAMLGenerator.Feature.MINIMIZE_QUOTES));
-        assertFalse(f.isEnabled(YAMLGenerator.Feature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS));
+        assertFalse(f.isEnabled(YAMLWriteFeature.MINIMIZE_QUOTES));
+        assertFalse(f.isEnabled(YAMLWriteFeature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS));
 
         f = YAMLFactory.builder()
-                .enable(YAMLGenerator.Feature.MINIMIZE_QUOTES,
-                        YAMLGenerator.Feature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS)
+                .enable(YAMLWriteFeature.MINIMIZE_QUOTES,
+                        YAMLWriteFeature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS)
                 .build();
         YAMLMapper mapper = new YAMLMapper(f);
 
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorWithSplitLinesTest.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorWithSplitLinesTest.java
index 99236a0b1..a9fc2dffd 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorWithSplitLinesTest.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/GeneratorWithSplitLinesTest.java
@@ -11,7 +11,7 @@ public void testSplitLines() throws Exception
         YAMLFactory f = new YAMLFactory();
 
         // verify default settings
-        assertTrue(f.isEnabled(YAMLGenerator.Feature.SPLIT_LINES));
+        assertTrue(f.isEnabled(YAMLWriteFeature.SPLIT_LINES));
 
         // and first write with splitting enabled
         YAMLMapper mapper = new YAMLMapper(f);
@@ -24,7 +24,7 @@ public void testSplitLines() throws Exception
 
         // and then with splitting disabled
         yaml = mapper.writer()
-                .without(YAMLGenerator.Feature.SPLIT_LINES)
+                .without(YAMLWriteFeature.SPLIT_LINES)
                 .writeValueAsString(INPUT).trim();
         assertEquals("---\n" +
                 "- \"1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890 1234567890\"",
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGeneration215Test.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGeneration215Test.java
index 00fb2280e..4a7f67f7a 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGeneration215Test.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGeneration215Test.java
@@ -4,8 +4,8 @@
 
 import tools.jackson.dataformat.yaml.ModuleTestBase;
 import tools.jackson.dataformat.yaml.YAMLFactory;
-import tools.jackson.dataformat.yaml.YAMLGenerator;
 import tools.jackson.dataformat.yaml.YAMLMapper;
+import tools.jackson.dataformat.yaml.YAMLWriteFeature;
 
 // NOTE: fails only on 2.x (2.12) -- fixed for 3.0
 public class SimpleGeneration215Test extends ModuleTestBase
@@ -15,7 +15,7 @@ public void testStartMarkerViaWriter() throws Exception
     {
         final String output = YAMLMapper.builder().build()
             .writer()
-            .without(YAMLGenerator.Feature.WRITE_DOC_START_MARKER)
+            .without(YAMLWriteFeature.WRITE_DOC_START_MARKER)
             .writeValueAsString(Collections.singletonMap("key", "value"))
             .trim();
         assertEquals("key: \"value\"", output);
@@ -25,7 +25,7 @@ public void testStartMarkerViaWriter() throws Exception
     public void testStartMarkerViaMapper() throws Exception
     {
         YAMLMapper mapper = new YAMLMapper(YAMLFactory.builder()
-                .disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER).build()
+                .disable(YAMLWriteFeature.WRITE_DOC_START_MARKER).build()
         );
         final String output = mapper.writeValueAsString(Collections.singletonMap("key", "value"))
             .trim();
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGenerationTest.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGenerationTest.java
index 801f18dd9..78a94e48c 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGenerationTest.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/ser/SimpleGenerationTest.java
@@ -79,18 +79,18 @@ public void testStartMarker() throws Exception
         StringWriter w = new StringWriter();
         ObjectWriter ow = MAPPER.writer();
 
-        assertTrue(MAPPER.tokenStreamFactory().isEnabled(YAMLGenerator.Feature.WRITE_DOC_START_MARKER));
+        assertTrue(MAPPER.tokenStreamFactory().isEnabled(YAMLWriteFeature.WRITE_DOC_START_MARKER));
         YAMLGenerator gen = (YAMLGenerator) MAPPER.createGenerator(w);
-        assertTrue(gen.isEnabled(YAMLGenerator.Feature.WRITE_DOC_START_MARKER));
+        assertTrue(gen.isEnabled(YAMLWriteFeature.WRITE_DOC_START_MARKER));
         _writeBradDoc(gen);
         String yaml = w.toString().trim();
         assertEquals("---\nname: \"Brad\"\nage: 39", yaml);
 
         // and then, disabling, and not any more
-        ow = ow.without(YAMLGenerator.Feature.WRITE_DOC_START_MARKER);
+        ow = ow.without(YAMLWriteFeature.WRITE_DOC_START_MARKER);
         w = new StringWriter();
         gen = (YAMLGenerator)ow.createGenerator(w);
-        assertFalse(gen.isEnabled(YAMLGenerator.Feature.WRITE_DOC_START_MARKER));
+        assertFalse(gen.isEnabled(YAMLWriteFeature.WRITE_DOC_START_MARKER));
         _writeBradDoc(gen);
         yaml = w.toString().trim();
         assertEquals("name: \"Brad\"\nage: 39", yaml);
@@ -100,14 +100,14 @@ public void testLiteralBlockStyle() throws Exception
     {
         YAMLFactory f = new YAMLFactory();
         // verify default settings
-        assertFalse(f.isEnabled(YAMLGenerator.Feature.LITERAL_BLOCK_STYLE));
+        assertFalse(f.isEnabled(YAMLWriteFeature.LITERAL_BLOCK_STYLE));
 
-        f = f.rebuild().enable(YAMLGenerator.Feature.LITERAL_BLOCK_STYLE)
+        f = f.rebuild().enable(YAMLWriteFeature.LITERAL_BLOCK_STYLE)
                 .build();
-        assertTrue(f.isEnabled(YAMLGenerator.Feature.LITERAL_BLOCK_STYLE));
+        assertTrue(f.isEnabled(YAMLWriteFeature.LITERAL_BLOCK_STYLE));
 
         YAMLMapper mapper = new YAMLMapper(f);
-        assertTrue(mapper.tokenStreamFactory().isEnabled(YAMLGenerator.Feature.LITERAL_BLOCK_STYLE));
+        assertTrue(mapper.tokenStreamFactory().isEnabled(YAMLWriteFeature.LITERAL_BLOCK_STYLE));
 
         Map<String, Object> content = new HashMap<String, Object>();
         content.put("text", "Hello\nWorld");
diff --git a/yaml/src/test/java/tools/jackson/dataformat/yaml/type/TypeIdTest.java b/yaml/src/test/java/tools/jackson/dataformat/yaml/type/TypeIdTest.java
index d70fa1c52..0732852d4 100644
--- a/yaml/src/test/java/tools/jackson/dataformat/yaml/type/TypeIdTest.java
+++ b/yaml/src/test/java/tools/jackson/dataformat/yaml/type/TypeIdTest.java
@@ -5,8 +5,8 @@
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.util.TokenBuffer;
 import tools.jackson.dataformat.yaml.ModuleTestBase;
-import tools.jackson.dataformat.yaml.YAMLGenerator;
 import tools.jackson.dataformat.yaml.YAMLMapper;
+import tools.jackson.dataformat.yaml.YAMLWriteFeature;
 
 public class TypeIdTest extends ModuleTestBase
 {
@@ -46,7 +46,7 @@ public void testNonNativeSerialization() throws Exception
     {
         YAMLMapper mapper = new YAMLMapper();
         String yaml = mapper.writer()
-            .without(YAMLGenerator.Feature.USE_NATIVE_TYPE_ID)
+            .without(YAMLWriteFeature.USE_NATIVE_TYPE_ID)
             .writeValueAsString(new Impl(13));
         yaml = yaml.trim();
         assertEquals("---\ntype: \"impl\"\na: 13", yaml);