Improve JCR ACR search

[gpl/argeo-jcr.git] / org.argeo.cms.jcr / src / org / argeo / cms / jcr / acr / JcrContentProvider.java

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
index eaa27b7fc631d806fde1f1590c0eca142f786cd7..bc4aa5be418b33c966e87e95eb2a955bd2670996 100644 (file)
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
@@ -6,13 +6,21 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Spliterator;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryResult;
 import javax.xml.namespace.NamespaceContext;
 
 import org.argeo.api.acr.Content;
+import org.argeo.api.acr.search.BasicSearch;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
@@ -89,11 +97,24 @@ public class JcrContentProvider implements ContentProvider, NamespaceContext {
                return mountPath;
        }
 
+       public synchronized <T> T doInAdminSession(Function<Session, T> toDo) {
+               try {
+                       return toDo.apply(adminSession);
+               } finally {
+                       try {
+                               if (adminSession.hasPendingChanges())
+                                       adminSession.save();
+                       } catch (RepositoryException e) {
+                               throw new JcrException("Cannot save admin session", e);
+                       }
+               }
+       }
+
        /*
         * NAMESPACE CONTEXT
         */
        @Override
-       public String getNamespaceURI(String prefix) {
+       public synchronized String getNamespaceURI(String prefix) {
                try {
                        return adminSession.getNamespaceURI(prefix);
                } catch (RepositoryException e) {
@@ -102,7 +123,7 @@ public class JcrContentProvider implements ContentProvider, NamespaceContext {
        }
 
        @Override
-       public String getPrefix(String namespaceURI) {
+       public synchronized String getPrefix(String namespaceURI) {
                try {
                        return adminSession.getNamespacePrefix(namespaceURI);
                } catch (RepositoryException e) {
@@ -111,7 +132,7 @@ public class JcrContentProvider implements ContentProvider, NamespaceContext {
        }
 
        @Override
-       public Iterator<String> getPrefixes(String namespaceURI) {
+       public synchronized Iterator<String> getPrefixes(String namespaceURI) {
                try {
                        return Arrays.asList(adminSession.getNamespacePrefix(namespaceURI)).iterator();
                } catch (RepositoryException e) {
@@ -119,4 +140,63 @@ public class JcrContentProvider implements ContentProvider, NamespaceContext {
                }
        }
 
+       /*
+        * SEARCH
+        */
+
+       @Override
+       public Spliterator<Content> search(ProvidedSession session, BasicSearch search, String relPath) {
+               try {
+                       Session jcrSession = getJcrSession(session, jcrWorkspace);
+                       BasicSearchToQom jcrBasicSearch = new BasicSearchToQom(jcrSession, search, relPath);
+                       Query query = jcrBasicSearch.createQuery();
+                       QueryResult queryResult = query.execute();
+                       return new QueryResultSpliterator(session, queryResult.getNodes());
+               } catch (RepositoryException e) {
+                       throw new JcrException(e);
+               }
+       }
+
+       class QueryResultSpliterator implements Spliterator<Content> {
+               private ProvidedSession providedSession;
+               private NodeIterator nodeIterator;
+
+               public QueryResultSpliterator(ProvidedSession providedSession, NodeIterator nodeIterator) {
+                       super();
+                       this.providedSession = providedSession;
+                       this.nodeIterator = nodeIterator;
+               }
+
+               @Override
+               public boolean tryAdvance(Consumer<? super Content> action) {
+                       if (!nodeIterator.hasNext())
+                               return false;
+                       try {
+                               Node node = nodeIterator.nextNode();
+                               // TODO optimise by reusing the Node
+                               JcrContent jcrContent = new JcrContent(providedSession, JcrContentProvider.this, jcrWorkspace,
+                                               node.getPath());
+                               action.accept(jcrContent);
+                               return true;
+                       } catch (RepositoryException e) {
+                               throw new JcrException(e);
+                       }
+               }
+
+               @Override
+               public Spliterator<Content> trySplit() {
+                       return null;
+               }
+
+               @Override
+               public long estimateSize() {
+                       return nodeIterator.getSize();
+               }
+
+               @Override
+               public int characteristics() {
+                       return NONNULL | SIZED;
+               }
+
+       }
 }