X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FCmsContentSession.java;h=af7dca046ab636b014c7c601f0908ff3060661a6;hb=6d463a65d04d641c94a493579a75f8015c82097d;hp=318080509b02ab624e3bf18c3feb124a7f8817db;hpb=cc1dd97ebcc32e1bd754073ad23def182f460452;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java index 318080509..af7dca046 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java +++ b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java @@ -1,47 +1,65 @@ package org.argeo.cms.acr; -import java.util.Iterator; +import java.util.HashSet; import java.util.Locale; import java.util.Map; +import java.util.NavigableMap; import java.util.Set; -import java.util.TreeSet; +import java.util.Spliterator; +import java.util.TreeMap; +import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.function.Consumer; -import java.util.stream.Collectors; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; import javax.security.auth.Subject; import org.argeo.api.acr.Content; import org.argeo.api.acr.ContentSession; -import org.argeo.api.acr.NamespaceUtils; +import org.argeo.api.acr.DName; +import org.argeo.api.acr.search.BasicSearch; +import org.argeo.api.acr.search.BasicSearch.Scope; import org.argeo.api.acr.spi.ContentProvider; import org.argeo.api.acr.spi.ProvidedContent; import org.argeo.api.acr.spi.ProvidedRepository; import org.argeo.api.acr.spi.ProvidedSession; +import org.argeo.api.uuid.UuidFactory; import org.argeo.cms.acr.xml.DomContentProvider; /** Implements {@link ProvidedSession}. */ class CmsContentSession implements ProvidedSession { - final private CmsContentRepository contentRepository; + final private AbstractContentRepository contentRepository; + private final UUID uuid; private Subject subject; private Locale locale; + private UuidFactory uuidFactory; + private CompletableFuture closed = new CompletableFuture<>(); private CompletableFuture edition; - private Set modifiedProviders = new TreeSet<>(); + private Set modifiedProviders = new HashSet<>(); + + private Content sessionRunDir; - public CmsContentSession(CmsContentRepository contentRepository, Subject subject, Locale locale) { + public CmsContentSession(AbstractContentRepository contentRepository, UUID uuid, Subject subject, Locale locale, + UuidFactory uuidFactory) { this.contentRepository = contentRepository; this.subject = subject; this.locale = locale; + this.uuid = uuid; + this.uuidFactory = uuidFactory; } public void close() { closed.complete(this); + + if (sessionRunDir != null) + sessionRunDir.remove(); } @Override @@ -51,13 +69,30 @@ class CmsContentSession implements ProvidedSession { @Override public Content get(String path) { + if (!path.startsWith(ContentUtils.ROOT_SLASH)) + throw new IllegalArgumentException(path + " is not an absolute path"); ContentProvider contentProvider = contentRepository.getMountManager().findContentProvider(path); String mountPath = contentProvider.getMountPath(); + String relativePath = extractRelativePath(mountPath, path); + ProvidedContent content = contentProvider.get(CmsContentSession.this, relativePath); + return content; + } + + @Override + public boolean exists(String path) { + if (!path.startsWith(ContentUtils.ROOT_SLASH)) + throw new IllegalArgumentException(path + " is not an absolute path"); + ContentProvider contentProvider = contentRepository.getMountManager().findContentProvider(path); + String mountPath = contentProvider.getMountPath(); + String relativePath = extractRelativePath(mountPath, path); + return contentProvider.exists(this, relativePath); + } + + private String extractRelativePath(String mountPath, String path) { String relativePath = path.substring(mountPath.length()); if (relativePath.length() > 0 && relativePath.charAt(0) == '/') relativePath = relativePath.substring(1); - ProvidedContent content = contentProvider.get(CmsContentSession.this, mountPath, relativePath); - return content; + return relativePath; } @Override @@ -75,6 +110,10 @@ class CmsContentSession implements ProvidedSession { return contentRepository; } + public UuidFactory getUuidFactory() { + return uuidFactory; + } + /* * MOUNT MANAGEMENT */ @@ -87,34 +126,24 @@ class CmsContentSession implements ProvidedSession { } /* - * NAMESPACE CONTEXT + * EDITION */ - - @Override - public String getNamespaceURI(String prefix) { - return NamespaceUtils.getNamespaceURI((p) -> contentRepository.getTypesManager().getPrefixes().get(p), prefix); - } - - @Override - public Iterator getPrefixes(String namespaceURI) { - return NamespaceUtils.getPrefixes((ns) -> contentRepository.getTypesManager().getPrefixes().entrySet().stream() - .filter(e -> e.getValue().equals(ns)).map(Map.Entry::getKey).collect(Collectors.toUnmodifiableSet()), - namespaceURI); - } - @Override public CompletionStage edit(Consumer work) { edition = CompletableFuture.supplyAsync(() -> { work.accept(this); return this; }).thenApply((s) -> { - // TODO optimise - for (ContentProvider provider : modifiedProviders) { - if (provider instanceof DomContentProvider) { - ((DomContentProvider) provider).persist(s); + synchronized (CmsContentSession.this) { + // TODO optimise + for (ContentProvider provider : modifiedProviders) { + if (provider instanceof DomContentProvider) { + ((DomContentProvider) provider).persist(s); + } } + modifiedProviders.clear(); + return s; } - return s; }); return edition.minimalCompletionStage(); } @@ -125,29 +154,137 @@ class CmsContentSession implements ProvidedSession { } @Override - public void notifyModification(ProvidedContent content) { + public synchronized void notifyModification(ProvidedContent content) { ContentProvider contentProvider = content.getProvider(); modifiedProviders.add(contentProvider); } -// @Override -// public String findNamespace(String prefix) { -// return prefixes.get(prefix); -// } -// -// @Override -// public Set findPrefixes(String namespaceURI) { -// Set res = prefixes.entrySet().stream().filter(e -> e.getValue().equals(namespaceURI)) -// .map(Map.Entry::getKey).collect(Collectors.toUnmodifiableSet()); -// -// return res; -// } -// -// @Override -// public String findPrefix(String namespaceURI) { -// if (CrName.CR_NAMESPACE_URI.equals(namespaceURI) && prefixes.containsKey(CrName.CR_DEFAULT_PREFIX)) -// return CrName.CR_DEFAULT_PREFIX; -// return ProvidedSession.super.findPrefix(namespaceURI); -// } + @Override + public UUID getUuid() { + return uuid; + } + +// @Override + public Content getSessionRunDir() { + if (sessionRunDir == null) { + String runDirPath = CmsContentRepository.RUN_BASE + '/' + uuid.toString(); + if (exists(runDirPath)) + sessionRunDir = get(runDirPath); + else { + Content runDir = get(CmsContentRepository.RUN_BASE); + // TODO deal with no run dir available? + sessionRunDir = runDir.add(uuid.toString(), DName.collection.qName()); + } + } + return sessionRunDir; + } + + /* + * SEARCH + */ + @Override + public Stream search(Consumer search) { + BasicSearch s = new BasicSearch(); + search.accept(s); + NavigableMap searchPartitions = new TreeMap<>(); + for (Scope scope : s.getFrom()) { + String scopePath = scope.getUri().getPath(); + NavigableMap contentProviders = contentRepository.getMountManager() + .findContentProviders(scopePath); + for (Map.Entry contentProvider : contentProviders.entrySet()) { + // TODO deal with depth + String relPath; + if (scopePath.startsWith(contentProvider.getKey())) { + relPath = scopePath.substring(contentProvider.getKey().length()); + } else { + relPath = null; + } + SearchPartition searchPartition = new SearchPartition(s, relPath, contentProvider.getValue()); + searchPartitions.put(contentProvider.getKey(), searchPartition); + } + } + return StreamSupport.stream(new SearchPartitionsSpliterator(searchPartitions), true); + } + + class SearchPartition { + BasicSearch search; + String relPath; + ContentProvider contentProvider; + + public SearchPartition(BasicSearch search, String relPath, ContentProvider contentProvider) { + super(); + this.search = search; + this.relPath = relPath; + this.contentProvider = contentProvider; + } + + public BasicSearch getSearch() { + return search; + } + + public String getRelPath() { + return relPath; + } + + public ContentProvider getContentProvider() { + return contentProvider; + } + } + + class SearchPartitionsSpliterator implements Spliterator { + NavigableMap searchPartitions; + + Spliterator currentSpliterator; + + public SearchPartitionsSpliterator(NavigableMap searchPartitions) { + super(); + this.searchPartitions = searchPartitions; + SearchPartition searchPartition = searchPartitions.pollFirstEntry().getValue(); + currentSpliterator = searchPartition.getContentProvider().search(CmsContentSession.this, + searchPartition.getSearch(), searchPartition.getRelPath()); + } + + @Override + public boolean tryAdvance(Consumer action) { + boolean remaining = currentSpliterator.tryAdvance(action); + if (remaining) + return true; + if (searchPartitions.isEmpty()) + return false; + SearchPartition searchPartition = searchPartitions.pollFirstEntry().getValue(); + currentSpliterator = searchPartition.getContentProvider().search(CmsContentSession.this, + searchPartition.getSearch(), searchPartition.getRelPath()); + return true; + } + + @Override + public Spliterator trySplit() { + if (searchPartitions.isEmpty()) { + return null; + } else if (searchPartitions.size() == 1) { + NavigableMap newSearchPartitions = new TreeMap<>(searchPartitions); + searchPartitions.clear(); + return new SearchPartitionsSpliterator(newSearchPartitions); + } else { + NavigableMap newSearchPartitions = new TreeMap<>(); + for (int i = 0; i < searchPartitions.size() / 2; i++) { + Map.Entry searchPartition = searchPartitions.pollLastEntry(); + newSearchPartitions.put(searchPartition.getKey(), searchPartition.getValue()); + } + return new SearchPartitionsSpliterator(newSearchPartitions); + } + } + + @Override + public long estimateSize() { + return Long.MAX_VALUE; + } + + @Override + public int characteristics() { + return NONNULL; + } + + } } \ No newline at end of file