Skip to content

Commit f40d369

Browse files
committed
Fix compilation issue
1 parent 907502c commit f40d369

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ protected TypeIdResolver idResolver(DatabindContext ctxt,
6666
switch (_idType) {
6767
case CLASS:
6868
return new XmlTypeResolverBuilder.XmlClassNameIdResolver(baseType,
69-
subTypeValidator(ctxt));
69+
subtypes, subTypeValidator(ctxt));
7070
case MINIMAL_CLASS:
7171
return new XmlTypeResolverBuilder.XmlMinimalClassNameIdResolver(baseType,
72-
subTypeValidator(ctxt));
72+
subtypes, subTypeValidator(ctxt));
7373
default:
7474
}
7575
return super.idResolver(ctxt, baseType, subtypeValidator, subtypes, forSer, forDeser);

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ protected TypeIdResolver idResolver(DatabindContext ctxt,
6161
// Only override handlers of class, minimal class; name is good as is
6262
switch (_idType) {
6363
case CLASS:
64-
return new XmlClassNameIdResolver(baseType, subTypeValidator(ctxt));
64+
return new XmlClassNameIdResolver(baseType, subtypes,
65+
subTypeValidator(ctxt));
6566
case MINIMAL_CLASS:
66-
return new XmlMinimalClassNameIdResolver(baseType, subTypeValidator(ctxt));
67+
return new XmlMinimalClassNameIdResolver(baseType, subtypes,
68+
subTypeValidator(ctxt));
6769
default:
6870
}
6971
return super.idResolver(ctxt, baseType, subtypeValidator, subtypes, forSer, forDeser);
@@ -125,9 +127,10 @@ protected static class XmlClassNameIdResolver
125127
{
126128
private static final long serialVersionUID = 3L;
127129

128-
public XmlClassNameIdResolver(JavaType baseType, PolymorphicTypeValidator ptv)
130+
public XmlClassNameIdResolver(JavaType baseType, Collection<NamedType> subtypes,
131+
PolymorphicTypeValidator ptv)
129132
{
130-
super(baseType, ptv);
133+
super(baseType, subtypes, ptv);
131134
}
132135

133136
@Override
@@ -147,9 +150,10 @@ protected static class XmlMinimalClassNameIdResolver
147150
{
148151
private static final long serialVersionUID = 3L;
149152

150-
public XmlMinimalClassNameIdResolver(JavaType baseType, PolymorphicTypeValidator ptv)
153+
public XmlMinimalClassNameIdResolver(JavaType baseType, Collection<NamedType> subtypes,
154+
PolymorphicTypeValidator ptv)
151155
{
152-
super(baseType, ptv);
156+
super(baseType, subtypes, ptv);
153157
}
154158

155159
@Override

0 commit comments

Comments
 (0)