This is an automated email from the ASF dual-hosted git repository.
mattyb149 pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 47101f760e NIFI-12669 Fix EvaluateXQuery processor which incorrectly
encodes result attributes in certain case
47101f760e is described below
commit 47101f760e60f2a93e524c2adb01ebe29ebb754d
Author: Jim Steinebrey <[email protected]>
AuthorDate: Tue May 7 16:55:01 2024 -0400
NIFI-12669 Fix EvaluateXQuery processor which incorrectly encodes result
attributes in certain case
Signed-off-by: Matt Burgess <[email protected]>
---
.../main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java | 2 +-
.../java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java | 4 ++--
.../nifi-standard-processors/src/test/resources/TestXml/fruit.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
index 8be53e2565..297c7ef998 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
@@ -370,7 +370,7 @@ public class EvaluateXQuery extends AbstractProcessor {
private String formatItem(XdmItem item, ProcessContext context) throws
IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
writeFormattedItem(item, context, baos);
- return baos.toString();
+ return baos.toString(StandardCharsets.UTF_8);
}
void writeFormattedItem(XdmItem item, ProcessContext context, OutputStream
out) throws IOException {
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
index 5eb665cb96..e77cae0fc1 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXQuery.java
@@ -198,7 +198,7 @@ public class TestEvaluateXQuery {
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><fruit
xmlns:ns=\"http://namespace/1\";><name>banana</name><color>yellow</color></fruit>",
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><fruit
xmlns:ns=\"http://namespace/1\";
taste=\"sweet\"><name>orange</name><color>orange</color></fruit>",
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><fruit
xmlns:ns=\"http://namespace/1\";><name>blueberry</name><color>blue</color></fruit>",
- "<?xml version=\"1.0\" encoding=\"UTF-8\"?><fruit
xmlns:ns=\"http://namespace/1\";
taste=\"tart\"><name>raspberry</name><color>red</color></fruit>",
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?><fruit
xmlns:ns=\"http://namespace/1\";
taste=\"ÄÖÜäöüßéèóò\"><name>raspberry</name><color>red</color></fruit>",
"<?xml version=\"1.0\" encoding=\"UTF-8\"?><fruit
xmlns:ns=\"http://namespace/1\";><name>none</name><color/></fruit>"));
/* XML all matches wrapped (one result)*/
@@ -210,7 +210,7 @@ public class TestEvaluateXQuery {
+ "<fruit
xmlns:ns=\"http://namespace/1\";><name>banana</name><color>yellow</color></fruit>"
+ "<fruit xmlns:ns=\"http://namespace/1\";
taste=\"sweet\"><name>orange</name><color>orange</color></fruit>"
+ "<fruit
xmlns:ns=\"http://namespace/1\";><name>blueberry</name><color>blue</color></fruit>"
- + "<fruit xmlns:ns=\"http://namespace/1\";
taste=\"tart\"><name>raspberry</name><color>red</color></fruit>"
+ + "<fruit xmlns:ns=\"http://namespace/1\";
taste=\"ÄÖÜäöüßéèóò\"><name>raspberry</name><color>red</color></fruit>"
+ "<fruit
xmlns:ns=\"http://namespace/1\";><name>none</name><color/></fruit>"
+ "</wrap>"));
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/fruit.xml
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/fruit.xml
index 483d827a5d..bd95f2afd3 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/fruit.xml
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/fruit.xml
@@ -36,7 +36,7 @@
<name>blueberry</name>
<color>blue</color>
</fruit>
- <fruit taste="tart">
+ <fruit taste="ÄÖÜäöüßéèóò">
<name>raspberry</name>
<color>red</color>
</fruit>
