Added list()
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/55df07e6 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/55df07e6 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/55df07e6 Branch: refs/heads/CURATOR-397 Commit: 55df07e6ab5417943d485e88f7efa89df0b6e52d Parents: f32a5fb Author: randgalt <[email protected]> Authored: Fri Jun 9 23:55:20 2017 -0500 Committer: randgalt <[email protected]> Committed: Fri Jun 9 23:55:20 2017 -0500 ---------------------------------------------------------------------- .../x/async/modeled/cached/CachedModeledFramework.java | 8 ++++++++ .../modeled/details/CachedModeledFrameworkImpl.java | 12 ++++++++++++ .../x/async/modeled/details/ModeledCacheImpl.java | 9 ++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/55df07e6/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/cached/CachedModeledFramework.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/cached/CachedModeledFramework.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/cached/CachedModeledFramework.java index f0d1d1b..8ab5e8b 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/cached/CachedModeledFramework.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/cached/CachedModeledFramework.java @@ -25,6 +25,7 @@ import org.apache.curator.x.async.modeled.ZNode; import org.apache.curator.x.async.modeled.ZPath; import org.apache.zookeeper.data.Stat; import java.io.Closeable; +import java.util.List; public interface CachedModeledFramework<T> extends ModeledFramework<T>, Closeable { @@ -103,4 +104,11 @@ public interface CachedModeledFramework<T> extends ModeledFramework<T>, Closeabl * @see org.apache.curator.x.async.AsyncStage */ AsyncStage<ZNode<T>> readThroughAsZNode(); + + /** + * Return the instances of the base path of this cached framework + * + * @return listing of all models in the base path + */ + AsyncStage<List<T>> list(); } http://git-wip-us.apache.org/repos/asf/curator/blob/55df07e6/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/CachedModeledFrameworkImpl.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/CachedModeledFrameworkImpl.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/CachedModeledFrameworkImpl.java index 3893f47..4884af4 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/CachedModeledFrameworkImpl.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/CachedModeledFrameworkImpl.java @@ -42,6 +42,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.function.Function; import java.util.function.Supplier; +import java.util.stream.Collectors; class CachedModeledFrameworkImpl<T> implements CachedModeledFramework<T> { @@ -208,6 +209,17 @@ class CachedModeledFrameworkImpl<T> implements CachedModeledFramework<T> } @Override + public AsyncStage<List<T>> list() + { + List<T> children = cache.currentChildren() + .values() + .stream() + .map(ZNode::model) + .collect(Collectors.toList()); + return asyncDefaultMode ? ModelStage.asyncCompleted(children, executor) : ModelStage.completed(children); + } + + @Override public AsyncStage<Stat> update(T model) { return client.update(model); http://git-wip-us.apache.org/repos/asf/curator/blob/55df07e6/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCacheImpl.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCacheImpl.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCacheImpl.java index 415e015..466c5e9 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCacheImpl.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCacheImpl.java @@ -46,6 +46,7 @@ class ModeledCacheImpl<T> implements TreeCacheListener, ModeledCache<T> private final Map<ZPath, Entry<T>> entries = new ConcurrentHashMap<>(); private final ModelSerializer<T> serializer; private final ListenerContainer<ModeledCacheListener<T>> listenerContainer = new ListenerContainer<>(); + private final ZPath basePath; private static final class Entry<T> { @@ -66,8 +67,9 @@ class ModeledCacheImpl<T> implements TreeCacheListener, ModeledCache<T> modelSpec = modelSpec.parent(); // i.e. the last item is a parameter } + basePath = modelSpec.path(); this.serializer = modelSpec.serializer(); - cache = TreeCache.newBuilder(client, modelSpec.path().fullPath()) + cache = TreeCache.newBuilder(client, basePath.fullPath()) .setCacheData(false) .setDataIsCompressed(modelSpec.createOptions().contains(CreateOption.compress)) .setExecutor(executor) @@ -106,6 +108,11 @@ class ModeledCacheImpl<T> implements TreeCacheListener, ModeledCache<T> return Optional.empty(); } + Map<ZPath, ZNode<T>> currentChildren() + { + return currentChildren(basePath); + } + @Override public Map<ZPath, ZNode<T>> currentChildren(ZPath path) {
