sync with databind/2.12

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/UnwrappingXmlBeanSerializer.java

@@ -56,9 +56,10 @@ public UnwrappingXmlBeanSerializer(UnwrappingXmlBeanSerializer src, ObjectIdWrit
         _nameTransformer = src._nameTransformer;
     }
 
-    protected UnwrappingXmlBeanSerializer(UnwrappingXmlBeanSerializer src, Set<String> toIgnore)
+    protected UnwrappingXmlBeanSerializer(UnwrappingXmlBeanSerializer src,
+            Set<String> toIgnore, Set<String> toInclude)
     {
-        super(src, toIgnore);
+        super(src, toIgnore, toInclude);
         _nameTransformer = src._nameTransformer;
     }
 
@@ -100,9 +101,9 @@ public BeanSerializerBase withFilterId(Object filterId)
         return new UnwrappingXmlBeanSerializer(this, _objectIdWriter, filterId);
     }
 
-    @Override // since 2.8
-    protected BeanSerializerBase withIgnorals(Set<String> toIgnore) {
-        return new UnwrappingXmlBeanSerializer(this, toIgnore);
+    @Override // since 2.12
+    protected BeanSerializerBase withByNameInclusion(Set<String> toIgnore, Set<String> toInclude) {
+        return new UnwrappingXmlBeanSerializer(this, toIgnore, toInclude);
     }
 
     @Override // since 2.11.1

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanSerializer.java

@@ -39,8 +39,8 @@ public XmlBeanSerializer(XmlBeanSerializerBase src, ObjectIdWriter objectIdWrite
         super(src, objectIdWriter);
     }
 
-    public XmlBeanSerializer(XmlBeanSerializerBase src, Set<String> toIgnore) {
-        super(src, toIgnore);
+    public XmlBeanSerializer(XmlBeanSerializerBase src, Set<String> toIgnore, Set<String> toInclude) {
+        super(src, toIgnore, toInclude);
     }
 
     protected XmlBeanSerializer(XmlBeanSerializerBase src,
@@ -70,9 +70,9 @@ public BeanSerializerBase withFilterId(Object filterId) {
         return new XmlBeanSerializer(this, _objectIdWriter, filterId);
     }
 
-    @Override
-    protected BeanSerializerBase withIgnorals(Set<String> toIgnore) {
-        return new XmlBeanSerializer(this, toIgnore);
+    @Override // since 2.12
+    protected BeanSerializerBase withByNameInclusion(Set<String> toIgnore, Set<String> toInclude) {
+        return new XmlBeanSerializer(this, toIgnore, toInclude);
     }
 
     @Override // since 2.11.1

src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanSerializerBase.java

@@ -123,9 +123,10 @@ protected XmlBeanSerializerBase(XmlBeanSerializerBase src, ObjectIdWriter object
         _cdata = src._cdata;
     }
 
-    protected XmlBeanSerializerBase(XmlBeanSerializerBase src, Set<String> toIgnore)
+    protected XmlBeanSerializerBase(XmlBeanSerializerBase src,
+            Set<String> toIgnore, Set<String> toInclude)
     {
-        super(src, toIgnore);
+        super(src, toIgnore, toInclude);
         _attributeCount = src._attributeCount;
         _textPropertyIndex = src._textPropertyIndex;
         _xmlNames = src._xmlNames;