Skip to content

Commit fd38c05

Browse files
committed
sync with databind/2.12
1 parent e44d3f6 commit fd38c05

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ public UnwrappingXmlBeanSerializer(UnwrappingXmlBeanSerializer src, ObjectIdWrit
5656
_nameTransformer = src._nameTransformer;
5757
}
5858

59-
protected UnwrappingXmlBeanSerializer(UnwrappingXmlBeanSerializer src, Set<String> toIgnore)
59+
protected UnwrappingXmlBeanSerializer(UnwrappingXmlBeanSerializer src,
60+
Set<String> toIgnore, Set<String> toInclude)
6061
{
61-
super(src, toIgnore);
62+
super(src, toIgnore, toInclude);
6263
_nameTransformer = src._nameTransformer;
6364
}
6465

@@ -100,9 +101,9 @@ public BeanSerializerBase withFilterId(Object filterId)
100101
return new UnwrappingXmlBeanSerializer(this, _objectIdWriter, filterId);
101102
}
102103

103-
@Override // since 2.8
104-
protected BeanSerializerBase withIgnorals(Set<String> toIgnore) {
105-
return new UnwrappingXmlBeanSerializer(this, toIgnore);
104+
@Override // since 2.12
105+
protected BeanSerializerBase withByNameInclusion(Set<String> toIgnore, Set<String> toInclude) {
106+
return new UnwrappingXmlBeanSerializer(this, toIgnore, toInclude);
106107
}
107108

108109
@Override // since 2.11.1

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public XmlBeanSerializer(XmlBeanSerializerBase src, ObjectIdWriter objectIdWrite
3939
super(src, objectIdWriter);
4040
}
4141

42-
public XmlBeanSerializer(XmlBeanSerializerBase src, Set<String> toIgnore) {
43-
super(src, toIgnore);
42+
public XmlBeanSerializer(XmlBeanSerializerBase src, Set<String> toIgnore, Set<String> toInclude) {
43+
super(src, toIgnore, toInclude);
4444
}
4545

4646
protected XmlBeanSerializer(XmlBeanSerializerBase src,
@@ -70,9 +70,9 @@ public BeanSerializerBase withFilterId(Object filterId) {
7070
return new XmlBeanSerializer(this, _objectIdWriter, filterId);
7171
}
7272

73-
@Override
74-
protected BeanSerializerBase withIgnorals(Set<String> toIgnore) {
75-
return new XmlBeanSerializer(this, toIgnore);
73+
@Override // since 2.12
74+
protected BeanSerializerBase withByNameInclusion(Set<String> toIgnore, Set<String> toInclude) {
75+
return new XmlBeanSerializer(this, toIgnore, toInclude);
7676
}
7777

7878
@Override // since 2.11.1

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,10 @@ protected XmlBeanSerializerBase(XmlBeanSerializerBase src, ObjectIdWriter object
123123
_cdata = src._cdata;
124124
}
125125

126-
protected XmlBeanSerializerBase(XmlBeanSerializerBase src, Set<String> toIgnore)
126+
protected XmlBeanSerializerBase(XmlBeanSerializerBase src,
127+
Set<String> toIgnore, Set<String> toInclude)
127128
{
128-
super(src, toIgnore);
129+
super(src, toIgnore, toInclude);
129130
_attributeCount = src._attributeCount;
130131
_textPropertyIndex = src._textPropertyIndex;
131132
_xmlNames = src._xmlNames;

0 commit comments

Comments
 (0)