From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 6 Jul 2021 10:00:43 +0000 (+0200)
Subject: Retrieve directly the XML value of a node.
X-Git-Tag: argeo-commons-2.1.103~18
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=443993fb881a8fb05684207f04319f1e58246aec

Retrieve directly the XML value of a node.
---

diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java b/org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java
index 8f1ee9fa9..666b2593e 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java
@@ -30,22 +30,33 @@ public class JcrxApi {
 	 * XML
 	 */
 	/**
-	 * Set as a subnode which will be exported as an XML element.
+	 * Get the XML text of this child node.
 	 */
 	public static String getXmlValue(Node node, String name) {
 		try {
 			if (!node.hasNode(name))
 				return null;
 			Node child = node.getNode(name);
-			if (!child.hasNode(Jcr.JCR_XMLTEXT))
+			return getXmlValue(child);
+		} catch (RepositoryException e) {
+			throw new IllegalStateException("Cannot get " + name + " as XML text", e);
+		}
+	}
+
+	/**
+	 * Get the XML text of this node.
+	 */
+	public static String getXmlValue(Node node) {
+		try {
+			if (!node.hasNode(Jcr.JCR_XMLTEXT))
 				return null;
-			Node xmlText = child.getNode(Jcr.JCR_XMLTEXT);
+			Node xmlText = node.getNode(Jcr.JCR_XMLTEXT);
 			if (!xmlText.hasProperty(Jcr.JCR_XMLCHARACTERS))
 				throw new IllegalArgumentException(
 						"Node " + xmlText + " has no " + Jcr.JCR_XMLCHARACTERS + " property");
 			return xmlText.getProperty(Jcr.JCR_XMLCHARACTERS).getString();
 		} catch (RepositoryException e) {
-			throw new IllegalStateException("Cannot get " + name + " as XML text", e);
+			throw new IllegalStateException("Cannot get " + node + " as XML text", e);
 		}
 	}