You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by GitBox <gi...@apache.org> on 2022/08/30 14:46:06 UTC
[GitHub] [daffodil] stevedlawrence opened a new pull request, #835: Update to Scala XML 2.1.0
stevedlawrence opened a new pull request, #835:
URL: https://github.com/apache/daffodil/pull/835
The main difference in this new Scala XML version is changing the
XML.load() function to not ignore comments and processing instructions
and not coalesce cdata. These changes caused some tests to fail which
required minor modifications. There are no changes to transitive
dependencies or license that need to be incorporated.
Additionally, the DaffodilConstructionLoader is modified to drop
processing instructions and comments. This gives a similar behavior to
the old XML.load function, and fixes bugs related to unexpected
comments.
DAFFODIL-2685, DAFFODIL-2237
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] tuxji commented on a diff in pull request #835: Update to Scala XML 2.1.0
Posted by GitBox <gi...@apache.org>.
tuxji commented on code in PR #835:
URL: https://github.com/apache/daffodil/pull/835#discussion_r958743127
##########
daffodil-lib/src/main/scala/org/apache/daffodil/xml/DaffodilConstructingLoader.scala:
##########
@@ -295,14 +295,17 @@ class DaffodilConstructingLoader private[xml] (uri: URI,
* Same CRLF/CR => LF processing as text gets.
Review Comment:
Please replace this comment with "Drops comments."
##########
daffodil-lib/src/main/scala/org/apache/daffodil/xml/DaffodilConstructingLoader.scala:
##########
@@ -295,14 +295,17 @@ class DaffodilConstructingLoader private[xml] (uri: URI,
* Same CRLF/CR => LF processing as text gets.
*/
override def comment(pos: Int, s: String): Comment = {
- Comment(text(pos, s).text)
+ // returning null drops comments
+ null
}
/**
* Same CRLF/CR => LF processing as text gets.
Review Comment:
Please replace this comment with "Drops processing instructions."
##########
daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLLoader.scala:
##########
@@ -115,15 +117,13 @@ b&"<>]]></x>"""
// IF this test fails, it means that the scala xml loader have been FIXED (hooray!)
// and our need for the ConstructingParser may have gone away.
Review Comment:
Please remove the comments at lines 115-118 since they're no longer needed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] stevedlawrence merged pull request #835: Update to Scala XML 2.1.0
Posted by GitBox <gi...@apache.org>.
stevedlawrence merged PR #835:
URL: https://github.com/apache/daffodil/pull/835
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org