Repository: curator Updated Branches: refs/heads/CURATOR-397 50b054cc6 -> 70936c8c4
Added readChildren() Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/70936c8c Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/70936c8c Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/70936c8c Branch: refs/heads/CURATOR-397 Commit: 70936c8c479558f737d3e86914af58d3855aa964 Parents: 50b054c Author: randgalt <[email protected]> Authored: Sun Apr 30 14:08:28 2017 -0500 Committer: randgalt <[email protected]> Committed: Sun Apr 30 14:08:28 2017 -0500 ---------------------------------------------------------------------- .../async/modeled/ModeledCuratorFramework.java | 11 +++++++++- .../details/ModeledCuratorFrameworkImpl.java | 22 ++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/70936c8c/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledCuratorFramework.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledCuratorFramework.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledCuratorFramework.java index f4eed45..f4def2b 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledCuratorFramework.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledCuratorFramework.java @@ -24,6 +24,7 @@ import org.apache.curator.framework.api.transaction.CuratorTransactionResult; import org.apache.curator.x.async.AsyncStage; import org.apache.zookeeper.data.Stat; import java.util.List; +import java.util.Map; public interface ModeledCuratorFramework<T> { @@ -154,7 +155,7 @@ public interface ModeledCuratorFramework<T> AsyncStage<Stat> checkExists(); /** - * Return the child paths of this instance's paths (in no particular order) + * Return the child paths of this instance's path (in no particular order) * * @return AsyncStage * @see org.apache.curator.x.async.AsyncStage @@ -162,6 +163,14 @@ public interface ModeledCuratorFramework<T> AsyncStage<List<ZPath>> getChildren(); /** + * Return the children of this instance's path + * + * @return AsyncStage + * @see org.apache.curator.x.async.AsyncStage + */ + AsyncStage<Map<ZPath, AsyncStage<T>>> readChildren(); + + /** * Create operation instance that can be passed among other operations to * {@link #inTransaction(java.util.List)} to be executed as a single transaction. Note: * due to ZooKeeper transaction limits, this is a _not_ a "set or update" operation but only http://git-wip-us.apache.org/repos/asf/curator/blob/70936c8c/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCuratorFrameworkImpl.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCuratorFrameworkImpl.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCuratorFrameworkImpl.java index 841c64f..c68f693 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCuratorFrameworkImpl.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCuratorFrameworkImpl.java @@ -40,6 +40,7 @@ import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.data.ACL; import org.apache.zookeeper.data.Stat; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; @@ -212,6 +213,27 @@ public class ModeledCuratorFrameworkImpl<T> implements ModeledCuratorFramework<T } @Override + public AsyncStage<Map<ZPath, AsyncStage<T>>> readChildren() + { + AsyncStage<List<String>> asyncStage = watchableClient.getChildren().forPath(modelSpec.path().fullPath()); + ModelStage<Map<ZPath, AsyncStage<T>>> modelStage = new ModelStage<>(asyncStage.event()); + asyncStage.whenComplete((children, e) -> { + if ( e != null ) + { + modelStage.completeExceptionally(e); + } + else + { + Map<ZPath, AsyncStage<T>> map = children + .stream() + .collect(Collectors.toMap(name -> modelSpec.path().at(name), name -> at(name).read())); + modelStage.complete(map); + } + }); + return modelStage; + } + + @Override public ModeledCuratorFramework<T> at(String child) { CuratorModelSpec<T> childModel = modelSpec.at(child);
