From d192df6872e246afa298d3a3b2685d36621a9391 Mon Sep 17 00:00:00 2001
From: Roman Saratz <roman.saratz@flowable.com>
Date: Fri, 31 May 2024 08:59:56 +0200
Subject: [PATCH] Move from getText() to getElementText()

XMLStreamReader#next() may split characters into several chunks, and if so, getText() will only return the text of the current chunk instead of the entire element if javax.xml.stream.IS_COALESCING is not set to true. Using getElementText() always returns the full text.
---
 .../org/flowable/bpmn/converter/BaseBpmnXMLConverter.java     | 4 ++--
 .../java/org/flowable/bpmn/converter/util/BpmnXMLUtil.java    | 4 ++--
 .../java/org/flowable/cmmn/converter/util/CmmnXmlUtil.java    | 4 ++--
 .../main/java/org/flowable/dmn/converter/util/DmnXMLUtil.java | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/flowable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/BaseBpmnXMLConverter.java b/modules/flowable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/BaseBpmnXMLConverter.java
index ad7967da6a0..fcbd4829ecf 100644
--- a/modules/flowable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/BaseBpmnXMLConverter.java
+++ b/modules/flowable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/BaseBpmnXMLConverter.java
@@ -298,8 +298,8 @@ protected ExtensionElement parseExtensionElement(XMLStreamReader xtr) throws Exc
         while (!readyWithExtensionElement && xtr.hasNext()) {
             xtr.next();
             if (xtr.isCharacters() || XMLStreamReader.CDATA == xtr.getEventType()) {
-                if (StringUtils.isNotEmpty(xtr.getText().trim())) {
-                    extensionElement.setElementText(xtr.getText().trim());
+                if (StringUtils.isNotEmpty(xtr.getElementText().trim())) {
+                    extensionElement.setElementText(xtr.getElementText().trim());
                 }
             } else if (xtr.isStartElement()) {
                 ExtensionElement childExtensionElement = parseExtensionElement(xtr);
diff --git a/modules/flowable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/util/BpmnXMLUtil.java b/modules/flowable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/util/BpmnXMLUtil.java
index 8aba4885172..bd736af5192 100644
--- a/modules/flowable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/util/BpmnXMLUtil.java
+++ b/modules/flowable-bpmn-converter/src/main/java/org/flowable/bpmn/converter/util/BpmnXMLUtil.java
@@ -195,8 +195,8 @@ public static ExtensionElement parseExtensionElement(XMLStreamReader xtr) throws
         while (!readyWithExtensionElement && xtr.hasNext()) {
             xtr.next();
             if (xtr.isCharacters() || XMLStreamReader.CDATA == xtr.getEventType()) {
-                if (StringUtils.isNotEmpty(xtr.getText().trim())) {
-                    extensionElement.setElementText(xtr.getText().trim());
+                if (StringUtils.isNotEmpty(xtr.getElementText().trim())) {
+                    extensionElement.setElementText(xtr.getElementText().trim());
                 }
             } else if (xtr.isStartElement()) {
                 ExtensionElement childExtensionElement = parseExtensionElement(xtr);
diff --git a/modules/flowable-cmmn-converter/src/main/java/org/flowable/cmmn/converter/util/CmmnXmlUtil.java b/modules/flowable-cmmn-converter/src/main/java/org/flowable/cmmn/converter/util/CmmnXmlUtil.java
index dde18db44f8..642d7ab4875 100644
--- a/modules/flowable-cmmn-converter/src/main/java/org/flowable/cmmn/converter/util/CmmnXmlUtil.java
+++ b/modules/flowable-cmmn-converter/src/main/java/org/flowable/cmmn/converter/util/CmmnXmlUtil.java
@@ -74,8 +74,8 @@ public static ExtensionElement parseExtensionElement(XMLStreamReader xtr) throws
         while (!readyWithExtensionElement && xtr.hasNext()) {
             xtr.next();
             if (xtr.isCharacters() || XMLStreamReader.CDATA == xtr.getEventType()) {
-                if (StringUtils.isNotEmpty(xtr.getText().trim())) {
-                    extensionElement.setElementText(xtr.getText().trim());
+                if (StringUtils.isNotEmpty(xtr.getElementText().trim())) {
+                    extensionElement.setElementText(xtr.getElementText().trim());
                 }
             } else if (xtr.isStartElement()) {
                 ExtensionElement childExtensionElement = parseExtensionElement(xtr);
diff --git a/modules/flowable-dmn-xml-converter/src/main/java/org/flowable/dmn/converter/util/DmnXMLUtil.java b/modules/flowable-dmn-xml-converter/src/main/java/org/flowable/dmn/converter/util/DmnXMLUtil.java
index 5685141e426..986b5d247c7 100644
--- a/modules/flowable-dmn-xml-converter/src/main/java/org/flowable/dmn/converter/util/DmnXMLUtil.java
+++ b/modules/flowable-dmn-xml-converter/src/main/java/org/flowable/dmn/converter/util/DmnXMLUtil.java
@@ -143,8 +143,8 @@ public static DmnExtensionElement parseExtensionElement(XMLStreamReader xtr) thr
         while (!readyWithExtensionElement && xtr.hasNext()) {
             xtr.next();
             if (xtr.isCharacters() || XMLStreamReader.CDATA == xtr.getEventType()) {
-                if (StringUtils.isNotEmpty(xtr.getText().trim())) {
-                    extensionElement.setElementText(xtr.getText().trim());
+                if (StringUtils.isNotEmpty(xtr.getElementText().trim())) {
+                    extensionElement.setElementText(xtr.getElementText().trim());
                 }
             } else if (xtr.isStartElement()) {
                 DmnExtensionElement childExtensionElement = parseExtensionElement(xtr);