Xml proposal implementation: XML node structure change #20668
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
via special casing attribute addition method
Output stream does not get all characters as internal buffers of xml stream was not flushed properly
Allow XMLFactory.createXMLElement() method to provide default ns for the element being created.
…lerina-lang into xml-proposal-impl � Conflicts: � bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/XMLItem.java � bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/XMLSequence.java
With BValue API improvements, a new BXml interface was introduced. This commit fixes merge conflicts that was created as a result of updating to that new BXml interface related code.
to new xml node structure
… into xml-proposal-impl � Conflicts: � bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/XMLFactory.java � bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/XMLItem.java � bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/XMLSequence.java � bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/XMLValue.java � bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/api/BValueCreator.java � bvm/ballerina-runtime/src/main/java/org/ballerinalang/jvm/values/api/BXML.java � langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Concat.java � langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Elements.java � langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Filter.java � langlib/lang.xml/src/main/java/org/ballerinalang/langlib/xml/Map.java � stdlib/http/src/test/java/org/ballerinalang/stdlib/services/nativeimpl/request/RequestNativeFunctionNegativeTest.java � stdlib/http/src/test/java/org/ballerinalang/stdlib/services/nativeimpl/response/ResponseNativeFunctionNegativeTest.java � stdlib/io/src/main/java/org/ballerinalang/stdlib/io/nativeimpl/WriteXml.java � stdlib/jsonutils/src/main/java/org/ballerinalang/stdlib/jsonutils/FromXML.java � stdlib/xmlutils/src/main/java/org/ballerinalang/stdlib/xmlutils/JSONToXMLConverter.java � stdlib/xslt/src/main/java/org/ballerinalang/xslt/XsltTransformer.java � tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/statements/arrays/ArrayTest.java
… into xml-proposal-impl
rdhananjaya
added
the
Team/CompilerFE
dulvinw
reviewed
Jan 20, 2020
| } | ||
| } | ||
|
|
||
| public void write(BXML xmlValue) { |
There was a problem hiding this comment.
What if we define throws since this a public method?
There was a problem hiding this comment.
It doesn't throw any checked exceptions, in that case, do we need to do that.
rdhananjaya
force-pushed
the
xml-proposal-impl
branch
from
1c796bc to
7c35cbb
Compare
MaryamZi
reviewed
Jan 23, 2020
| // element doesn't have NS URI in it's name. | ||
| if ((qName.getNamespaceURI() == null || qName.getNamespaceURI().isEmpty())) { | ||
| for (String s : currentNSLevel) { | ||
| if (s.startsWith("xmlns")) { |
There was a problem hiding this comment.
Shall we use constants for "xmlns", "", "}", etc.?
| /** | ||
| * XML tree builder for Ballerina xml node structure using {@code XMLStreamReader}. | ||
| * | ||
| * @since 1.1.0 |
|
|
||
| private void handleXMLStreamException(Exception e) { | ||
| // todo: do e.getMessage contain all the information? verify | ||
| throw new BallerinaException(e.getMessage(), e); |
There was a problem hiding this comment.
I guess the reason should be {ballerina/lang.xml}XxxError
| xmlStreamWriter = xmlOutputFactory.createXMLStreamWriter(outputStream); | ||
| parentNSSet = new ArrayDeque<>(); | ||
| } catch (XMLStreamException e) { | ||
| throw new BallerinaException(e); |
There was a problem hiding this comment.
Error reasons need to be fixed?
|
|
||
| private void writeXMLComment(XMLComment xmlValue) throws XMLStreamException { | ||
| xmlStreamWriter.writeComment(xmlValue.getTextValue()); | ||
|
|
| } | ||
|
|
||
| @Override | ||
| public abstract OMNode value(); |
There was a problem hiding this comment.
This is still being used for testing (Jvm values to BVM values conversion)
|
|
||
| @Override | ||
| public OMNode value() { | ||
| CharacterDataImpl characterData = new CharacterDataImpl(); |
|
This PR was mistakenly merged by pushing to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
This PR adds the new XML node structure, xml parser, xml serializer as a part of revamping xml support. This is a part of #19570
Fixes #19832
Approach
Samples
Remarks
Check List