Merge pull request #3844 from malakaganga/dss_x

Add missing attribute escapeNonPrintableChar in DS
wso2 · Dec 19, 2024 · 9f4ae04 · 9f4ae04
2 parents d66c807 + 22b5f69
commit 9f4ae04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.../org/wso2/micro/integrator/dataservices/core/DataServiceDocLitWrappedSchemaGenerator.java b/.../org/wso2/micro/integrator/dataservices/core/DataServiceDocLitWrappedSchemaGenerator.java
@@ -445,6 +445,7 @@ private static void processCallQuery(CommonParams cparams, XmlSchemaElement pare
 			activeElement.setMinOccurs(0);
 			activeElement.setMaxOccurs(Long.MAX_VALUE);
 		}
+
 		/* process the result content */
 		processElementGroup(cparams, activeElement, result.getDefaultElementGroup());
 	}

diff --git a/...n/java/org/wso2/micro/integrator/dataservices/core/description/query/QuerySerializer.java b/...n/java/org/wso2/micro/integrator/dataservices/core/description/query/QuerySerializer.java
@@ -198,6 +198,10 @@ private static void serializeResult(Result result, OMElement queryEl, OMFactory
 			if (elementName != null) {
 				resEl.addAttribute(DBSFields.ELEMENT, elementName, null);
 			}
+			String escapeNonPrintableChar = String.valueOf(result.isEscapeNonPrintableChar());
+			if (!escapeNonPrintableChar.isEmpty()) {
+				resEl.addAttribute(DBSFields.ESCAPE_NON_PRINTABLE_CHAR, escapeNonPrintableChar, null);
+			}
 			String rowName = result.getRowName();
 			if (rowName != null) {
 				resEl.addAttribute(DBSFields.ROW_NAME, rowName, null);