watched() should be in the Dsl interface

Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/3876d3ee
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3876d3ee
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/3876d3ee

Branch: refs/heads/CURATOR-3.0
Commit: 3876d3eebe50aaadef71e5d32f425fad622513a0
Parents: b813fb3
Author: randgalt <randg...@apache.org>
Authored: Sat Jan 7 14:50:59 2017 -0500
Committer: randgalt <randg...@apache.org>
Committed: Sat Jan 7 14:50:59 2017 -0500

----------------------------------------------------------------------
 .../curator/x/async/AsyncCuratorFramework.java  | 23 -------------------
 .../x/async/api/AsyncCuratorFrameworkDsl.java   | 24 ++++++++++++++++++++
 .../src/site/confluence/index.confluence        |  2 +-
 3 files changed, 25 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/3876d3ee/curator-x-async/src/main/java/org/apache/curator/x/async/AsyncCuratorFramework.java
----------------------------------------------------------------------
diff --git 
a/curator-x-async/src/main/java/org/apache/curator/x/async/AsyncCuratorFramework.java
 
b/curator-x-async/src/main/java/org/apache/curator/x/async/AsyncCuratorFramework.java
index 9b29918..91784b0 100644
--- 
a/curator-x-async/src/main/java/org/apache/curator/x/async/AsyncCuratorFramework.java
+++ 
b/curator-x-async/src/main/java/org/apache/curator/x/async/AsyncCuratorFramework.java
@@ -53,29 +53,6 @@ public interface AsyncCuratorFramework extends 
AsyncCuratorFrameworkDsl
     CuratorFramework unwrap();
 
     /**
-     * <p>
-     * Returns a facade that adds watching to any of the subsequently created 
builders. i.e. all
-     * operations on the WatchableAsyncCuratorFramework facade will have 
watchers set. Also,
-     * the {@link org.apache.curator.x.async.AsyncStage} returned from these 
builders will
-     * have a loaded staged watcher that is accessed from {@link 
org.apache.curator.x.async.AsyncStage#event()}
-     * </p>
-     *
-     * <p>
-     * {@link WatchMode#stateChangeAndSuccess} is used
-     * </p>
-     *
-     * @return watcher facade
-     */
-    WatchableAsyncCuratorFramework watched();
-
-    /**
-     * Same as {@link #watched()} but allows specifying the watch mode
-     *
-     * @return watcher facade
-     */
-    WatchableAsyncCuratorFramework watched(WatchMode mode);
-
-    /**
      * Returns a facade that adds the given UnhandledErrorListener to all 
background operations
      *
      * @param listener lister to use

http://git-wip-us.apache.org/repos/asf/curator/blob/3876d3ee/curator-x-async/src/main/java/org/apache/curator/x/async/api/AsyncCuratorFrameworkDsl.java
----------------------------------------------------------------------
diff --git 
a/curator-x-async/src/main/java/org/apache/curator/x/async/api/AsyncCuratorFrameworkDsl.java
 
b/curator-x-async/src/main/java/org/apache/curator/x/async/api/AsyncCuratorFrameworkDsl.java
index 3a15079..a8151cd 100644
--- 
a/curator-x-async/src/main/java/org/apache/curator/x/async/api/AsyncCuratorFrameworkDsl.java
+++ 
b/curator-x-async/src/main/java/org/apache/curator/x/async/api/AsyncCuratorFrameworkDsl.java
@@ -19,6 +19,7 @@
 package org.apache.curator.x.async.api;
 
 import org.apache.curator.framework.api.transaction.CuratorOp;
+import org.apache.curator.x.async.WatchMode;
 
 /**
  * Zookeeper framework-style client
@@ -26,6 +27,29 @@ import 
org.apache.curator.framework.api.transaction.CuratorOp;
 public interface AsyncCuratorFrameworkDsl extends 
WatchableAsyncCuratorFramework
 {
     /**
+     * <p>
+     * Returns a facade that adds watching to any of the subsequently created 
builders. i.e. all
+     * operations on the WatchableAsyncCuratorFramework facade will have 
watchers set. Also,
+     * the {@link org.apache.curator.x.async.AsyncStage} returned from these 
builders will
+     * have a loaded staged watcher that is accessed from {@link 
org.apache.curator.x.async.AsyncStage#event()}
+     * </p>
+     *
+     * <p>
+     * {@link org.apache.curator.x.async.WatchMode#stateChangeAndSuccess} is 
used
+     * </p>
+     *
+     * @return watcher facade
+     */
+    WatchableAsyncCuratorFramework watched();
+
+    /**
+     * Same as {@link #watched()} but allows specifying the watch mode
+     *
+     * @return watcher facade
+     */
+    WatchableAsyncCuratorFramework watched(WatchMode mode);
+
+    /**
      * Start a create builder
      *
      * @return builder object

http://git-wip-us.apache.org/repos/asf/curator/blob/3876d3ee/curator-x-async/src/site/confluence/index.confluence
----------------------------------------------------------------------
diff --git a/curator-x-async/src/site/confluence/index.confluence 
b/curator-x-async/src/site/confluence/index.confluence
index 9c02e8e..757acc8 100644
--- a/curator-x-async/src/site/confluence/index.confluence
+++ b/curator-x-async/src/site/confluence/index.confluence
@@ -157,7 +157,7 @@ stage.thenAccept(data -> processData(data));
 
 ----
 
-CompletionStage provides a block method as well so that you can block to get 
the result
+CompletionStage provides a blocking method as well so that you can block to 
get the result
 of an operation. i.e. this makes it possible to use the async APIs in a 
synchronous way.
 
 {code}

Reply via email to