Skip to content

[issue 768]FromXmlParser lacks extension point for custom XmlTokenStream #769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 16, 2025
Merged

[issue 768]FromXmlParser lacks extension point for custom XmlTokenStream #769

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3931e45
[issue 768]FromXmlParser lacks extension point for custom XmlTokenStream
shanhy-goodcol Jul 15, 2025
e117c3d
[issue 768]FromXmlParser lacks extension point for custom XmlTokenStream
shanhy-goodcol Jul 16, 2025
51585ba
By abstracting the createParser method, developers no longer need to …
shanhy-goodcol Jul 16, 2025
7fabd87
Abstract a createGenerator method to make it easier to extend.
shanhy-goodcol Jul 16, 2025
43349a2
Add release notes
cowtowncoder Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,17 +274,20 @@ private Feature(boolean defaultState) {
*/

public FromXmlParser(IOContext ctxt, int genericParserFeatures, int xmlFeatures,
ObjectCodec codec, XMLStreamReader xmlReader, XmlNameProcessor tagProcessor)
throws IOException
{
ObjectCodec codec, XMLStreamReader xmlReader, XmlNameProcessor tagProcessor) throws IOException {
this(ctxt, genericParserFeatures, codec, new XmlTokenStream(xmlReader, ctxt.contentReference(), xmlFeatures, tagProcessor));
}

public FromXmlParser(IOContext ctxt, int genericParserFeatures, ObjectCodec codec, XmlTokenStream xmlTokenStream) throws IOException {
super(genericParserFeatures, ctxt.streamReadConstraints());
_formatFeatures = xmlFeatures;
_ioContext = ctxt;
_objectCodec = codec;
_parsingContext = XmlReadContext.createRootContext(-1, -1);
_xmlTokens = new XmlTokenStream(xmlReader, ctxt.contentReference(),
_formatFeatures, tagProcessor);

if (xmlTokenStream == null) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use JDK Objects.requireNonNull() like

_xmlTokens = Objects.requireNonNull(xmlTokenStream, "xmlTokenStream cannot be null");

throw new IllegalArgumentException("xmlTokenStream cannot be null");
}
_xmlTokens = xmlTokenStream;
_formatFeatures = xmlTokenStream.getFormatFeatures();
final int firstToken;
try {
firstToken = _xmlTokens.initialize();
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/fasterxml/jackson/dataformat/xml/deser/XmlTokenStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,10 @@ protected void setFormatFeatures(int f) {
_cfgProcessXsiType = FromXmlParser.Feature.AUTO_DETECT_XSI_TYPE.enabledIn(f);
}

public int getFormatFeatures() {
return _formatFeatures;
}

/*
/**********************************************************************
/* Public API
Expand Down