Merge branch '3.x' into feature/record-with-jacksonxmltext

Author: cowtowncoder

src/main/java/tools/jackson/dataformat/xml/XmlFactory.java

@@ -43,13 +43,13 @@ public class XmlFactory
      * Bitfield (set of flags) of all parser features that are enabled
      * by default.
      */
-    final static int DEFAULT_XML_PARSER_FEATURE_FLAGS = XmlReadFeature.collectDefaults();
+    protected final static int DEFAULT_XML_READ_FEATURE_FLAGS = XmlReadFeature.collectDefaults();
 
     /**
      * Bitfield (set of flags) of all generator features that are enabled
      * by default.
      */
-    final static int DEFAULT_XML_GENERATOR_FEATURE_FLAGS = XmlWriteFeature.collectDefaults();
+    protected final static int DEFAULT_XML_WRITE_FEATURE_FLAGS = XmlWriteFeature.collectDefaults();
 
     /*
     /**********************************************************************
@@ -91,7 +91,7 @@ public XmlFactory(XMLInputFactory xmlIn) {
     }
 
     public XmlFactory(XMLInputFactory xmlIn, XMLOutputFactory xmlOut) {
-        this(DEFAULT_XML_PARSER_FEATURE_FLAGS, DEFAULT_XML_GENERATOR_FEATURE_FLAGS,
+        this(DEFAULT_XML_READ_FEATURE_FLAGS, DEFAULT_XML_WRITE_FEATURE_FLAGS,
                 xmlIn, xmlOut, XmlNameProcessors.newPassthroughProcessor(),
                 null);
     }
@@ -334,11 +334,6 @@ public Class<XmlWriteFeature> getFormatWriteFeatureType() {
     /**********************************************************************
      */
 
-    @Deprecated
-    public void setXMLTextElementName(String name) {
-        _cfgNameForTextElement = name;
-    }
-
     public String getXMLTextElementName() {
         return _cfgNameForTextElement;
     }

src/main/java/tools/jackson/dataformat/xml/XmlFactoryBuilder.java

@@ -78,8 +78,8 @@ protected XmlFactoryBuilder() {
         super(StreamReadConstraints.defaults(),
                 StreamWriteConstraints.defaults(),
                 ErrorReportConfiguration.defaults(),
-                XmlFactory.DEFAULT_XML_PARSER_FEATURE_FLAGS,
-                XmlFactory.DEFAULT_XML_GENERATOR_FEATURE_FLAGS);
+                XmlFactory.DEFAULT_XML_READ_FEATURE_FLAGS,
+                XmlFactory.DEFAULT_XML_WRITE_FEATURE_FLAGS);
         _classLoaderForStax = null;
         _nameProcessor = XmlNameProcessors.newPassthroughProcessor();
     }