X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fxml%2FDomContent.java;h=0686be7cb59b2cf63d034fc8331a1d1884e39f08;hb=8eca27d220993fd99f954f382c2ad9a7435e3682;hp=b4931220b2b8077979ab172f0ee5de53915fba6f;hpb=eb4cc3db3bf141c229f0f7ff929daff108bee6d2;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 b4931220b..0686be7cb 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,33 +1,53 @@
package org.argeo.cms.acr.xml;
+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;
import java.util.Iterator;
+import java.util.List;
+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.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;
+import org.argeo.api.acr.CrAttributeType;
+import org.argeo.api.acr.CrName;
import org.argeo.api.acr.spi.ProvidedContent;
import org.argeo.api.acr.spi.ProvidedSession;
import org.argeo.cms.acr.AbstractContent;
import org.argeo.cms.acr.ContentUtils;
import org.w3c.dom.Attr;
+import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
+/** Content persisted as a DOM element. */
public class DomContent extends AbstractContent implements ProvidedContent {
- private final ProvidedSession session;
private final DomContentProvider provider;
private final Element element;
@@ -35,7 +55,7 @@ public class DomContent extends AbstractContent implements ProvidedContent {
private Boolean hasText = null;
public DomContent(ProvidedSession session, DomContentProvider contentProvider, Element element) {
- this.session = session;
+ super(session);
this.provider = contentProvider;
this.element = element;
}
@@ -46,16 +66,24 @@ public class DomContent extends AbstractContent implements ProvidedContent {
@Override
public QName getName() {
- if (element.getParentNode() == null) {// root
+ if (isLocalRoot()) {// root
String mountPath = provider.getMountPath();
if (mountPath != null) {
- Content mountPoint = session.getMountPoint(mountPath);
- return mountPoint.getName();
+ if (Content.ROOT_PATH.equals(mountPath)) {
+ return CrName.root.qName();
+ }
+ Content mountPoint = getSession().getMountPoint(mountPath);
+ QName mountPointName = mountPoint.getName();
+ return mountPointName;
}
}
return toQName(this.element);
}
+ protected boolean isLocalRoot() {
+ return element.getParentNode() == null || element.getParentNode() instanceof Document;
+ }
+
protected QName toQName(Node node) {
String prefix = node.getPrefix();
if (prefix == null) {
@@ -103,24 +131,25 @@ 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;
}
- @SuppressWarnings("unchecked")
+// @SuppressWarnings("unchecked")
@Override
public Optional get(QName key, Class clss) {
String namespaceUriOrNull = XMLConstants.NULL_NS_URI.equals(key.getNamespaceURI()) ? null
: key.getNamespaceURI();
if (element.hasAttributeNS(namespaceUriOrNull, key.getLocalPart())) {
String value = element.getAttributeNS(namespaceUriOrNull, key.getLocalPart());
- if (clss.isAssignableFrom(String.class))
- return Optional.of((A) value);
- else
- return Optional.empty();
+// if (isDefaultAttrTypeRequested(clss))
+// return Optional.of((A) CrAttributeType.parse(value));
+ return CrAttributeType.cast(clss, value);
} else
- return null;
+ return Optional.empty();
}
@Override
@@ -128,12 +157,31 @@ public class DomContent extends AbstractContent implements ProvidedContent {
Object previous = get(key);
String namespaceUriOrNull = XMLConstants.NULL_NS_URI.equals(key.getNamespaceURI()) ? null
: key.getNamespaceURI();
+ String prefixToUse = registerPrefixIfNeeded(key);
element.setAttributeNS(namespaceUriOrNull,
- namespaceUriOrNull == null ? key.getLocalPart() : key.getPrefix() + ":" + key.getLocalPart(),
+ namespaceUriOrNull == null ? key.getLocalPart() : prefixToUse + ":" + key.getLocalPart(),
value.toString());
return previous;
}
+ protected String registerPrefixIfNeeded(QName name) {
+ String namespaceUriOrNull = XMLConstants.NULL_NS_URI.equals(name.getNamespaceURI()) ? null
+ : name.getNamespaceURI();
+ String prefixToUse;
+ if (namespaceUriOrNull != null) {
+ String registeredPrefix = provider.getPrefix(namespaceUriOrNull);
+ if (registeredPrefix != null) {
+ prefixToUse = registeredPrefix;
+ } else {
+ provider.registerPrefix(name.getPrefix(), namespaceUriOrNull);
+ prefixToUse = name.getPrefix();
+ }
+ } else {
+ prefixToUse = null;
+ }
+ return prefixToUse;
+ }
+
@Override
public boolean hasText() {
// return element instanceof Text;
@@ -178,21 +226,24 @@ public class DomContent extends AbstractContent implements ProvidedContent {
@Override
public Iterator iterator() {
NodeList nodeList = element.getChildNodes();
- return new ElementIterator(this, session, provider, nodeList);
+ return new ElementIterator(this, getSession(), provider, nodeList);
}
@Override
public Content getParent() {
Node parentNode = element.getParentNode();
- if (parentNode == null) {
+ if (isLocalRoot()) {
String mountPath = provider.getMountPath();
if (mountPath == null)
return null;
+ if (Content.ROOT_PATH.equals(mountPath)) {
+ return null;
+ }
String[] parent = ContentUtils.getParentPath(mountPath);
- return session.get(parent[0]);
+ if (ContentUtils.EMPTY.equals(parent[0]))
+ return null;
+ return getSession().get(parent[0]);
}
- if (parentNode instanceof Document)
- return null;
if (!(parentNode instanceof Element))
throw new IllegalStateException("Parent is not an element");
return new DomContent(this, (Element) parentNode);
@@ -204,8 +255,9 @@ public class DomContent extends AbstractContent implements ProvidedContent {
Document document = this.element.getOwnerDocument();
String namespaceUriOrNull = XMLConstants.NULL_NS_URI.equals(name.getNamespaceURI()) ? null
: name.getNamespaceURI();
+ String prefixToUse = registerPrefixIfNeeded(name);
Element child = document.createElementNS(namespaceUriOrNull,
- namespaceUriOrNull == null ? name.getLocalPart() : name.getPrefix() + ":" + name.getLocalPart());
+ namespaceUriOrNull == null ? name.getLocalPart() : prefixToUse + ":" + name.getLocalPart());
element.appendChild(child);
return new DomContent(this, child);
}
@@ -226,28 +278,141 @@ public class DomContent extends AbstractContent implements ProvidedContent {
}
+ @SuppressWarnings("unchecked")
@Override
public A adapt(Class clss) throws IllegalArgumentException {
if (CharBuffer.class.isAssignableFrom(clss)) {
String textContent = element.getTextContent();
CharBuffer buf = CharBuffer.wrap(textContent);
return (A) buf;
+ } else if (Source.class.isAssignableFrom(clss)) {
+ DOMSource source = new DOMSource(element);
+ return (A) source;
}
return super.adapt(clss);
}
+ @SuppressWarnings("unchecked")
public CompletableFuture write(Class clss) {
if (String.class.isAssignableFrom(clss)) {
CompletableFuture res = new CompletableFuture<>();
res.thenAccept((s) -> {
- session.notifyModification(this);
+ getSession().notifyModification(this);
element.setTextContent(s);
});
return (CompletableFuture) res;
+ } else if (Source.class.isAssignableFrom(clss)) {
+ CompletableFuture