Improve edition
[gpl/argeo-jcr.git] / org.argeo.cms.jcr / src / org / argeo / cms / jcr / acr / JcrContent.java
index 2b7676adcc09e8c00785a5814a2a99176ea41d43..864fbfb7eb8efead51c7475d7b0ce8453ba15fc3 100644 (file)
@@ -37,7 +37,6 @@ import javax.xml.transform.stream.StreamSource;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.CrAttributeType;
 import org.argeo.api.acr.NamespaceUtils;
-import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.acr.AbstractContent;
@@ -48,8 +47,6 @@ import org.argeo.jcr.JcrUtils;
 
 /** A JCR {@link Node} accessed as {@link Content}. */
 public class JcrContent extends AbstractContent {
-//     private Node jcrNode;
-
        private JcrContentProvider provider;
 
        private String jcrWorkspace;
@@ -67,7 +64,7 @@ public class JcrContent extends AbstractContent {
        }
 
        /*
-        * READ/WRITE
+        * READ
         */
 
        @Override
@@ -85,9 +82,6 @@ public class JcrContent extends AbstractContent {
        @Override
        public <A> Optional<A> get(QName key, Class<A> clss) {
                Object value = get(getJcrNode(), key.toString());
-//             if (isDefaultAttrTypeRequested(clss)) {
-//                     return Optional.ofNullable((A) value);
-//             }
                return CrAttributeType.cast(clss, value);
        }
 
@@ -139,89 +133,6 @@ public class JcrContent extends AbstractContent {
                }
        }
 
-       static Object convertSingleValue(Value value) throws JcrException, IllegalArgumentException {
-               try {
-                       switch (value.getType()) {
-                       case PropertyType.STRING:
-                               return value.getString();
-                       case PropertyType.DOUBLE:
-                               return (Double) value.getDouble();
-                       case PropertyType.LONG:
-                               return (Long) value.getLong();
-                       case PropertyType.BOOLEAN:
-                               return (Boolean) value.getBoolean();
-                       case PropertyType.DATE:
-                               Calendar calendar = value.getDate();
-                               return calendar.toInstant();
-                       case PropertyType.BINARY:
-                               throw new IllegalArgumentException("Binary is not supported as an attribute");
-                       default:
-                               return value.getString();
-                       }
-               } catch (RepositoryException e) {
-                       throw new JcrException("Cannot convert " + value + " to an object.", e);
-               }
-       }
-
-       static Value convertSingleObject(ValueFactory factory, Object value) {
-               if (value instanceof String string) {
-                       return factory.createValue(string);
-               } else if (value instanceof Double dbl) {
-                       return factory.createValue(dbl);
-               } else if (value instanceof Float flt) {
-                       return factory.createValue(flt);
-               } else if (value instanceof Long lng) {
-                       return factory.createValue(lng);
-               } else if (value instanceof Integer intg) {
-                       return factory.createValue(intg);
-               } else if (value instanceof Boolean bool) {
-                       return factory.createValue(bool);
-               } else if (value instanceof Instant instant) {
-                       GregorianCalendar calendar = new GregorianCalendar();
-                       calendar.setTime(Date.from(instant));
-                       return factory.createValue(calendar);
-               } else {
-                       // TODO or use String by default?
-                       throw new IllegalArgumentException("Unsupported value " + value.getClass());
-               }
-       }
-
-       @Override
-       public Class<?> getType(QName key) {
-               Node node = getJcrNode();
-               String p = NamespaceUtils.toFullyQualified(key);
-               try {
-                       if (node.hasProperty(p)) {
-                               Property property = node.getProperty(p);
-                               return switch (property.getType()) {
-                               case PropertyType.STRING:
-                               case PropertyType.NAME:
-                               case PropertyType.PATH:
-                               case PropertyType.DECIMAL:
-                                       yield String.class;
-                               case PropertyType.LONG:
-                                       yield Long.class;
-                               case PropertyType.DOUBLE:
-                                       yield Double.class;
-                               case PropertyType.BOOLEAN:
-                                       yield Boolean.class;
-                               case PropertyType.DATE:
-                                       yield Instant.class;
-                               case PropertyType.WEAKREFERENCE:
-                               case PropertyType.REFERENCE:
-                                       yield UUID.class;
-                               default:
-                                       yield Object.class;
-                               };
-                       } else {
-                               // TODO does it make sense?
-                               return Object.class;
-                       }
-               } catch (RepositoryException e) {
-                       throw new JcrException("Cannot get type of property " + p + " of " + jcrPath + " in " + jcrWorkspace, e);
-               }
-       }
-
        @Override
        public boolean isMultiple(QName key) {
                Node node = getJcrNode();
@@ -239,35 +150,6 @@ public class JcrContent extends AbstractContent {
                }
        }
 
-       class JcrContentIterator implements Iterator<Content> {
-               private final NodeIterator nodeIterator;
-               // we keep track in order to be able to delete it
-               private JcrContent current = null;
-
-               protected JcrContentIterator(NodeIterator nodeIterator) {
-                       this.nodeIterator = nodeIterator;
-               }
-
-               @Override
-               public boolean hasNext() {
-                       return nodeIterator.hasNext();
-               }
-
-               @Override
-               public Content next() {
-                       current = new JcrContent(getSession(), provider, jcrWorkspace, Jcr.getPath(nodeIterator.nextNode()));
-                       return current;
-               }
-
-               @Override
-               public void remove() {
-                       if (current != null) {
-                               Jcr.remove(current.getJcrNode());
-                       }
-               }
-
-       }
-
        @Override
        public String getPath() {
                try {
@@ -302,11 +184,27 @@ public class JcrContent extends AbstractContent {
                return new JcrContent(getSession(), provider, jcrWorkspace, Jcr.getParentPath(getJcrNode()));
        }
 
+       @Override
+       public int getSiblingIndex() {
+               return Jcr.getIndex(getJcrNode());
+       }
+
+       /*
+        * WRITE
+        */
+
+       protected Node openForEdit() {
+               Node node = getProvider().openForEdit(getSession(), jcrWorkspace, jcrPath);
+               getSession().notifyModification(this);
+               return node;
+       }
+
        @Override
        public Content add(QName name, QName... classes) {
                if (classes.length > 0) {
                        QName primaryType = classes[0];
-                       Node child = Jcr.addNode(getJcrNode(), name.toString(), primaryType.toString());
+                       Node node = openForEdit();
+                       Node child = Jcr.addNode(node, name.toString(), primaryType.toString());
                        for (int i = 1; i < classes.length; i++) {
                                try {
                                        child.addMixin(classes[i].toString());
@@ -323,12 +221,14 @@ public class JcrContent extends AbstractContent {
 
        @Override
        public void remove() {
-               Jcr.remove(getJcrNode());
+               Node node = openForEdit();
+               Jcr.remove(node);
        }
 
        @Override
        protected void removeAttr(QName key) {
-               Property property = Jcr.getProperty(getJcrNode(), key.toString());
+               Node node = openForEdit();
+               Property property = Jcr.getProperty(node, key.toString());
                if (property != null) {
                        try {
                                property.remove();
@@ -343,12 +243,12 @@ public class JcrContent extends AbstractContent {
        public Object put(QName key, Object value) {
                try {
                        String property = NamespaceUtils.toFullyQualified(key);
-                       Node node = getJcrNode();
+                       Node node = openForEdit();
                        Object old = null;
                        if (node.hasProperty(property)) {
                                old = convertSingleValue(node.getProperty(property).getValue());
                        }
-                       Value newValue = convertSingleObject(getJcrSession().getValueFactory(), value);
+                       Value newValue = convertSingleObject(node.getSession().getValueFactory(), value);
                        node.setProperty(property, newValue);
                        // FIXME proper edition
                        node.getSession().save();
@@ -358,6 +258,29 @@ public class JcrContent extends AbstractContent {
                }
        }
 
+       @Override
+       public void addContentClasses(QName... contentClass) throws IllegalArgumentException, JcrException {
+               try {
+                       Node node = openForEdit();
+                       NodeTypeManager ntm = node.getSession().getWorkspace().getNodeTypeManager();
+                       List<NodeType> nodeTypes = new ArrayList<>();
+                       for (QName clss : contentClass) {
+                               NodeType nodeType = ntm.getNodeType(NamespaceUtils.toFullyQualified(clss));
+                               if (!nodeType.isMixin())
+                                       throw new IllegalArgumentException(clss + " is not a mixin");
+                               nodeTypes.add(nodeType);
+                       }
+                       for (NodeType nodeType : nodeTypes) {
+                               node.addMixin(nodeType.getName());
+                       }
+                       // FIXME proper edition
+                       node.getSession().save();
+               } catch (RepositoryException e) {
+                       throw new JcrException(
+                                       "Cannot add content classes " + contentClass + " to " + jcrPath + " in " + jcrWorkspace, e);
+               }
+       }
+
        /*
         * ACCESS
         */
@@ -435,7 +358,7 @@ public class JcrContent extends AbstractContent {
        }
 
        @Override
-       public ContentProvider getProvider() {
+       public JcrContentProvider getProvider() {
                return provider;
        }
 
@@ -451,16 +374,93 @@ public class JcrContent extends AbstractContent {
        /*
         * TYPING
         */
+
+       static Object convertSingleValue(Value value) throws JcrException, IllegalArgumentException {
+               try {
+                       switch (value.getType()) {
+                       case PropertyType.STRING:
+                               return value.getString();
+                       case PropertyType.DOUBLE:
+                               return (Double) value.getDouble();
+                       case PropertyType.LONG:
+                               return (Long) value.getLong();
+                       case PropertyType.BOOLEAN:
+                               return (Boolean) value.getBoolean();
+                       case PropertyType.DATE:
+                               Calendar calendar = value.getDate();
+                               return calendar.toInstant();
+                       case PropertyType.BINARY:
+                               throw new IllegalArgumentException("Binary is not supported as an attribute");
+                       default:
+                               return value.getString();
+                       }
+               } catch (RepositoryException e) {
+                       throw new JcrException("Cannot convert " + value + " to an object.", e);
+               }
+       }
+
+       static Value convertSingleObject(ValueFactory factory, Object value) {
+               if (value instanceof String string) {
+                       return factory.createValue(string);
+               } else if (value instanceof Double dbl) {
+                       return factory.createValue(dbl);
+               } else if (value instanceof Float flt) {
+                       return factory.createValue(flt);
+               } else if (value instanceof Long lng) {
+                       return factory.createValue(lng);
+               } else if (value instanceof Integer intg) {
+                       return factory.createValue(intg);
+               } else if (value instanceof Boolean bool) {
+                       return factory.createValue(bool);
+               } else if (value instanceof Instant instant) {
+                       GregorianCalendar calendar = new GregorianCalendar();
+                       calendar.setTime(Date.from(instant));
+                       return factory.createValue(calendar);
+               } else {
+                       // TODO or use String by default?
+                       throw new IllegalArgumentException("Unsupported value " + value.getClass());
+               }
+       }
+
+       @Override
+       public Class<?> getType(QName key) {
+               Node node = getJcrNode();
+               String p = NamespaceUtils.toFullyQualified(key);
+               try {
+                       if (node.hasProperty(p)) {
+                               Property property = node.getProperty(p);
+                               return switch (property.getType()) {
+                               case PropertyType.STRING:
+                               case PropertyType.NAME:
+                               case PropertyType.PATH:
+                               case PropertyType.DECIMAL:
+                                       yield String.class;
+                               case PropertyType.LONG:
+                                       yield Long.class;
+                               case PropertyType.DOUBLE:
+                                       yield Double.class;
+                               case PropertyType.BOOLEAN:
+                                       yield Boolean.class;
+                               case PropertyType.DATE:
+                                       yield Instant.class;
+                               case PropertyType.WEAKREFERENCE:
+                               case PropertyType.REFERENCE:
+                                       yield UUID.class;
+                               default:
+                                       yield Object.class;
+                               };
+                       } else {
+                               // TODO does it make sense?
+                               return Object.class;
+                       }
+               } catch (RepositoryException e) {
+                       throw new JcrException("Cannot get type of property " + p + " of " + jcrPath + " in " + jcrWorkspace, e);
+               }
+       }
+
        @Override
        public List<QName> getContentClasses() {
                try {
-//                     Node node = getJcrNode();
-//                     List<QName> res = new ArrayList<>();
-//                     res.add(nodeTypeToQName(node.getPrimaryNodeType()));
-//                     for (NodeType mixin : node.getMixinNodeTypes()) {
-//                             res.add(nodeTypeToQName(mixin));
-//                     }
-//                     return res;
                        Node context = getJcrNode();
 
                        List<QName> res = new ArrayList<>();
@@ -481,15 +481,6 @@ public class JcrContent extends AbstractContent {
                                        secondaryTypes.add(nodeTypeToQName(superType));
                                }
                        }
-//             // entity type
-//             if (context.isNodeType(EntityType.entity.get())) {
-//                     if (context.hasProperty(EntityNames.ENTITY_TYPE)) {
-//                             String entityTypeName = context.getProperty(EntityNames.ENTITY_TYPE).getString();
-//                             if (byType.containsKey(entityTypeName)) {
-//                                     types.add(entityTypeName);
-//                             }
-//                     }
-//             }
                        res.addAll(secondaryTypes);
                        return res;
                } catch (RepositoryException e) {
@@ -503,34 +494,6 @@ public class JcrContent extends AbstractContent {
                // return QName.valueOf(name);
        }
 
-       @Override
-       public void addContentClasses(QName... contentClass) throws IllegalArgumentException, JcrException {
-               try {
-                       NodeTypeManager ntm = getJcrSession().getWorkspace().getNodeTypeManager();
-                       List<NodeType> nodeTypes = new ArrayList<>();
-                       for (QName clss : contentClass) {
-                               NodeType nodeType = ntm.getNodeType(NamespaceUtils.toFullyQualified(clss));
-                               if (!nodeType.isMixin())
-                                       throw new IllegalArgumentException(clss + " is not a mixin");
-                               nodeTypes.add(nodeType);
-                       }
-                       Node node = getJcrNode();
-                       for (NodeType nodeType : nodeTypes) {
-                               node.addMixin(nodeType.getName());
-                       }
-                       // FIXME proper edition
-                       node.getSession().save();
-               } catch (RepositoryException e) {
-                       throw new JcrException(
-                                       "Cannot add content classes " + contentClass + " to " + jcrPath + " in " + jcrWorkspace, e);
-               }
-       }
-
-       @Override
-       public int getSiblingIndex() {
-               return Jcr.getIndex(getJcrNode());
-       }
-
        /*
         * COMMON UTILITIES
         */
@@ -565,4 +528,37 @@ public class JcrContent extends AbstractContent {
                }
        }
 
+       /*
+        * CONTENT ITERATOR
+        */
+
+       class JcrContentIterator implements Iterator<Content> {
+               private final NodeIterator nodeIterator;
+               // we keep track in order to be able to delete it
+               private JcrContent current = null;
+
+               protected JcrContentIterator(NodeIterator nodeIterator) {
+                       this.nodeIterator = nodeIterator;
+               }
+
+               @Override
+               public boolean hasNext() {
+                       return nodeIterator.hasNext();
+               }
+
+               @Override
+               public Content next() {
+                       current = new JcrContent(getSession(), provider, jcrWorkspace, Jcr.getPath(nodeIterator.nextNode()));
+                       return current;
+               }
+
+               @Override
+               public void remove() {
+                       if (current != null) {
+                               Jcr.remove(current.getJcrNode());
+                       }
+               }
+
+       }
+
 }