X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fxml%2FDomContent.java;h=a4c14186ac17d299b0673e1b67ee0857db166c13;hb=3b45f571938e0eb6803084aac3f2bd298e6026ba;hp=786b0d63261f2b298cde63194176f9a3e7c629af;hpb=975fb5e581d0650768afc68a0e839657f318e77a;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContent.java b/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContent.java
index 786b0d632..a4c14186a 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/xml/DomContent.java
@@ -1,5 +1,12 @@
 package org.argeo.cms.acr.xml;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 import java.nio.CharBuffer;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -9,15 +16,19 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ForkJoinPool;
 
 import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
+import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentName;
@@ -122,6 +133,8 @@ public class DomContent extends AbstractContent implements ProvidedContent {
 		for (int i = 0; i < attributes.getLength(); i++) {
 			Attr attr = (Attr) attributes.item(i);
 			QName key = toQName(attr);
+			if (key.getNamespaceURI().equals(XMLConstants.XMLNS_ATTRIBUTE_NS_URI))
+				continue;// skip prefix mapping
 			result.add(key);
 		}
 		return result;
@@ -139,7 +152,7 @@ public class DomContent extends AbstractContent implements ProvidedContent {
 			else
 				return Optional.empty();
 		} else
-			return null;
+			return Optional.empty();
 	}
 
 	@Override
@@ -331,6 +344,27 @@ public class DomContent extends AbstractContent implements ProvidedContent {
 		return super.write(clss);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public <C extends Closeable> C open(Class<C> clss) throws IOException, IllegalArgumentException {
+		if (InputStream.class.isAssignableFrom(clss)) {
+			PipedOutputStream out = new PipedOutputStream();
+			ForkJoinPool.commonPool().execute(() -> {
+				try {
+					Source source = new DOMSource(element);
+					Result result = new StreamResult(out);
+					provider.getTransformerFactory().newTransformer().transform(source, result);
+					out.flush();
+					out.close();
+				} catch (TransformerException | IOException e) {
+					throw new RuntimeException("Cannot read " + getPath(), e);
+				}
+			});
+			return (C) new PipedInputStream(out);
+		}
+		return super.open(clss);
+	}
+
 	@Override
 	public int getSiblingIndex() {
 		Node curr = element.getPreviousSibling();