[10/18] curator git commit: More tests, refined tests and doc

[randgalt]

More tests, refined tests and doc


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

Branch: refs/heads/CURATOR-426
Commit: 89182ed11a8f6ff4fa5ec9cc955ff68241076f5d
Parents: d1a6507
Author: randgalt 
Authored: Thu Jul 20 13:40:30 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 13:40:30 2017 -0500

--
 .../framework/imps/CreateBuilderImpl.java   |   2 +
 .../framework/imps/CuratorFrameworkImpl.java|   3 +
 .../framework/imps/WatcherRemovalManager.java   |   5 +
 .../java/org/apache/curator/test/DummyTest.java |  30 --
 .../apache/curator/test/TestCompatibility.java  |  97 +++
 src/site/confluence/compatibility.confluence|  53 --
 src/site/confluence/index.confluence|  22 ++---
 src/site/resources/images/arrow.png | Bin 0 -> 2159 bytes
 src/site/site.xml   |   7 +-
 9 files changed, 164 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/89182ed1/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
index 1487d6b..11050f3 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
@@ -20,6 +20,7 @@
 package org.apache.curator.framework.imps;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import org.apache.curator.RetryLoop;
@@ -119,6 +120,7 @@ public class CreateBuilderImpl implements CreateBuilder, 
CreateBuilder2, Backgro
 @Override
 public CreateBuilderMain withTtl(long ttl)
 {
+Preconditions.checkState(!client.isZk34CompatibilityMode(), "TTLs are 
not support when running in ZooKeeper 3.4 compatibility mode");
 this.ttl = ttl;
 return this;
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/89182ed1/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
index 00adb3e..d58c56b 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
@@ -472,12 +472,14 @@ public class CuratorFrameworkImpl implements 
CuratorFramework
 @Override
 public ReconfigBuilder reconfig()
 {
+Preconditions.checkState(!isZk34CompatibilityMode(), "reconfig/config 
APIs are not support when running in ZooKeeper 3.4 compatibility mode");
 return new ReconfigBuilderImpl(this);
 }
 
 @Override
 public GetConfigBuilder getConfig()
 {
+Preconditions.checkState(!isZk34CompatibilityMode(), "reconfig/config 
APIs are not support when running in ZooKeeper 3.4 compatibility mode");
 return new GetConfigBuilderImpl(this);
 }
 
@@ -542,6 +544,7 @@ public class CuratorFrameworkImpl implements 
CuratorFramework
 @Override
 public RemoveWatchesBuilder watches()
 {
+Preconditions.checkState(!isZk34CompatibilityMode(), "Remove watches 
APIs are not support when running in ZooKeeper 3.4 compatibility mode");
 return new RemoveWatchesBuilderImpl(this);
 }
 

http://git-wip-us.apache.org/repos/asf/curator/blob/89182ed1/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalManager.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalManager.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalManager.java
index b85675b..bdb5428 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalManager.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalManager.java
@@ -53,6 +53,11 @@ public class WatcherRemovalManager
 
 void 

[05/18] curator git commit: TestTreeCache now uses the improved KillSession2 but that results in different event ordering

[randgalt]

TestTreeCache now uses the improved KillSession2 but that results in different 
event ordering


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

Branch: refs/heads/CURATOR-426
Commit: 097083c4a2cd2e252c6f3b57e3e837e4a9ecabc9
Parents: 242b701
Author: randgalt 
Authored: Thu Jul 20 10:53:52 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 10:53:52 2017 -0500

--
 .../org/apache/curator/framework/recipes/cache/TestTreeCache.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/097083c4/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
index 409cc48..a53627a 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
@@ -424,11 +424,10 @@ public class TestTreeCache extends BaseTestTreeCache
 assertEvent(TreeCacheEvent.Type.NODE_ADDED, "/test/me");
 
 KillSession2.kill(client.getZookeeperClient().getZooKeeper());
-assertEvent(TreeCacheEvent.Type.CONNECTION_SUSPENDED);
 assertEvent(TreeCacheEvent.Type.CONNECTION_LOST);
 assertEvent(TreeCacheEvent.Type.CONNECTION_RECONNECTED);
-assertEvent(TreeCacheEvent.Type.NODE_REMOVED, "/test/me", 
"data".getBytes());
 assertEvent(TreeCacheEvent.Type.INITIALIZED);
+assertEvent(TreeCacheEvent.Type.NODE_REMOVED, "/test/me", 
"data".getBytes());
 
 assertNoMoreEvents();
 }

[08/18] curator git commit: license

[randgalt]

license


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

Branch: refs/heads/CURATOR-426
Commit: 6b6f13f74afa0fe3d8752224c1af82c2709e7f6b
Parents: 96340af
Author: randgalt 
Authored: Thu Jul 20 12:17:50 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 12:17:50 2017 -0500

--
 .../java/org/apache/curator/test/DummyTest.java   | 18 ++
 1 file changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/6b6f13f7/curator-test-zk34/src/test/java/org/apache/curator/test/DummyTest.java
--
diff --git 
a/curator-test-zk34/src/test/java/org/apache/curator/test/DummyTest.java 
b/curator-test-zk34/src/test/java/org/apache/curator/test/DummyTest.java
index 2f6afa8..f19a85b 100644
--- a/curator-test-zk34/src/test/java/org/apache/curator/test/DummyTest.java
+++ b/curator-test-zk34/src/test/java/org/apache/curator/test/DummyTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.curator.test;
 
 import org.testng.annotations.Test;

[18/18] curator git commit: Merge branch 'master' into CURATOR-426

[randgalt]

Merge branch 'master' into CURATOR-426


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

Branch: refs/heads/CURATOR-426
Commit: 31d7f9a2040975dee08cb685d61cceb7015f9e32
Parents: 0906eb5 afc206c
Author: randgalt 
Authored: Fri Jul 21 14:27:07 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 14:27:07 2017 -0500

--
 .../main/java/org/apache/curator/RetryLoop.java |   2 +-
 .../org/apache/curator/utils/Compatibility.java |  76 +
 .../curator/utils/InjectSessionExpiration.java  | 107 +++
 .../java/org/apache/curator/BasicTests.java |   4 +-
 .../curator/TestSessionFailRetryLoop.java   |  11 +-
 .../curator/framework/CuratorFramework.java |   7 +
 .../framework/CuratorFrameworkFactory.java  |  24 +-
 .../apache/curator/framework/SafeIsTtlMode.java |  44 +++
 .../imps/CompatibleCreateCallback.java  |  26 ++
 .../framework/imps/CreateBuilderImpl.java   | 136 ++---
 .../curator/framework/imps/CreateZK35.java  |  47 +++
 .../framework/imps/CuratorFrameworkImpl.java|  24 +-
 .../imps/CuratorMultiTransactionImpl.java   |  18 +-
 .../framework/imps/WatcherRemovalManager.java   |   7 +-
 .../framework/state/ConnectionStateManager.java |   6 +-
 .../curator/framework/imps/TestCleanState.java  |   7 +
 .../framework/imps/TestCreateReturningStat.java |  13 +-
 .../imps/TestEnabledSessionExpiredState.java|   8 +-
 .../curator/framework/imps/TestFramework.java   |   3 +-
 .../framework/imps/TestFrameworkEdges.java  |  13 +-
 .../framework/imps/TestReconfiguration.java |  11 +-
 .../framework/imps/TestRemoveWatches.java   |   6 +-
 .../curator/framework/imps/TestTtlNodes.java|   6 +-
 .../imps/TestWatcherRemovalManager.java |   6 +-
 curator-recipes/pom.xml |  16 +
 .../framework/recipes/nodes/PersistentNode.java |   3 +-
 .../recipes/cache/TestEventOrdering.java|   4 +-
 .../framework/recipes/cache/TestNodeCache.java  |   4 +-
 .../recipes/cache/TestPathChildrenCache.java|   4 +-
 .../framework/recipes/cache/TestTreeCache.java  |   7 +-
 .../recipes/leader/TestLeaderLatch.java |   3 +-
 .../recipes/leader/TestLeaderSelector.java  |   9 +-
 .../recipes/locks/TestInterProcessMutex.java|   5 +-
 .../locks/TestInterProcessMutexBase.java|  17 +-
 .../nodes/TestPersistentEphemeralNode.java  |  14 +-
 .../recipes/nodes/TestPersistentNode.java   |   3 +-
 .../recipes/nodes/TestPersistentTtlNode.java|   6 +-
 .../recipes/shared/TestSharedCount.java |   6 +-
 curator-test-zk34/README.md |  11 +
 curator-test-zk34/pom.xml   | 191 
 .../org/apache/curator/test/Compatibility.java  |  35 +++
 .../apache/curator/test/TestCompatibility.java  |  97 ++
 .../src/test/resources/log4j.properties |  27 ++
 .../org/apache/curator/test/Compatibility.java  |  34 +++
 .../apache/curator/test/KillServerSession.java  | 122 
 .../org/apache/curator/test/KillSession.java|  67 -
 .../java/org/apache/curator/test/Timing.java|  75 +
 .../test/compatibility/CuratorTestBase.java |  28 ++
 .../test/compatibility/KillSession2.java|  40 +++
 .../curator/test/compatibility/Timing2.java | 299 +++
 .../compatibility/Zk35MethodInterceptor.java|  56 
 .../x/async/CompletableBaseClassForTests.java   |   4 +-
 .../discovery/details/TestServiceDiscovery.java |   8 +-
 pom.xml |   8 +
 src/site/resources/images/arrow.png | Bin 0 -> 2159 bytes
 src/site/site.xml   |   5 +-
 56 files changed, 1427 insertions(+), 393 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/31d7f9a2/curator-recipes/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/31d7f9a2/pom.xml
--

http://git-wip-us.apache.org/repos/asf/curator/blob/31d7f9a2/src/site/site.xml
--

[15/18] curator git commit: Merge branch 'master' into CURATOR-425

[randgalt]

Merge branch 'master' into CURATOR-425


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

Branch: refs/heads/CURATOR-426
Commit: 63f83104d8b7fc086ad92ba166ce58e1897646be
Parents: 334950f 840b434
Author: randgalt 
Authored: Fri Jul 21 12:49:39 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 12:49:39 2017 -0500

--
 .../server/jetty_resteasy/TestStringsWithRestEasy.java |  6 +++---
 pom.xml| 13 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/63f83104/pom.xml
--

[17/18] curator git commit: more doc tweaks

[randgalt]

more doc tweaks


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

Branch: refs/heads/CURATOR-426
Commit: 0906eb539d6b5aa3ad65bf7413f5c955288758b8
Parents: 46ce6b7
Author: randgalt 
Authored: Fri Jul 21 14:24:56 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 14:24:56 2017 -0500

--
 src/site/confluence/compatibility.confluence | 53 ---
 src/site/site.xml|  2 +-
 2 files changed, 47 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/0906eb53/src/site/confluence/compatibility.confluence
--
diff --git a/src/site/confluence/compatibility.confluence 
b/src/site/confluence/compatibility.confluence
index ef3324f..4103bf2 100644
--- a/src/site/confluence/compatibility.confluence
+++ b/src/site/confluence/compatibility.confluence
@@ -1,9 +1,48 @@
-h1. API Compatibility
+h1. ZooKeeper Version Compatibility
 
-A [[Clirr|http://clirr.sourceforge.net/]] report is generated for each Curator 
module:
+While ZooKeeper 3.5.x is still considered "beta" by the ZooKeeper development 
team, the reality is that it is
+used in production by many users. However, ZooKeeper 3.4.x is also used in 
production. Prior to Apache Curator
+4.0, both versions of ZooKeeper were supported via two versions of Apache 
Curator. Starting with Curator 4.0
+both versions of ZooKeeper are supported via the same Curator libraries.
+
+h2. ZooKeeper 3.5.x
+
+* Curator 4.0 has a hard dependency on ZooKeeper 3.5.x
+* If you are using ZooKeeper 3.5.x there's nothing additional to do \- just 
use Curator 4.0
+
+h2. ZooKeeper 3.4.x
+
+Curator 4.0 supports ZooKeeper 3.4.x ensembles in a soft\-compatibility mode. 
To use this mode
+you must exclude ZooKeeper when adding Curator to your dependency management 
tool.
+
+_Maven_
+
+{code}
+
+org.apache.curator
+curator-recipes
+${curator-version}
+
+
+org.apache.zookeeper
+zookeeper
+
+
+
+{code}
+
+_Gradle_
+
+{code}
+compile('org.apache.curator:curator-recipes:$curatorVersion') {
+  exclude('org.apache.zookeeper:zookeeper')
+}
+{code}
+
+You must add a dependency on ZooKeeper 3.4.x also.
+
+Curator will detect which ZooKeeper library is in use and automatically set 
ZooKeeper 3.4 compatibility
+mode as needed. In this mode, all features not supported by 3.4 are disabled. 
It is up to your
+application code to "do the right thing" and not use these features. Use the 
{{isZk34CompatibilityMode()}}
+method to determine which mode Curator is using at runtime.
 
-* [[Curator Client Report|curator-client/clirr-report.html]]
-* [[Curator Framework Report|curator-framework/clirr-report.html]]
-* [[Curator Recipes Report|curator-recipes/clirr-report.html]]
-* [[Curator Discovery Report|curator-x-discovery/clirr-report.html]]
-* [[Curator Discovery Server 
Report|curator-x-discovery-server/clirr-report.html]]

http://git-wip-us.apache.org/repos/asf/curator/blob/0906eb53/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index d78b5b7..8bff322 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -39,7 +39,7 @@
 
 ApacheCurator
 true
-true
+false
 
 
 ${project.url}

[01/18] curator git commit: initial work on ZooKeeper 3.4.x compatibility mode

[randgalt]

Repository: curator
Updated Branches:
  refs/heads/CURATOR-426 46ce6b7ae -> 31d7f9a20


initial work on ZooKeeper 3.4.x compatibility mode


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

Branch: refs/heads/CURATOR-426
Commit: 0641243f75d25a92a9ceb811e8e2611a1e95869e
Parents: 7e611bd
Author: randgalt 
Authored: Wed Jul 19 12:36:24 2017 -0500
Committer: randgalt 
Committed: Wed Jul 19 12:36:24 2017 -0500

--
 .../main/java/org/apache/curator/RetryLoop.java |   2 +-
 .../curator/framework/CuratorFramework.java |   7 +
 .../framework/CuratorFrameworkFactory.java  |  50 +++-
 .../apache/curator/framework/SafeIsTtlMode.java |  43 +++
 .../imps/CompatibleCreateCallback.java  |  26 
 .../framework/imps/CreateBuilderImpl.java   | 125 --
 .../curator/framework/imps/CreateZK35.java  |  47 +++
 .../framework/imps/CuratorFrameworkImpl.java|  21 ++-
 .../framework/imps/WatcherRemovalManager.java   |   2 +-
 .../framework/imps/TestFrameworkEdges.java  |   5 +-
 curator-recipes/pom.xml |  16 +++
 .../framework/recipes/nodes/PersistentNode.java |   3 +-
 curator-test-zk34/pom.xml   | 127 +++
 .../curator/framework/imps/TestCleanState.java  |  25 
 .../src/test/resources/log4j.properties |  27 
 pom.xml |   8 ++
 16 files changed, 483 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/0641243f/curator-client/src/main/java/org/apache/curator/RetryLoop.java
--
diff --git a/curator-client/src/main/java/org/apache/curator/RetryLoop.java 
b/curator-client/src/main/java/org/apache/curator/RetryLoop.java
index 2ea6f97..51df662 100644
--- a/curator-client/src/main/java/org/apache/curator/RetryLoop.java
+++ b/curator-client/src/main/java/org/apache/curator/RetryLoop.java
@@ -136,7 +136,7 @@ public class RetryLoop
 (rc == KeeperException.Code.OPERATIONTIMEOUT.intValue()) ||
 (rc == KeeperException.Code.SESSIONMOVED.intValue()) ||
 (rc == KeeperException.Code.SESSIONEXPIRED.intValue()) ||
-(rc == KeeperException.Code.NEWCONFIGNOQUORUM.intValue());
+(rc == -13); // KeeperException.Code.NEWCONFIGNOQUORUM.intValue()) 
- using hard coded value for ZK 3.4.x compatibility
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/curator/blob/0641243f/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
index 4135e82..bf6167c 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
@@ -324,4 +324,11 @@ public interface CuratorFramework extends Closeable
  * @return schema set
  */
 SchemaSet getSchemaSet();
+
+/**
+ * Return true if this instance is running in ZK 3.4.x compatibility mode
+ *
+ * @return true/false
+ */
+boolean isZk34CompatibilityMode();
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/0641243f/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
index 915aee1..5ce7762 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
@@ -35,15 +35,16 @@ import 
org.apache.curator.framework.imps.CuratorTempFrameworkImpl;
 import org.apache.curator.framework.imps.DefaultACLProvider;
 import org.apache.curator.framework.imps.GzipCompressionProvider;
 import org.apache.curator.framework.schema.SchemaSet;
+import org.apache.curator.framework.state.ConnectionState;
 import org.apache.curator.framework.state.ConnectionStateErrorPolicy;
 import org.apache.curator.framework.state.StandardConnectionStateErrorPolicy;
-import org.apache.curator.framework.state.ConnectionState;
 import 

[06/18] curator git commit: Added some missing deps, fixed some of the tests for zk 3.4 compat and new KillSession, added a SDummyTest to make Maven happy

[randgalt]

Added some missing deps, fixed some of the tests for zk 3.4 compat and new 
KillSession, added a SDummyTest to make Maven happy


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

Branch: refs/heads/CURATOR-426
Commit: 20a3db363273429cec80f511a32a737886c6f3c8
Parents: 097083c
Author: randgalt 
Authored: Thu Jul 20 11:04:51 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 11:04:51 2017 -0500

--
 .../recipes/locks/TestInterProcessMutexBase.java| 10 +-
 .../framework/recipes/nodes/TestPersistentTtlNode.java  |  6 --
 curator-test-zk34/pom.xml   | 12 
 .../test/java/org/apache/curator/test/DummyTest.java| 12 
 4 files changed, 37 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/20a3db36/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
index 40c9144..cf44daf 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
@@ -33,6 +33,7 @@ import org.apache.curator.test.Timing;
 import org.apache.curator.test.compatibility.Timing2;
 import org.apache.curator.utils.CloseableUtils;
 import org.apache.curator.utils.ZKPaths;
+import org.apache.zookeeper.KeeperException;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import java.util.List;
@@ -128,7 +129,14 @@ public abstract class TestInterProcessMutexBase extends 
BaseClassForTests
 }
 finally
 {
-lock.release();
+try
+{
+lock.release();
+}
+catch ( 
KeeperException.SessionExpiredException dummy )
+{
+// happens sometimes with a few tests - 
ignore
+}
 }
 return result;
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/20a3db36/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentTtlNode.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentTtlNode.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentTtlNode.java
index 573a867..7bca01f 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentTtlNode.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentTtlNode.java
@@ -24,8 +24,9 @@ import 
org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
 import org.apache.curator.retry.RetryOneTime;
-import org.apache.curator.test.BaseClassForTests;
 import org.apache.curator.test.Timing;
+import org.apache.curator.test.compatibility.CuratorTestBase;
+import org.apache.curator.test.compatibility.Zk35MethodInterceptor;
 import org.apache.curator.utils.ZKPaths;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
@@ -36,7 +37,8 @@ import java.util.concurrent.TimeUnit;
 
 import static 
org.apache.curator.framework.recipes.cache.PathChildrenCache.StartMode.BUILD_INITIAL_CACHE;
 
-public class TestPersistentTtlNode extends BaseClassForTests
+@Test(groups = Zk35MethodInterceptor.zk35Group)
+public class TestPersistentTtlNode extends CuratorTestBase
 {
 private final Timing timing = new Timing();
 private final long ttlMs = timing.multiple(.10).milliseconds(); // a small 
number

http://git-wip-us.apache.org/repos/asf/curator/blob/20a3db36/curator-test-zk34/pom.xml
--
diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml
index d4101b0..ba38571 

[11/18] curator git commit: Add Curator RPC Proxy back - I'll remove it in the Issue/PR for that purpose

[randgalt]

Add Curator RPC Proxy back - I'll remove it in the Issue/PR for that purpose


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

Branch: refs/heads/CURATOR-426
Commit: a21c31c59c5209bda75ad853bcf657c85753e99d
Parents: 89182ed
Author: randgalt 
Authored: Thu Jul 20 13:47:08 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 13:47:08 2017 -0500

--
 src/site/site.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/a21c31c5/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index e5ae374..469e76a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -102,6 +102,7 @@
 
 
 
+
 
 
 

[09/18] curator git commit: read me

[randgalt]

read me


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

Branch: refs/heads/CURATOR-426
Commit: d1a650715ab955758369ff2db123bd97577cf826
Parents: 6b6f13f
Author: randgalt 
Authored: Thu Jul 20 12:35:49 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 12:35:49 2017 -0500

--
 curator-test-zk34/README.md | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/d1a65071/curator-test-zk34/README.md
--
diff --git a/curator-test-zk34/README.md b/curator-test-zk34/README.md
new file mode 100644
index 000..3615c0b
--- /dev/null
+++ b/curator-test-zk34/README.md
@@ -0,0 +1,11 @@
+# ZooKeeper 3.4 Compatibility
+
+Apache Curator 4.0 adds best-effort backward compatibility for ZooKeeper 3.4 
ensembles and the ZooKeeper 3.4 library/JAR. This module, `curator-test-zk34`, 
exists to run the standard Curator tests using ZooKeeper 3.4. It does this via 
Maven. In the curator-test-zk34 pom.xml:
+
+- The Curator modules framework and recipes libraries are included - both main 
and test JARs - but the ZooKeeper dependency is excluded (otherwise ZooKeeper 
3.5.x would be brought in)
+- The curator-test module is included but as version 2.12.0 which brings in 
ZooKeeper 3.4.8
+- The maven-surefire-plugin is configured to run the framework and recipes 
tests
+- The current version of the curator-test module includes new methods that 
didn't exist in version 2.12.0 in `Timing.java` and `KillSession.java`. 
Therefore, these classes are now soft-deprecated, reverted to their original 
implementations and there are new classes with the new methods: `Timing2.java` 
and `KillSession2.java`
+- A new test base class `CuratorTestBase` is started. Over time more common 
stuff should go in here but, for now, this defines a TestNG listener, 
Zk35MethodInterceptor, that allows for tests that are ZooKeeper 3.5 only to be 
marked by `@Test(groups = Zk35MethodInterceptor.zk35Group)`. These tests will 
not be run during the 3.4 compatibility check.
+- curator-test-zk34 needs some of the new classes from curator-test. Rather 
than have copies of the classes the maven-resources-plugin is used to copy from 
curator-test to the generated sources dir of curator-test-zk34. All classes in 
`curator-test/src/main/java/org/apache/curator/test/compatibility` are copied.
+

[12/18] curator git commit: Adding @Test to the class caused testApiPermutations to run. So, added a disabled Test annotation to it

[randgalt]

Adding @Test to the class caused testApiPermutations to run. So, added a 
disabled Test annotation to it


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

Branch: refs/heads/CURATOR-426
Commit: aa976bbe83a8961b33f76aa5b0a7302a3b5f8f39
Parents: a21c31c
Author: randgalt 
Authored: Thu Jul 20 17:36:10 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 17:36:10 2017 -0500

--
 .../org/apache/curator/framework/imps/TestReconfiguration.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/aa976bbe/curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
--
diff --git 
a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
 
b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
index acf9df3..c6ff2bb 100644
--- 
a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
+++ 
b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
@@ -27,10 +27,10 @@ import org.apache.curator.framework.api.BackgroundCallback;
 import org.apache.curator.framework.api.CuratorEvent;
 import org.apache.curator.framework.api.CuratorEventType;
 import org.apache.curator.retry.ExponentialBackoffRetry;
-import org.apache.curator.test.compatibility.CuratorTestBase;
 import org.apache.curator.test.InstanceSpec;
 import org.apache.curator.test.TestingCluster;
 import org.apache.curator.test.TestingZooKeeperServer;
+import org.apache.curator.test.compatibility.CuratorTestBase;
 import org.apache.curator.test.compatibility.Timing2;
 import org.apache.curator.test.compatibility.Zk35MethodInterceptor;
 import org.apache.curator.utils.CloseableUtils;
@@ -94,6 +94,7 @@ public class TestReconfiguration extends CuratorTestBase
 }
 
 @SuppressWarnings("ConstantConditions")
+@Test(enabled = false)
 public void testApiPermutations() throws Exception
 {
 // not an actual test. Specifies all possible API possibilities

[14/16] curator git commit: Merge branch 'master' into CURATOR-425

[randgalt]

Merge branch 'master' into CURATOR-425


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

Branch: refs/heads/master
Commit: 334950f6188fe646a4588fd5aafd46e1525686d2
Parents: 1eb8aa8 95b70d2
Author: randgalt 
Authored: Fri Jul 21 12:02:03 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 12:02:03 2017 -0500

--
 curator-x-rpc/pom.xml   |   189 -
 .../curator/x/rpc/CuratorProjectionServer.java  |   152 -
 .../AuthorizationConfiguration.java |45 -
 ...dedExponentialBackoffRetryConfiguration.java |69 -
 .../x/rpc/configuration/Configuration.java  |86 -
 .../rpc/configuration/ConfigurationBuilder.java |87 -
 .../configuration/ConnectionConfiguration.java  |   129 -
 .../ExponentialBackoffRetryConfiguration.java   |58 -
 .../configuration/RetryNTimesConfiguration.java |58 -
 .../configuration/RetryPolicyConfiguration.java |28 -
 .../curator/x/rpc/connections/Closer.java   |24 -
 .../x/rpc/connections/ConnectionManager.java|   141 -
 .../curator/x/rpc/connections/CuratorEntry.java |   170 -
 .../x/rpc/details/RpcBackgroundCallback.java|44 -
 .../curator/x/rpc/details/RpcWatcher.java   |43 -
 .../x/rpc/idl/discovery/DiscoveryInstance.java  |95 -
 .../idl/discovery/DiscoveryInstanceType.java|26 -
 .../rpc/idl/discovery/DiscoveryProjection.java  |38 -
 .../discovery/DiscoveryProviderProjection.java  |38 -
 .../x/rpc/idl/discovery/DiscoveryService.java   |   259 -
 .../idl/discovery/DiscoveryServiceLowLevel.java |   159 -
 .../rpc/idl/discovery/ProviderStrategyType.java |27 -
 .../x/rpc/idl/exceptions/ExceptionType.java |26 -
 .../x/rpc/idl/exceptions/NodeExceptionType.java |27 -
 .../x/rpc/idl/exceptions/RpcException.java  |98 -
 .../idl/exceptions/ZooKeeperExceptionType.java  |40 -
 .../idl/services/CuratorProjectionService.java  |   765 -
 .../x/rpc/idl/services/EventService.java|55 -
 .../curator/x/rpc/idl/structs/CreateSpec.java   |66 -
 .../x/rpc/idl/structs/CuratorProjection.java|38 -
 .../curator/x/rpc/idl/structs/DeleteSpec.java   |50 -
 .../curator/x/rpc/idl/structs/ExistsSpec.java   |46 -
 .../x/rpc/idl/structs/GetChildrenSpec.java  |46 -
 .../curator/x/rpc/idl/structs/GetDataSpec.java  |50 -
 .../curator/x/rpc/idl/structs/LeaderEvent.java  |46 -
 .../x/rpc/idl/structs/LeaderProjection.java |38 -
 .../curator/x/rpc/idl/structs/LeaderResult.java |42 -
 .../x/rpc/idl/structs/LeaseProjection.java  |38 -
 .../x/rpc/idl/structs/LockProjection.java   |38 -
 .../x/rpc/idl/structs/NodeCacheProjection.java  |38 -
 .../x/rpc/idl/structs/OptionalChildrenList.java |39 -
 .../curator/x/rpc/idl/structs/OptionalData.java |38 -
 .../rpc/idl/structs/OptionalLockProjection.java |38 -
 .../curator/x/rpc/idl/structs/OptionalPath.java |38 -
 .../x/rpc/idl/structs/OptionalRpcStat.java  |38 -
 .../structs/PathChildrenCacheProjection.java|38 -
 .../idl/structs/PathChildrenCacheStartMode.java |26 -
 .../PersistentEphemeralNodeProjection.java  |38 -
 .../curator/x/rpc/idl/structs/RpcAcl.java   |42 -
 .../curator/x/rpc/idl/structs/RpcChildData.java |57 -
 .../x/rpc/idl/structs/RpcCreateMode.java|31 -
 .../x/rpc/idl/structs/RpcCuratorEvent.java  |   224 -
 .../x/rpc/idl/structs/RpcCuratorEventType.java  |46 -
 .../curator/x/rpc/idl/structs/RpcEventType.java |31 -
 .../apache/curator/x/rpc/idl/structs/RpcId.java |42 -
 .../x/rpc/idl/structs/RpcKeeperState.java   |34 -
 .../x/rpc/idl/structs/RpcParticipant.java   |42 -
 .../idl/structs/RpcPathChildrenCacheEvent.java  |54 -
 .../structs/RpcPathChildrenCacheEventType.java  |33 -
 .../structs/RpcPersistentEphemeralNodeMode.java |30 -
 .../curator/x/rpc/idl/structs/RpcStat.java  |95 -
 .../x/rpc/idl/structs/RpcWatchedEvent.java  |54 -
 .../curator/x/rpc/idl/structs/SetDataSpec.java  |58 -
 .../curator/x/rpc/idl/structs/Version.java  |38 -
 .../src/main/resources/curator/help.txt |72 -
 curator-x-rpc/src/main/scripts/apply-thrift.sh  |36 -
 curator-x-rpc/src/main/scripts/generate.sh  |56 -
 curator-x-rpc/src/main/thrift/curator.thrift|   297 -
 .../site/confluence/configuration.confluence|   143 -
 .../src/site/confluence/deploy.confluence   |31 -
 .../src/site/confluence/events.confluence   |90 -
 .../src/site/confluence/index.confluence|49 -
 .../src/site/confluence/reference.confluence|   120 -
 .../src/site/confluence/usage.confluence   

[02/16] curator git commit: Basic concept of zk 3.4.x compatibility proven. The Compatibility class checks for a well-known 3.5 class and sets a static that advertises whether the ZK lib is 3.4.x or 3

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/58bc969f/curator-test/src/main/java/org/apache/curator/test/KillSession.java
--
diff --git 
a/curator-test/src/main/java/org/apache/curator/test/KillSession.java 
b/curator-test/src/main/java/org/apache/curator/test/KillSession.java
deleted file mode 100644
index ce2b7e6..000
--- a/curator-test/src/main/java/org/apache/curator/test/KillSession.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.curator.test;
-
-import org.apache.zookeeper.ZooKeeper;
-
-/**
- * 
- * Utility to simulate a ZK session dying.
- * 
- */
-public class KillSession
-{
-/**
- * Kill the given ZK session
- *
- * @param client the client to kill
- * @since 3.0.0
- */
-public static void kill(ZooKeeper client)
-{
-client.getTestable().injectSessionExpiration();
-}
-
-/**
- * Kill the given ZK session
- *
- * @param client the client to kill
- * @param connectString server connection string
- * @throws Exception errors
- * @deprecated use {@link #kill(ZooKeeper)} instead
- */
-public static void kill(ZooKeeper client, String connectString) throws 
Exception
-{
-kill(client);
-}
-
-/**
- * Kill the given ZK session
- *
- * @param client the client to kill
- * @param connectString server connection string
- * @param maxMs max time ms to wait for kill
- * @throws Exception errors
- * @deprecated use {@link #kill(ZooKeeper)} instead
- */
-public static void kill(ZooKeeper client, String connectString, int 
maxMs) throws Exception
-{
-kill(client);
-}
-}

http://git-wip-us.apache.org/repos/asf/curator/blob/58bc969f/curator-test/src/main/java/org/apache/curator/test/Timing.java
--
diff --git a/curator-test/src/main/java/org/apache/curator/test/Timing.java 
b/curator-test/src/main/java/org/apache/curator/test/Timing.java
index 242aa50..f29b1c5 100644
--- a/curator-test/src/main/java/org/apache/curator/test/Timing.java
+++ b/curator-test/src/main/java/org/apache/curator/test/Timing.java
@@ -19,11 +19,9 @@
 
 package org.apache.curator.test;
 
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 /**
  * Utility to get various testing times
@@ -36,8 +34,7 @@ public class Timing
 
 private static final int DEFAULT_SECONDS = 10;
 private static final int DEFAULT_WAITING_MULTIPLE = 5;
-private static final double SESSION_MULTIPLE = 1.5;
-private static final double SESSION_SLEEP_MULTIPLE = SESSION_MULTIPLE * 
1.75;  // has to be at least session + 2/3 of a session to account for missed 
heartbeat then session expiration
+private static final double SESSION_MULTIPLE = .25;
 
 /**
  * Use the default base time
@@ -130,32 +127,6 @@ public class Timing
 }
 
 /**
- * Try to take an item from the given queue
- *
- * @param queue queue
- * @return item
- * @throws Exception interrupted or timed out
- */
-public  T takeFromQueue(BlockingQueue queue) throws Exception
-{
-Timing m = forWaiting();
-try
-{
-T value = queue.poll(m.value, m.unit);
-if ( value == null )
-{
-throw new TimeoutException("Timed out trying to take from 
queue");
-}
-return value;
-}
-catch ( InterruptedException e )
-{
-Thread.currentThread().interrupt();
-throw e;
-}
-}
-
-/**
  * Wait on the given semaphore
  *
  * @param semaphore the semaphore
@@ -208,18 +179,6 @@ public class Timing
 }
 
 /**
- * Return a new timing that is a multiple of the this timing
- *
- * @param n the multiple
- * @param waitingMultiple new waitingMultiple
- * @return this timing times the multiple
- */
-   

[10/16] curator git commit: More tests, refined tests and doc

[randgalt]

More tests, refined tests and doc


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

Branch: refs/heads/master
Commit: 89182ed11a8f6ff4fa5ec9cc955ff68241076f5d
Parents: d1a6507
Author: randgalt 
Authored: Thu Jul 20 13:40:30 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 13:40:30 2017 -0500

--
 .../framework/imps/CreateBuilderImpl.java   |   2 +
 .../framework/imps/CuratorFrameworkImpl.java|   3 +
 .../framework/imps/WatcherRemovalManager.java   |   5 +
 .../java/org/apache/curator/test/DummyTest.java |  30 --
 .../apache/curator/test/TestCompatibility.java  |  97 +++
 src/site/confluence/compatibility.confluence|  53 --
 src/site/confluence/index.confluence|  22 ++---
 src/site/resources/images/arrow.png | Bin 0 -> 2159 bytes
 src/site/site.xml   |   7 +-
 9 files changed, 164 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/89182ed1/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
index 1487d6b..11050f3 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java
@@ -20,6 +20,7 @@
 package org.apache.curator.framework.imps;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import org.apache.curator.RetryLoop;
@@ -119,6 +120,7 @@ public class CreateBuilderImpl implements CreateBuilder, 
CreateBuilder2, Backgro
 @Override
 public CreateBuilderMain withTtl(long ttl)
 {
+Preconditions.checkState(!client.isZk34CompatibilityMode(), "TTLs are 
not support when running in ZooKeeper 3.4 compatibility mode");
 this.ttl = ttl;
 return this;
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/89182ed1/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
index 00adb3e..d58c56b 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
@@ -472,12 +472,14 @@ public class CuratorFrameworkImpl implements 
CuratorFramework
 @Override
 public ReconfigBuilder reconfig()
 {
+Preconditions.checkState(!isZk34CompatibilityMode(), "reconfig/config 
APIs are not support when running in ZooKeeper 3.4 compatibility mode");
 return new ReconfigBuilderImpl(this);
 }
 
 @Override
 public GetConfigBuilder getConfig()
 {
+Preconditions.checkState(!isZk34CompatibilityMode(), "reconfig/config 
APIs are not support when running in ZooKeeper 3.4 compatibility mode");
 return new GetConfigBuilderImpl(this);
 }
 
@@ -542,6 +544,7 @@ public class CuratorFrameworkImpl implements 
CuratorFramework
 @Override
 public RemoveWatchesBuilder watches()
 {
+Preconditions.checkState(!isZk34CompatibilityMode(), "Remove watches 
APIs are not support when running in ZooKeeper 3.4 compatibility mode");
 return new RemoveWatchesBuilderImpl(this);
 }
 

http://git-wip-us.apache.org/repos/asf/curator/blob/89182ed1/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalManager.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalManager.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalManager.java
index b85675b..bdb5428 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalManager.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/imps/WatcherRemovalManager.java
@@ -53,6 +53,11 @@ public class WatcherRemovalManager
 
 void 

[15/16] curator git commit: Merge branch 'master' into CURATOR-425

[randgalt]

Merge branch 'master' into CURATOR-425


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

Branch: refs/heads/master
Commit: 63f83104d8b7fc086ad92ba166ce58e1897646be
Parents: 334950f 840b434
Author: randgalt 
Authored: Fri Jul 21 12:49:39 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 12:49:39 2017 -0500

--
 .../server/jetty_resteasy/TestStringsWithRestEasy.java |  6 +++---
 pom.xml| 13 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/63f83104/pom.xml
--

[11/16] curator git commit: Add Curator RPC Proxy back - I'll remove it in the Issue/PR for that purpose

[randgalt]

Add Curator RPC Proxy back - I'll remove it in the Issue/PR for that purpose


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

Branch: refs/heads/master
Commit: a21c31c59c5209bda75ad853bcf657c85753e99d
Parents: 89182ed
Author: randgalt 
Authored: Thu Jul 20 13:47:08 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 13:47:08 2017 -0500

--
 src/site/site.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/a21c31c5/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index e5ae374..469e76a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -102,6 +102,7 @@
 
 
 
+
 
 
 

[06/16] curator git commit: Added some missing deps, fixed some of the tests for zk 3.4 compat and new KillSession, added a SDummyTest to make Maven happy

[randgalt]

Added some missing deps, fixed some of the tests for zk 3.4 compat and new 
KillSession, added a SDummyTest to make Maven happy


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

Branch: refs/heads/master
Commit: 20a3db363273429cec80f511a32a737886c6f3c8
Parents: 097083c
Author: randgalt 
Authored: Thu Jul 20 11:04:51 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 11:04:51 2017 -0500

--
 .../recipes/locks/TestInterProcessMutexBase.java| 10 +-
 .../framework/recipes/nodes/TestPersistentTtlNode.java  |  6 --
 curator-test-zk34/pom.xml   | 12 
 .../test/java/org/apache/curator/test/DummyTest.java| 12 
 4 files changed, 37 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/20a3db36/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
index 40c9144..cf44daf 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
@@ -33,6 +33,7 @@ import org.apache.curator.test.Timing;
 import org.apache.curator.test.compatibility.Timing2;
 import org.apache.curator.utils.CloseableUtils;
 import org.apache.curator.utils.ZKPaths;
+import org.apache.zookeeper.KeeperException;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import java.util.List;
@@ -128,7 +129,14 @@ public abstract class TestInterProcessMutexBase extends 
BaseClassForTests
 }
 finally
 {
-lock.release();
+try
+{
+lock.release();
+}
+catch ( 
KeeperException.SessionExpiredException dummy )
+{
+// happens sometimes with a few tests - 
ignore
+}
 }
 return result;
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/20a3db36/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentTtlNode.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentTtlNode.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentTtlNode.java
index 573a867..7bca01f 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentTtlNode.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentTtlNode.java
@@ -24,8 +24,9 @@ import 
org.apache.curator.framework.recipes.cache.PathChildrenCache;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
 import org.apache.curator.retry.RetryOneTime;
-import org.apache.curator.test.BaseClassForTests;
 import org.apache.curator.test.Timing;
+import org.apache.curator.test.compatibility.CuratorTestBase;
+import org.apache.curator.test.compatibility.Zk35MethodInterceptor;
 import org.apache.curator.utils.ZKPaths;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
@@ -36,7 +37,8 @@ import java.util.concurrent.TimeUnit;
 
 import static 
org.apache.curator.framework.recipes.cache.PathChildrenCache.StartMode.BUILD_INITIAL_CACHE;
 
-public class TestPersistentTtlNode extends BaseClassForTests
+@Test(groups = Zk35MethodInterceptor.zk35Group)
+public class TestPersistentTtlNode extends CuratorTestBase
 {
 private final Timing timing = new Timing();
 private final long ttlMs = timing.multiple(.10).milliseconds(); // a small 
number

http://git-wip-us.apache.org/repos/asf/curator/blob/20a3db36/curator-test-zk34/pom.xml
--
diff --git a/curator-test-zk34/pom.xml b/curator-test-zk34/pom.xml
index d4101b0..ba38571 100644

[09/16] curator git commit: read me

[randgalt]

read me


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

Branch: refs/heads/master
Commit: d1a650715ab955758369ff2db123bd97577cf826
Parents: 6b6f13f
Author: randgalt 
Authored: Thu Jul 20 12:35:49 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 12:35:49 2017 -0500

--
 curator-test-zk34/README.md | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/d1a65071/curator-test-zk34/README.md
--
diff --git a/curator-test-zk34/README.md b/curator-test-zk34/README.md
new file mode 100644
index 000..3615c0b
--- /dev/null
+++ b/curator-test-zk34/README.md
@@ -0,0 +1,11 @@
+# ZooKeeper 3.4 Compatibility
+
+Apache Curator 4.0 adds best-effort backward compatibility for ZooKeeper 3.4 
ensembles and the ZooKeeper 3.4 library/JAR. This module, `curator-test-zk34`, 
exists to run the standard Curator tests using ZooKeeper 3.4. It does this via 
Maven. In the curator-test-zk34 pom.xml:
+
+- The Curator modules framework and recipes libraries are included - both main 
and test JARs - but the ZooKeeper dependency is excluded (otherwise ZooKeeper 
3.5.x would be brought in)
+- The curator-test module is included but as version 2.12.0 which brings in 
ZooKeeper 3.4.8
+- The maven-surefire-plugin is configured to run the framework and recipes 
tests
+- The current version of the curator-test module includes new methods that 
didn't exist in version 2.12.0 in `Timing.java` and `KillSession.java`. 
Therefore, these classes are now soft-deprecated, reverted to their original 
implementations and there are new classes with the new methods: `Timing2.java` 
and `KillSession2.java`
+- A new test base class `CuratorTestBase` is started. Over time more common 
stuff should go in here but, for now, this defines a TestNG listener, 
Zk35MethodInterceptor, that allows for tests that are ZooKeeper 3.5 only to be 
marked by `@Test(groups = Zk35MethodInterceptor.zk35Group)`. These tests will 
not be run during the 3.4 compatibility check.
+- curator-test-zk34 needs some of the new classes from curator-test. Rather 
than have copies of the classes the maven-resources-plugin is used to copy from 
curator-test to the generated sources dir of curator-test-zk34. All classes in 
`curator-test/src/main/java/org/apache/curator/test/compatibility` are copied.
+

[16/16] curator git commit: merge problem

[randgalt]

merge problem


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

Branch: refs/heads/master
Commit: afc206c7efad8bf3e596b2e9a523cce3b355f035
Parents: 63f8310
Author: randgalt 
Authored: Fri Jul 21 13:07:10 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 13:07:10 2017 -0500

--
 src/site/site.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/afc206c7/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index 7761966..4604664 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -76,6 +76,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -90,7 +94,6 @@
 
 
 
-
 
 https://cwiki.apache.org/confluence/display/CURATOR"/>
 https://cwiki.apache.org/confluence/display/CURATOR/Releases"/>

[07/16] curator git commit: need to sleep a bit between setcounts so to avoid missing events

[randgalt]

need to sleep a bit between setcounts so to avoid missing events


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

Branch: refs/heads/master
Commit: 96340af1d1525b2c5bf50adccc499c6917ff7563
Parents: 20a3db3
Author: randgalt 
Authored: Thu Jul 20 12:17:35 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 12:17:35 2017 -0500

--
 .../curator/framework/recipes/shared/TestSharedCount.java  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/96340af1/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
index 6a0b7c2..822a01c 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/shared/TestSharedCount.java
@@ -33,6 +33,7 @@ import org.apache.curator.retry.RetryNTimes;
 import org.apache.curator.retry.RetryOneTime;
 import org.apache.curator.test.BaseClassForTests;
 import org.apache.curator.test.Timing;
+import org.apache.curator.test.compatibility.CuratorTestBase;
 import org.apache.curator.utils.CloseableUtils;
 import org.apache.zookeeper.WatchedEvent;
 import org.testng.Assert;
@@ -50,7 +51,7 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class TestSharedCount extends BaseClassForTests
+public class TestSharedCount extends CuratorTestBase
 {
 @Test
 public void testMultiClients() throws Exception
@@ -191,8 +192,11 @@ public class TestSharedCount extends BaseClassForTests
 count.addListener(listener);
 
 Assert.assertTrue(count.trySetCount(1));
+timing.sleepABit();
 Assert.assertTrue(count.trySetCount(2));
+timing.sleepABit();
 Assert.assertTrue(count.trySetCount(10));
+timing.sleepABit();
 Assert.assertEquals(count.getCount(), 10);
 
 Assert.assertTrue(new Timing().awaitLatch(setLatch));

[05/16] curator git commit: TestTreeCache now uses the improved KillSession2 but that results in different event ordering

[randgalt]

TestTreeCache now uses the improved KillSession2 but that results in different 
event ordering


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

Branch: refs/heads/master
Commit: 097083c4a2cd2e252c6f3b57e3e837e4a9ecabc9
Parents: 242b701
Author: randgalt 
Authored: Thu Jul 20 10:53:52 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 10:53:52 2017 -0500

--
 .../org/apache/curator/framework/recipes/cache/TestTreeCache.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/097083c4/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
--
diff --git 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
index 409cc48..a53627a 100644
--- 
a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
+++ 
b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestTreeCache.java
@@ -424,11 +424,10 @@ public class TestTreeCache extends BaseTestTreeCache
 assertEvent(TreeCacheEvent.Type.NODE_ADDED, "/test/me");
 
 KillSession2.kill(client.getZookeeperClient().getZooKeeper());
-assertEvent(TreeCacheEvent.Type.CONNECTION_SUSPENDED);
 assertEvent(TreeCacheEvent.Type.CONNECTION_LOST);
 assertEvent(TreeCacheEvent.Type.CONNECTION_RECONNECTED);
-assertEvent(TreeCacheEvent.Type.NODE_REMOVED, "/test/me", 
"data".getBytes());
 assertEvent(TreeCacheEvent.Type.INITIALIZED);
+assertEvent(TreeCacheEvent.Type.NODE_REMOVED, "/test/me", 
"data".getBytes());
 
 assertNoMoreEvents();
 }

[03/16] curator git commit: Basic concept of zk 3.4.x compatibility proven. The Compatibility class checks for a well-known 3.5 class and sets a static that advertises whether the ZK lib is 3.4.x or 3

[randgalt]

Basic concept of zk 3.4.x compatibility proven. The Compatibility class checks 
for a well-known 3.5 class and sets a static
that advertises whether the ZK lib is 3.4.x or 3.5.x. Then, the code "ifs" 
using this static. The major work was emulating
the kill session injection (that emulation is done using reflection) and 
testing. The curator-test-zk module runs
the framework and recipe tests but forces ZooKeeper 3.4.x and uses the Curator 
2.x version of curator-test. This
requires a few tricks as the new code uses new methods/classes on the Curator 
3.x version of curator-test. I'll write
a readme documenting how this is done.


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

Branch: refs/heads/master
Commit: 58bc969fecc01a1947dd272300d4fb305d221ea2
Parents: 0641243
Author: randgalt 
Authored: Thu Jul 20 01:48:40 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 01:48:40 2017 -0500

--
 .../org/apache/curator/utils/Compatibility.java |  76 +
 .../curator/utils/InjectSessionExpiration.java  | 107 +++
 .../java/org/apache/curator/BasicTests.java |   4 +-
 .../curator/TestSessionFailRetryLoop.java   |  11 +-
 .../framework/CuratorFrameworkFactory.java  |  30 +-
 .../apache/curator/framework/SafeIsTtlMode.java |   3 +-
 .../framework/imps/CreateBuilderImpl.java   |   9 +-
 .../imps/CuratorMultiTransactionImpl.java   |  18 +-
 .../framework/state/ConnectionStateManager.java |   6 +-
 .../curator/framework/imps/TestCleanState.java  |   7 +
 .../framework/imps/TestCreateReturningStat.java |  13 +-
 .../imps/TestEnabledSessionExpiredState.java|   8 +-
 .../curator/framework/imps/TestFramework.java   |   3 +-
 .../framework/imps/TestFrameworkEdges.java  |   8 +-
 .../framework/imps/TestReconfiguration.java |   9 +-
 .../framework/imps/TestRemoveWatches.java   |   6 +-
 .../curator/framework/imps/TestTtlNodes.java|   5 +-
 .../imps/TestWatcherRemovalManager.java |   5 +-
 .../recipes/cache/TestEventOrdering.java|   3 +-
 .../framework/recipes/cache/TestNodeCache.java  |   4 +-
 .../recipes/cache/TestPathChildrenCache.java|   4 +-
 .../framework/recipes/cache/TestTreeCache.java  |   4 +-
 .../recipes/leader/TestLeaderLatch.java |   3 +-
 .../recipes/leader/TestLeaderSelector.java  |   9 +-
 .../recipes/locks/TestInterProcessMutex.java|   5 +-
 .../locks/TestInterProcessMutexBase.java|   7 +-
 .../nodes/TestPersistentEphemeralNode.java  |  14 +-
 .../recipes/nodes/TestPersistentNode.java   |   3 +-
 curator-test-zk34/pom.xml   |  44 +++
 .../curator/framework/imps/TestCleanState.java  |  25 --
 .../org/apache/curator/test/Compatibility.java  |  35 +++
 curator-test/pom.xml|  19 ++
 .../apache/curator/test/CuratorTestBase.java|  27 ++
 .../org/apache/curator/test/KillSession2.java   |  39 +++
 .../java/org/apache/curator/test/Timing2.java   | 299 +++
 .../curator/test/Zk35MethodInterceptor.java |  55 
 .../org/apache/curator/test/Compatibility.java  |  34 +++
 .../apache/curator/test/KillServerSession.java  | 122 
 .../org/apache/curator/test/KillSession.java|  67 -
 .../java/org/apache/curator/test/Timing.java|  75 +
 .../x/async/CompletableBaseClassForTests.java   |   3 +-
 .../discovery/details/TestServiceDiscovery.java |   8 +-
 pom.xml |   7 +
 43 files changed, 859 insertions(+), 384 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/58bc969f/curator-client/src/main/java/org/apache/curator/utils/Compatibility.java
--
diff --git 
a/curator-client/src/main/java/org/apache/curator/utils/Compatibility.java 
b/curator-client/src/main/java/org/apache/curator/utils/Compatibility.java
new file mode 100644
index 000..58b62a7
--- /dev/null
+++ b/curator-client/src/main/java/org/apache/curator/utils/Compatibility.java
@@ -0,0 +1,76 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed 

[01/16] curator git commit: initial work on ZooKeeper 3.4.x compatibility mode

[randgalt]

Repository: curator
Updated Branches:
  refs/heads/master 840b43406 -> afc206c7e


initial work on ZooKeeper 3.4.x compatibility mode


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

Branch: refs/heads/master
Commit: 0641243f75d25a92a9ceb811e8e2611a1e95869e
Parents: 7e611bd
Author: randgalt 
Authored: Wed Jul 19 12:36:24 2017 -0500
Committer: randgalt 
Committed: Wed Jul 19 12:36:24 2017 -0500

--
 .../main/java/org/apache/curator/RetryLoop.java |   2 +-
 .../curator/framework/CuratorFramework.java |   7 +
 .../framework/CuratorFrameworkFactory.java  |  50 +++-
 .../apache/curator/framework/SafeIsTtlMode.java |  43 +++
 .../imps/CompatibleCreateCallback.java  |  26 
 .../framework/imps/CreateBuilderImpl.java   | 125 --
 .../curator/framework/imps/CreateZK35.java  |  47 +++
 .../framework/imps/CuratorFrameworkImpl.java|  21 ++-
 .../framework/imps/WatcherRemovalManager.java   |   2 +-
 .../framework/imps/TestFrameworkEdges.java  |   5 +-
 curator-recipes/pom.xml |  16 +++
 .../framework/recipes/nodes/PersistentNode.java |   3 +-
 curator-test-zk34/pom.xml   | 127 +++
 .../curator/framework/imps/TestCleanState.java  |  25 
 .../src/test/resources/log4j.properties |  27 
 pom.xml |   8 ++
 16 files changed, 483 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/0641243f/curator-client/src/main/java/org/apache/curator/RetryLoop.java
--
diff --git a/curator-client/src/main/java/org/apache/curator/RetryLoop.java 
b/curator-client/src/main/java/org/apache/curator/RetryLoop.java
index 2ea6f97..51df662 100644
--- a/curator-client/src/main/java/org/apache/curator/RetryLoop.java
+++ b/curator-client/src/main/java/org/apache/curator/RetryLoop.java
@@ -136,7 +136,7 @@ public class RetryLoop
 (rc == KeeperException.Code.OPERATIONTIMEOUT.intValue()) ||
 (rc == KeeperException.Code.SESSIONMOVED.intValue()) ||
 (rc == KeeperException.Code.SESSIONEXPIRED.intValue()) ||
-(rc == KeeperException.Code.NEWCONFIGNOQUORUM.intValue());
+(rc == -13); // KeeperException.Code.NEWCONFIGNOQUORUM.intValue()) 
- using hard coded value for ZK 3.4.x compatibility
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/curator/blob/0641243f/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
index 4135e82..bf6167c 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
@@ -324,4 +324,11 @@ public interface CuratorFramework extends Closeable
  * @return schema set
  */
 SchemaSet getSchemaSet();
+
+/**
+ * Return true if this instance is running in ZK 3.4.x compatibility mode
+ *
+ * @return true/false
+ */
+boolean isZk34CompatibilityMode();
 }

http://git-wip-us.apache.org/repos/asf/curator/blob/0641243f/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
--
diff --git 
a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
 
b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
index 915aee1..5ce7762 100644
--- 
a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
+++ 
b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java
@@ -35,15 +35,16 @@ import 
org.apache.curator.framework.imps.CuratorTempFrameworkImpl;
 import org.apache.curator.framework.imps.DefaultACLProvider;
 import org.apache.curator.framework.imps.GzipCompressionProvider;
 import org.apache.curator.framework.schema.SchemaSet;
+import org.apache.curator.framework.state.ConnectionState;
 import org.apache.curator.framework.state.ConnectionStateErrorPolicy;
 import org.apache.curator.framework.state.StandardConnectionStateErrorPolicy;
-import org.apache.curator.framework.state.ConnectionState;
 import org.apache.curator.utils.DefaultZookeeperFactory;
 

[08/16] curator git commit: license

[randgalt]

license


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

Branch: refs/heads/master
Commit: 6b6f13f74afa0fe3d8752224c1af82c2709e7f6b
Parents: 96340af
Author: randgalt 
Authored: Thu Jul 20 12:17:50 2017 -0500
Committer: randgalt 
Committed: Thu Jul 20 12:17:50 2017 -0500

--
 .../java/org/apache/curator/test/DummyTest.java   | 18 ++
 1 file changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/6b6f13f7/curator-test-zk34/src/test/java/org/apache/curator/test/DummyTest.java
--
diff --git 
a/curator-test-zk34/src/test/java/org/apache/curator/test/DummyTest.java 
b/curator-test-zk34/src/test/java/org/apache/curator/test/DummyTest.java
index 2f6afa8..f19a85b 100644
--- a/curator-test-zk34/src/test/java/org/apache/curator/test/DummyTest.java
+++ b/curator-test-zk34/src/test/java/org/apache/curator/test/DummyTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.curator.test;
 
 import org.testng.annotations.Test;

svn commit: r1802636 - in /curator/site/trunk/private/staging: ./ apidocs/ apidocs/async/ apidocs/async/class-use/ apidocs/cache/ apidocs/cache/class-use/ apidocs/discovery/ apidocs/discovery/class-us

[randgalt]

Author: randgalt
Date: Fri Jul 21 18:53:44 2017
New Revision: 1802636

URL: http://svn.apache.org/viewvc?rev=1802636=rev
Log:
WIP docs/website


[This commit notification would consist of 133 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

[5/5] curator git commit: Curator Java 8/Async isn't technically an extension anymore

[randgalt]

Curator Java 8/Async isn't technically an extension anymore


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

Branch: refs/heads/CURATOR-426
Commit: 46ce6b7ae338ced5d2fd71bb7ce0e7df6085b208
Parents: 2204c15
Author: randgalt 
Authored: Fri Jul 21 13:44:01 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 13:44:01 2017 -0500

--
 src/site/site.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/46ce6b7a/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index 15e1a0c..d78b5b7 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -107,8 +107,7 @@
 
 
 
-
-
+\
 
 
 https://cwiki.apache.org/confluence/display/CURATOR/Submitting+Pull+Requests"/>

[3/5] curator git commit: Merge branch 'master' into CURATOR-426

[randgalt]

Merge branch 'master' into CURATOR-426


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

Branch: refs/heads/CURATOR-426
Commit: b57f9ef65c1c0fcf948da3f9d66e31c74d5e3db9
Parents: 329729a 840b434
Author: randgalt 
Authored: Fri Jul 21 12:50:52 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 12:50:52 2017 -0500

--
 .../server/jetty_resteasy/TestStringsWithRestEasy.java  | 6 +++---
 pom.xml | 9 +
 2 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/b57f9ef6/pom.xml
--

[1/5] curator git commit: update mvn parent pom, plugin and other dependency version

[randgalt]

Repository: curator
Updated Branches:
  refs/heads/CURATOR-426 329729a6e -> 46ce6b7ae


update mvn parent pom, plugin and other dependency version


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

Branch: refs/heads/CURATOR-426
Commit: 9454f1ca46bcbd52ba3d7767f2e76a05ffdf56f6
Parents: 95b70d2
Author: Fangmin Lyu 
Authored: Sat Mar 11 15:59:45 2017 -0800
Committer: Fangmin Lyu 
Committed: Fri Jul 21 10:28:17 2017 -0700

--
 .../server/jetty_resteasy/TestStringsWithRestEasy.java |  6 +++---
 pom.xml| 13 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/9454f1ca/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
--
diff --git 
a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
 
b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
index cc9592c..13f1e14 100644
--- 
a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
+++ 
b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
@@ -19,7 +19,7 @@
 package org.apache.curator.x.discovery.server.jetty_resteasy;
 
 import com.google.common.collect.Lists;
-import com.google.common.io.ByteStreams;
+import com.google.common.io.ByteSource;
 import com.google.common.io.CharStreams;
 import org.apache.curator.test.InstanceSpec;
 import org.apache.curator.x.discovery.ServiceInstance;
@@ -70,7 +70,7 @@ public class TestStringsWithRestEasy
 root.addEventListener(new ResteasyBootstrap());
 server.start();
 }
-
+
 @AfterMethod
 public void teardown() throws Exception
 {
@@ -133,7 +133,7 @@ public class TestStringsWithRestEasy
 urlConnection.setDoOutput(true);
 
 OutputStreamout = urlConnection.getOutputStream();
-
ByteStreams.copy(ByteStreams.newInputStreamSupplier(body.getBytes()), out);
+ByteSource.wrap(body.getBytes()).copyTo(out);
 }
 BufferedReader in = new BufferedReader(new 
InputStreamReader(urlConnection.getInputStream()));
 try

http://git-wip-us.apache.org/repos/asf/curator/blob/9454f1ca/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3aceb5f..19b6d4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache
 apache
-17
+18
 
 
 org.apache.curator
@@ -60,11 +60,12 @@
 
 
 3.5.3-beta
-
2.7
+
2.9
 3.2.0
-2.10.3
-1.6
+2.10.4
+1.7
 1.9.0
+3.20.0-GA
 2.2
 1.9.13
 2.7.3
@@ -73,9 +74,9 @@
 6.1.26
 1.0.2
 2.3.0.GA
-16.0.1
+20.0
 6.10
-0.12.0
+0.18.0
 0.7.0
 2.4.3
 1.7.6

[4/5] curator git commit: latest updates

[randgalt]

latest updates


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

Branch: refs/heads/CURATOR-426
Commit: 2204c15508f7b5757dfcbba8234ca57de8b0884d
Parents: b57f9ef
Author: randgalt 
Authored: Fri Jul 21 13:31:52 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 13:31:52 2017 -0500

--
 src/site/confluence/index.confluence | 22 +++---
 1 file changed, 7 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/2204c155/src/site/confluence/index.confluence
--
diff --git a/src/site/confluence/index.confluence 
b/src/site/confluence/index.confluence
index 4caf9c8..e6a3d10 100644
--- a/src/site/confluence/index.confluence
+++ b/src/site/confluence/index.confluence
@@ -12,14 +12,9 @@ h2. Getting Started
 
 See the page for quick start: [[Getting Started|getting-started.html]].
 
-h2. Components
+!images/arrow.png!
 
-|[[Recipes|curator-recipes/index.html]]|Implementations of some of the common 
ZooKeeper "recipes". The implementations are built on top of the Curator 
Framework.|
-|[[Framework|curator-framework/index.html]]|The Curator Framework is a 
high\-level API that greatly simplifies using ZooKeeper. It adds many features 
that build on ZooKeeper and handles the complexity of managing connections to 
the ZooKeeper cluster and retrying operations.|
-|[[Utilities|utilities.html]]|Various utilities that are useful when using 
ZooKeeper.|
-|[[Client|curator-client/index.html]]|A replacement for the bundled 
{{ZooKeeper}} class that takes care of some low\-level housekeeping and 
provides some useful utilities.|
-|[[Errors|errors.html]]|How Curator deals with errors, connection issues, 
recoverable exceptions, etc.|
-|Extensions|The curator\-recipes package implements the common recipes that 
are described in the ZooKeeper documentation. To avoid bloating that package, 
recipes/applications that have a vertical appeal will be put in separate 
"extension" packages using the naming convention curator\-x\-name.|
+Use the navigation links in the left\-nav menu for detailed information.
 
 h2. Maven / Artifacts
 
@@ -28,19 +23,16 @@ most users, the only artifact you need is curator\-recipes.
 
 ||GroupID/Org||ArtifactID/Name||Description||
 |org.apache.curator|curator\-recipes|All of the recipes. Note: this artifact 
has dependencies on client and framework and, so, Maven (or whatever tool 
you're using) should pull those in automatically.|
+|org.apache.curator|curator\-async|Asynchronous DSL with O/R modeling, 
migrations and many other features.|
 |org.apache.curator|curator\-framework|The Curator Framework high level API. 
This is built on top of the client and should pull it in automatically.|
 |org.apache.curator|curator\-client|The Curator Client \- replacement for the 
ZooKeeper class in the ZK distribution.|
 |org.apache.curator|curator\-test|Contains the TestingServer, the 
TestingCluster and a few other tools useful for testing.|
 |org.apache.curator|curator\-examples|Example usages of various Curator 
features.|
 |org.apache.curator|curator\-x\-discovery|A Service Discovery implementation 
built on the Curator Framework.|
-|org.apache.curator|curator\-x\-discovery-server|A RESTful server that can be 
used with Curator Discovery.|
+|org.apache.curator|curator\-x\-discovery\-server|A RESTful server that can be 
used with Curator Discovery.|
 
-h2. Versions
+h2. ZooKeeper Compatibility
 
-The are currently two released versions of Curator, 2.x.x and 3.x.x:
+Apache Curator is meant to be used with ZooKeeper 3.5\+. However, it is also 
compatible with ZooKeeper 3.4.x.
+See [[Compatibility|compatibility.html]] for details.
 
-* Curator 2.x.x \- compatible with both ZooKeeper 3.4.x and ZooKeeper 3.5.x
-* Curator 3.x.x \- compatible only with ZooKeeper 3.5.x and includes support 
for new features such as dynamic reconfiguration, etc.
-
-ZooKeeper 3.5.x adds a number of new features including dynamic 
reconfiguration, watcher removal and others. The Curator 3.x.x Jira
-issues tracking these features are here: 
[[https://issues.apache.org/jira/browse/CURATOR-159]].

[curator] Git Push Summary

[randgalt]

Repository: curator
Updated Tags:  refs/tags/temp [deleted] 9b81582da

[2/2] curator git commit: Merge branch 'CURATOR-378'

[fangmin]

Merge branch 'CURATOR-378'


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

Branch: refs/heads/master
Commit: 840b4340693b6148bd83c2af9ae1ac7ea5a69cca
Parents: 95b70d2 9454f1c
Author: Fangmin Lyu 
Authored: Fri Jul 21 10:28:56 2017 -0700
Committer: Fangmin Lyu 
Committed: Fri Jul 21 10:28:56 2017 -0700

--
 .../server/jetty_resteasy/TestStringsWithRestEasy.java |  6 +++---
 pom.xml| 13 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)
--

[1/2] curator git commit: update mvn parent pom, plugin and other dependency version

[fangmin]

Repository: curator
Updated Branches:
  refs/heads/master 95b70d2b4 -> 840b43406


update mvn parent pom, plugin and other dependency version


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

Branch: refs/heads/master
Commit: 9454f1ca46bcbd52ba3d7767f2e76a05ffdf56f6
Parents: 95b70d2
Author: Fangmin Lyu 
Authored: Sat Mar 11 15:59:45 2017 -0800
Committer: Fangmin Lyu 
Committed: Fri Jul 21 10:28:17 2017 -0700

--
 .../server/jetty_resteasy/TestStringsWithRestEasy.java |  6 +++---
 pom.xml| 13 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/9454f1ca/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
--
diff --git 
a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
 
b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
index cc9592c..13f1e14 100644
--- 
a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
+++ 
b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
@@ -19,7 +19,7 @@
 package org.apache.curator.x.discovery.server.jetty_resteasy;
 
 import com.google.common.collect.Lists;
-import com.google.common.io.ByteStreams;
+import com.google.common.io.ByteSource;
 import com.google.common.io.CharStreams;
 import org.apache.curator.test.InstanceSpec;
 import org.apache.curator.x.discovery.ServiceInstance;
@@ -70,7 +70,7 @@ public class TestStringsWithRestEasy
 root.addEventListener(new ResteasyBootstrap());
 server.start();
 }
-
+
 @AfterMethod
 public void teardown() throws Exception
 {
@@ -133,7 +133,7 @@ public class TestStringsWithRestEasy
 urlConnection.setDoOutput(true);
 
 OutputStreamout = urlConnection.getOutputStream();
-
ByteStreams.copy(ByteStreams.newInputStreamSupplier(body.getBytes()), out);
+ByteSource.wrap(body.getBytes()).copyTo(out);
 }
 BufferedReader in = new BufferedReader(new 
InputStreamReader(urlConnection.getInputStream()));
 try

http://git-wip-us.apache.org/repos/asf/curator/blob/9454f1ca/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3aceb5f..19b6d4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache
 apache
-17
+18
 
 
 org.apache.curator
@@ -60,11 +60,12 @@
 
 
 3.5.3-beta
-
2.7
+
2.9
 3.2.0
-2.10.3
-1.6
+2.10.4
+1.7
 1.9.0
+3.20.0-GA
 2.2
 1.9.13
 2.7.3
@@ -73,9 +74,9 @@
 6.1.26
 1.0.2
 2.3.0.GA
-16.0.1
+20.0
 6.10
-0.12.0
+0.18.0
 0.7.0
 2.4.3
 1.7.6

[05/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java
deleted file mode 100644
index 5644401..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java
+++ /dev/null
@@ -1,680 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class GetDataSpec implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("GetDataSpec");
-
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new 
org.apache.thrift.protocol.TField("path", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField WATCHED_FIELD_DESC = 
new org.apache.thrift.protocol.TField("watched", 
org.apache.thrift.protocol.TType.BOOL, (short)2);
-  private static final org.apache.thrift.protocol.TField 
ASYNC_CONTEXT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("asyncContext", 
org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField 
DECOMPRESSED_FIELD_DESC = new org.apache.thrift.protocol.TField("decompressed", 
org.apache.thrift.protocol.TType.BOOL, (short)4);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new GetDataSpecStandardSchemeFactory());
-schemes.put(TupleScheme.class, new GetDataSpecTupleSchemeFactory());
-  }
-
-  public String path; // required
-  public boolean watched; // required
-  public String asyncContext; // required
-  public boolean decompressed; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-PATH((short)1, "path"),
-WATCHED((short)2, "watched"),
-ASYNC_CONTEXT((short)3, "asyncContext"),
-DECOMPRESSED((short)4, "decompressed");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // PATH
-  return PATH;
-case 2: // WATCHED
-  return WATCHED;
-case 3: // ASYNC_CONTEXT
-  return ASYNC_CONTEXT;
-case 4: // DECOMPRESSED
-  return DECOMPRESSED;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // 

[14/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
deleted file mode 100644
index 2cb4462..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.curator.x.rpc.idl.structs;
-
-import com.facebook.swift.codec.ThriftField;
-import com.facebook.swift.codec.ThriftStruct;
-import org.apache.curator.framework.recipes.cache.ChildData;
-
-@ThriftStruct("ChildData")
-public class RpcChildData
-{
-@ThriftField(1)
-public String path;
-
-@ThriftField(2)
-public RpcStat stat;
-
-@ThriftField(3)
-public byte[] data;
-
-public RpcChildData()
-{
-}
-
-public RpcChildData(ChildData data)
-{
-if ( data != null )
-{
-this.path = data.getPath();
-this.stat = RpcCuratorEvent.toRpcStat(data.getStat());
-this.data = data.getData();
-}
-}
-
-public RpcChildData(String path, RpcStat stat, byte[] data)
-{
-this.path = path;
-this.stat = stat;
-this.data = data;
-}
-}

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
deleted file mode 100644
index 020f283..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.curator.x.rpc.idl.structs;
-
-import com.facebook.swift.codec.ThriftEnum;
-
-@ThriftEnum("CreateMode")
-public enum RpcCreateMode
-{
-PERSISTENT,
-PERSISTENT_SEQUENTIAL,
-EPHEMERAL,
-EPHEMERAL_SEQUENTIAL,
-CONTAINER
-}

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
deleted file mode 100644
index 18591a5..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- 

[09/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java
deleted file mode 100644
index f278e6e..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DeleteSpec implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("DeleteSpec");
-
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new 
org.apache.thrift.protocol.TField("path", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField GUARANTEED_FIELD_DESC 
= new org.apache.thrift.protocol.TField("guaranteed", 
org.apache.thrift.protocol.TType.BOOL, (short)2);
-  private static final org.apache.thrift.protocol.TField 
ASYNC_CONTEXT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("asyncContext", 
org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = 
new org.apache.thrift.protocol.TField("version", 
org.apache.thrift.protocol.TType.STRUCT, (short)4);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new DeleteSpecStandardSchemeFactory());
-schemes.put(TupleScheme.class, new DeleteSpecTupleSchemeFactory());
-  }
-
-  public String path; // required
-  public boolean guaranteed; // required
-  public String asyncContext; // required
-  public Version version; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-PATH((short)1, "path"),
-GUARANTEED((short)2, "guaranteed"),
-ASYNC_CONTEXT((short)3, "asyncContext"),
-VERSION((short)4, "version");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // PATH
-  return PATH;
-case 2: // GUARANTEED
-  return GUARANTEED;
-case 3: // ASYNC_CONTEXT
-  return ASYNC_CONTEXT;
-case 4: // VERSION
-  return VERSION;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
- 

[02/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/PersistentEphemeralNodeProjection.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/PersistentEphemeralNodeProjection.java
 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/PersistentEphemeralNodeProjection.java
deleted file mode 100644
index 607f247..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/PersistentEphemeralNodeProjection.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class PersistentEphemeralNodeProjection implements 
org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("PersistentEphemeralNodeProjection");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("id", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
PersistentEphemeralNodeProjectionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new 
PersistentEphemeralNodeProjectionTupleSchemeFactory());
-  }
-
-  public String id; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-ID((short)1, "id");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // ID
-  return ID;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PersistentEphemeralNodeProjection.class,
 metaDataMap);
-  }
-
-  public PersistentEphemeralNodeProjection() {
-  }
-
-  public 

[11/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
deleted file mode 100644
index a2b18e3..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CuratorProjection implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("CuratorProjection");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("id", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
CuratorProjectionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new CuratorProjectionTupleSchemeFactory());
-  }
-
-  public String id; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-ID((short)1, "id");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // ID
-  return ID;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CuratorProjection.class,
 metaDataMap);
-  }
-
-  public CuratorProjection() {
-  }
-
-  public CuratorProjection(
-String id)
-  {
-this();
-this.id = id;
-  }
-
-  /**
-   * Performs a deep copy on other.
-   */
-  public CuratorProjection(CuratorProjection other) {
-if (other.isSetId()) {
-  

[17/17] curator git commit: Merge branch 'master' into CURATOR-425

[randgalt]

Merge branch 'master' into CURATOR-425


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

Branch: refs/heads/CURATOR-425
Commit: 334950f6188fe646a4588fd5aafd46e1525686d2
Parents: 1eb8aa8 95b70d2
Author: randgalt 
Authored: Fri Jul 21 12:02:03 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 12:02:03 2017 -0500

--
 curator-x-rpc/pom.xml   |   189 -
 .../curator/x/rpc/CuratorProjectionServer.java  |   152 -
 .../AuthorizationConfiguration.java |45 -
 ...dedExponentialBackoffRetryConfiguration.java |69 -
 .../x/rpc/configuration/Configuration.java  |86 -
 .../rpc/configuration/ConfigurationBuilder.java |87 -
 .../configuration/ConnectionConfiguration.java  |   129 -
 .../ExponentialBackoffRetryConfiguration.java   |58 -
 .../configuration/RetryNTimesConfiguration.java |58 -
 .../configuration/RetryPolicyConfiguration.java |28 -
 .../curator/x/rpc/connections/Closer.java   |24 -
 .../x/rpc/connections/ConnectionManager.java|   141 -
 .../curator/x/rpc/connections/CuratorEntry.java |   170 -
 .../x/rpc/details/RpcBackgroundCallback.java|44 -
 .../curator/x/rpc/details/RpcWatcher.java   |43 -
 .../x/rpc/idl/discovery/DiscoveryInstance.java  |95 -
 .../idl/discovery/DiscoveryInstanceType.java|26 -
 .../rpc/idl/discovery/DiscoveryProjection.java  |38 -
 .../discovery/DiscoveryProviderProjection.java  |38 -
 .../x/rpc/idl/discovery/DiscoveryService.java   |   259 -
 .../idl/discovery/DiscoveryServiceLowLevel.java |   159 -
 .../rpc/idl/discovery/ProviderStrategyType.java |27 -
 .../x/rpc/idl/exceptions/ExceptionType.java |26 -
 .../x/rpc/idl/exceptions/NodeExceptionType.java |27 -
 .../x/rpc/idl/exceptions/RpcException.java  |98 -
 .../idl/exceptions/ZooKeeperExceptionType.java  |40 -
 .../idl/services/CuratorProjectionService.java  |   765 -
 .../x/rpc/idl/services/EventService.java|55 -
 .../curator/x/rpc/idl/structs/CreateSpec.java   |66 -
 .../x/rpc/idl/structs/CuratorProjection.java|38 -
 .../curator/x/rpc/idl/structs/DeleteSpec.java   |50 -
 .../curator/x/rpc/idl/structs/ExistsSpec.java   |46 -
 .../x/rpc/idl/structs/GetChildrenSpec.java  |46 -
 .../curator/x/rpc/idl/structs/GetDataSpec.java  |50 -
 .../curator/x/rpc/idl/structs/LeaderEvent.java  |46 -
 .../x/rpc/idl/structs/LeaderProjection.java |38 -
 .../curator/x/rpc/idl/structs/LeaderResult.java |42 -
 .../x/rpc/idl/structs/LeaseProjection.java  |38 -
 .../x/rpc/idl/structs/LockProjection.java   |38 -
 .../x/rpc/idl/structs/NodeCacheProjection.java  |38 -
 .../x/rpc/idl/structs/OptionalChildrenList.java |39 -
 .../curator/x/rpc/idl/structs/OptionalData.java |38 -
 .../rpc/idl/structs/OptionalLockProjection.java |38 -
 .../curator/x/rpc/idl/structs/OptionalPath.java |38 -
 .../x/rpc/idl/structs/OptionalRpcStat.java  |38 -
 .../structs/PathChildrenCacheProjection.java|38 -
 .../idl/structs/PathChildrenCacheStartMode.java |26 -
 .../PersistentEphemeralNodeProjection.java  |38 -
 .../curator/x/rpc/idl/structs/RpcAcl.java   |42 -
 .../curator/x/rpc/idl/structs/RpcChildData.java |57 -
 .../x/rpc/idl/structs/RpcCreateMode.java|31 -
 .../x/rpc/idl/structs/RpcCuratorEvent.java  |   224 -
 .../x/rpc/idl/structs/RpcCuratorEventType.java  |46 -
 .../curator/x/rpc/idl/structs/RpcEventType.java |31 -
 .../apache/curator/x/rpc/idl/structs/RpcId.java |42 -
 .../x/rpc/idl/structs/RpcKeeperState.java   |34 -
 .../x/rpc/idl/structs/RpcParticipant.java   |42 -
 .../idl/structs/RpcPathChildrenCacheEvent.java  |54 -
 .../structs/RpcPathChildrenCacheEventType.java  |33 -
 .../structs/RpcPersistentEphemeralNodeMode.java |30 -
 .../curator/x/rpc/idl/structs/RpcStat.java  |95 -
 .../x/rpc/idl/structs/RpcWatchedEvent.java  |54 -
 .../curator/x/rpc/idl/structs/SetDataSpec.java  |58 -
 .../curator/x/rpc/idl/structs/Version.java  |38 -
 .../src/main/resources/curator/help.txt |72 -
 curator-x-rpc/src/main/scripts/apply-thrift.sh  |36 -
 curator-x-rpc/src/main/scripts/generate.sh  |56 -
 curator-x-rpc/src/main/thrift/curator.thrift|   297 -
 .../site/confluence/configuration.confluence|   143 -
 .../src/site/confluence/deploy.confluence   |31 -
 .../src/site/confluence/events.confluence   |90 -
 .../src/site/confluence/index.confluence|49 -
 .../src/site/confluence/reference.confluence|   120 -
 .../src/site/confluence/usage.confluence  

[07/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
deleted file mode 100644
index 169192e..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
+++ /dev/null
@@ -1,6966 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DiscoveryServiceLowLevel {
-
-  public interface Iface {
-
-public DiscoveryInstance queryForInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String name, String id) throws 
CuratorException, org.apache.thrift.TException;
-
-public List queryForInstances(CuratorProjection 
projection, DiscoveryProjection discoveryProjection, String name) throws 
CuratorException, org.apache.thrift.TException;
-
-public List queryForNames(CuratorProjection projection, 
DiscoveryProjection discoveryProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public void registerInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
CuratorException, org.apache.thrift.TException;
-
-public void unregisterInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
CuratorException, org.apache.thrift.TException;
-
-public void updateInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
CuratorException, org.apache.thrift.TException;
-
-  }
-
-  public interface AsyncIface {
-
-public void queryForInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String name, String id, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void queryForInstances(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String name, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void queryForNames(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void registerInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void unregisterInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void updateInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-  }
-
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
-public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
-  public Factory() {}
-  public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
-return new Client(prot);
-  }
-  public Client getClient(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-return new Client(iprot, oprot);
-  }
-}
-
-public Client(org.apache.thrift.protocol.TProtocol prot)
-{
-  super(prot, prot);
-}
-
-public Client(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-  super(iprot, oprot);
-}
-
-

[16/17] curator git commit: Squashed commit of the following:

[randgalt]

Squashed commit of the following:

commit 1e7902427f627f0efc5e2486437929a26bd237bd
Author: randgalt 
Date:   Thu Jul 20 14:42:41 2017 -0500

Remove Curator RPC code from git

commit 939994838320b7f0394bdf4f8919df101f5b7359
Author: randgalt 
Date:   Thu Jul 20 13:54:44 2017 -0500

Removed Curator RPC


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

Branch: refs/heads/CURATOR-425
Commit: 95b70d2b4b04ca86194cbf54e9b5dc1869b36b3b
Parents: 7e611bd
Author: randgalt 
Authored: Fri Jul 21 06:29:57 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 06:29:57 2017 -0500

--
 curator-x-rpc/pom.xml   |   189 -
 .../curator/x/rpc/CuratorProjectionServer.java  |   152 -
 .../AuthorizationConfiguration.java |45 -
 ...dedExponentialBackoffRetryConfiguration.java |69 -
 .../x/rpc/configuration/Configuration.java  |86 -
 .../rpc/configuration/ConfigurationBuilder.java |87 -
 .../configuration/ConnectionConfiguration.java  |   129 -
 .../ExponentialBackoffRetryConfiguration.java   |58 -
 .../configuration/RetryNTimesConfiguration.java |58 -
 .../configuration/RetryPolicyConfiguration.java |28 -
 .../curator/x/rpc/connections/Closer.java   |24 -
 .../x/rpc/connections/ConnectionManager.java|   141 -
 .../curator/x/rpc/connections/CuratorEntry.java |   170 -
 .../x/rpc/details/RpcBackgroundCallback.java|44 -
 .../curator/x/rpc/details/RpcWatcher.java   |43 -
 .../x/rpc/idl/discovery/DiscoveryInstance.java  |95 -
 .../idl/discovery/DiscoveryInstanceType.java|26 -
 .../rpc/idl/discovery/DiscoveryProjection.java  |38 -
 .../discovery/DiscoveryProviderProjection.java  |38 -
 .../x/rpc/idl/discovery/DiscoveryService.java   |   259 -
 .../idl/discovery/DiscoveryServiceLowLevel.java |   159 -
 .../rpc/idl/discovery/ProviderStrategyType.java |27 -
 .../x/rpc/idl/exceptions/ExceptionType.java |26 -
 .../x/rpc/idl/exceptions/NodeExceptionType.java |27 -
 .../x/rpc/idl/exceptions/RpcException.java  |98 -
 .../idl/exceptions/ZooKeeperExceptionType.java  |40 -
 .../idl/services/CuratorProjectionService.java  |   765 -
 .../x/rpc/idl/services/EventService.java|55 -
 .../curator/x/rpc/idl/structs/CreateSpec.java   |66 -
 .../x/rpc/idl/structs/CuratorProjection.java|38 -
 .../curator/x/rpc/idl/structs/DeleteSpec.java   |50 -
 .../curator/x/rpc/idl/structs/ExistsSpec.java   |46 -
 .../x/rpc/idl/structs/GetChildrenSpec.java  |46 -
 .../curator/x/rpc/idl/structs/GetDataSpec.java  |50 -
 .../curator/x/rpc/idl/structs/LeaderEvent.java  |46 -
 .../x/rpc/idl/structs/LeaderProjection.java |38 -
 .../curator/x/rpc/idl/structs/LeaderResult.java |42 -
 .../x/rpc/idl/structs/LeaseProjection.java  |38 -
 .../x/rpc/idl/structs/LockProjection.java   |38 -
 .../x/rpc/idl/structs/NodeCacheProjection.java  |38 -
 .../x/rpc/idl/structs/OptionalChildrenList.java |39 -
 .../curator/x/rpc/idl/structs/OptionalData.java |38 -
 .../rpc/idl/structs/OptionalLockProjection.java |38 -
 .../curator/x/rpc/idl/structs/OptionalPath.java |38 -
 .../x/rpc/idl/structs/OptionalRpcStat.java  |38 -
 .../structs/PathChildrenCacheProjection.java|38 -
 .../idl/structs/PathChildrenCacheStartMode.java |26 -
 .../PersistentEphemeralNodeProjection.java  |38 -
 .../curator/x/rpc/idl/structs/RpcAcl.java   |42 -
 .../curator/x/rpc/idl/structs/RpcChildData.java |57 -
 .../x/rpc/idl/structs/RpcCreateMode.java|31 -
 .../x/rpc/idl/structs/RpcCuratorEvent.java  |   224 -
 .../x/rpc/idl/structs/RpcCuratorEventType.java  |46 -
 .../curator/x/rpc/idl/structs/RpcEventType.java |31 -
 .../apache/curator/x/rpc/idl/structs/RpcId.java |42 -
 .../x/rpc/idl/structs/RpcKeeperState.java   |34 -
 .../x/rpc/idl/structs/RpcParticipant.java   |42 -
 .../idl/structs/RpcPathChildrenCacheEvent.java  |54 -
 .../structs/RpcPathChildrenCacheEventType.java  |33 -
 .../structs/RpcPersistentEphemeralNodeMode.java |30 -
 .../curator/x/rpc/idl/structs/RpcStat.java  |95 -
 .../x/rpc/idl/structs/RpcWatchedEvent.java  |54 -
 .../curator/x/rpc/idl/structs/SetDataSpec.java  |58 -
 .../curator/x/rpc/idl/structs/Version.java  |38 -
 .../src/main/resources/curator/help.txt |72 -
 curator-x-rpc/src/main/scripts/apply-thrift.sh  |36 -
 curator-x-rpc/src/main/scripts/generate.sh  |56 -
 curator-x-rpc/src/main/thrift/curator.thrift|   297 -
 

[12/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEvent.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEvent.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEvent.java
deleted file mode 100644
index 23ecbf4..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEvent.java
+++ /dev/null
@@ -1,1636 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CuratorEvent implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("CuratorEvent");
-
-  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new 
org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, 
(short)2);
-  private static final org.apache.thrift.protocol.TField 
RESULT_CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("resultCode", 
org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new 
org.apache.thrift.protocol.TField("path", 
org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField CONTEXT_FIELD_DESC = 
new org.apache.thrift.protocol.TField("context", 
org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField STAT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("stat", 
org.apache.thrift.protocol.TType.STRUCT, (short)6);
-  private static final org.apache.thrift.protocol.TField DATA_FIELD_DESC = new 
org.apache.thrift.protocol.TField("data", 
org.apache.thrift.protocol.TType.STRING, (short)7);
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("name", 
org.apache.thrift.protocol.TType.STRING, (short)8);
-  private static final org.apache.thrift.protocol.TField CHILDREN_FIELD_DESC = 
new org.apache.thrift.protocol.TField("children", 
org.apache.thrift.protocol.TType.LIST, (short)9);
-  private static final org.apache.thrift.protocol.TField ACL_LIST_FIELD_DESC = 
new org.apache.thrift.protocol.TField("aclList", 
org.apache.thrift.protocol.TType.LIST, (short)10);
-  private static final org.apache.thrift.protocol.TField 
WATCHED_EVENT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("watchedEvent", 
org.apache.thrift.protocol.TType.STRUCT, (short)11);
-  private static final org.apache.thrift.protocol.TField 
LEADER_EVENT_FIELD_DESC = new org.apache.thrift.protocol.TField("leaderEvent", 
org.apache.thrift.protocol.TType.STRUCT, (short)12);
-  private static final org.apache.thrift.protocol.TField 
CHILDREN_CACHE_EVENT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("childrenCacheEvent", 
org.apache.thrift.protocol.TType.STRUCT, (short)13);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new CuratorEventStandardSchemeFactory());
-schemes.put(TupleScheme.class, new CuratorEventTupleSchemeFactory());
-  }
-
-  /**
-   * 
-   * @see CuratorEventType
-   */
-  public CuratorEventType type; // required
-  public int resultCode; // required
-  public String path; // required
-  public String context; // required
-  public Stat stat; // required
-  public ByteBuffer data; // required
-  public String name; // required
-  public List children; // required
-  public List aclList; // required
-  public WatchedEvent watchedEvent; // required
-  public LeaderEvent leaderEvent; // required
-  public PathChildrenCacheEvent childrenCacheEvent; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and 

[13/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java
--
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java
deleted file mode 100644
index a31e11e..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Acl implements org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("Acl");
-
-  private static final org.apache.thrift.protocol.TField PERMS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("perms", 
org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("id", 
org.apache.thrift.protocol.TType.STRUCT, (short)2);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new AclStandardSchemeFactory());
-schemes.put(TupleScheme.class, new AclTupleSchemeFactory());
-  }
-
-  public int perms; // required
-  public Id id; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-PERMS((short)1, "perms"),
-ID((short)2, "id");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // PERMS
-  return PERMS;
-case 2: // ID
-  return ID;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  private static final int __PERMS_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.PERMS, new 
org.apache.thrift.meta_data.FieldMetaData("perms", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 

[15/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
deleted file mode 100644
index 42c90b9..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.curator.x.rpc.idl.discovery;
-
-import com.facebook.swift.service.ThriftMethod;
-import com.facebook.swift.service.ThriftService;
-import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import org.apache.curator.utils.ThreadUtils;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceInstance;
-import org.apache.curator.x.rpc.connections.ConnectionManager;
-import org.apache.curator.x.rpc.connections.CuratorEntry;
-import org.apache.curator.x.rpc.idl.exceptions.RpcException;
-import org.apache.curator.x.rpc.idl.structs.CuratorProjection;
-import java.util.Collection;
-
-@ThriftService
-public class DiscoveryServiceLowLevel
-{
-private final ConnectionManager connectionManager;
-
-public DiscoveryServiceLowLevel(ConnectionManager connectionManager)
-{
-this.connectionManager = connectionManager;
-}
-
-@ThriftMethod
-public void registerInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
RpcException
-{
-try
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-serviceDiscovery.registerService(instance.toReal());
-}
-catch ( Exception e )
-{
-ThreadUtils.checkInterrupted(e);
-throw new RpcException(e);
-}
-}
-
-@ThriftMethod
-public void updateInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
RpcException
-{
-try
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-serviceDiscovery.updateService(instance.toReal());
-}
-catch ( Exception e )
-{
-ThreadUtils.checkInterrupted(e);
-throw new RpcException(e);
-}
-}
-
-@ThriftMethod
-public void unregisterInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
RpcException
-{
-try
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-serviceDiscovery.unregisterService(instance.toReal());
-}
-catch ( Exception e )
-{
-ThreadUtils.checkInterrupted(e);
-throw new RpcException(e);
-}
-}
-
-@ThriftMethod
-public Collection queryForNames(CuratorProjection projection, 
DiscoveryProjection discoveryProjection) throws RpcException
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-try
-

[03/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/OptionalPath.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/OptionalPath.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/OptionalPath.java
deleted file mode 100644
index e4d8bcd..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/OptionalPath.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class OptionalPath implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("OptionalPath");
-
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new 
org.apache.thrift.protocol.TField("path", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new OptionalPathStandardSchemeFactory());
-schemes.put(TupleScheme.class, new OptionalPathTupleSchemeFactory());
-  }
-
-  public String path; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-PATH((short)1, "path");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // PATH
-  return PATH;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.PATH, new 
org.apache.thrift.meta_data.FieldMetaData("path", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(OptionalPath.class,
 metaDataMap);
-  }
-
-  public OptionalPath() {
-  }
-
-  public OptionalPath(
-String path)
-  {
-this();
-this.path = path;
-  }
-
-  /**
-   * Performs a deep copy on other.
-   */
-  public OptionalPath(OptionalPath other) {
-if (other.isSetPath()) {
-  this.path = other.path;
-}
-  }
-
-  public 

[10/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
deleted file mode 100644
index 63d46ee..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
+++ /dev/null
@@ -1,24123 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CuratorService {
-
-  public interface Iface {
-
-public OptionalLockProjection acquireLock(CuratorProjection projection, 
String path, int maxWaitMs) throws CuratorException, 
org.apache.thrift.TException;
-
-public List acquireSemaphore(CuratorProjection 
projection, String path, int acquireQty, int maxWaitMs, int maxLeases) throws 
CuratorException, org.apache.thrift.TException;
-
-public void closeCuratorProjection(CuratorProjection projection) throws 
org.apache.thrift.TException;
-
-public boolean closeGenericProjection(CuratorProjection projection, String 
id) throws CuratorException, org.apache.thrift.TException;
-
-public OptionalPath createNode(CuratorProjection projection, CreateSpec 
spec) throws CuratorException, org.apache.thrift.TException;
-
-public void deleteNode(CuratorProjection projection, DeleteSpec spec) 
throws CuratorException, org.apache.thrift.TException;
-
-public OptionalStat exists(CuratorProjection projection, ExistsSpec spec) 
throws CuratorException, org.apache.thrift.TException;
-
-public OptionalChildrenList getChildren(CuratorProjection projection, 
GetChildrenSpec spec) throws CuratorException, org.apache.thrift.TException;
-
-public OptionalData getData(CuratorProjection projection, GetDataSpec 
spec) throws CuratorException, org.apache.thrift.TException;
-
-public List getLeaderParticipants(CuratorProjection 
projection, LeaderProjection leaderProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public ChildData getNodeCacheData(CuratorProjection projection, 
NodeCacheProjection cacheProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public List getPathChildrenCacheData(CuratorProjection 
projection, PathChildrenCacheProjection cacheProjection) throws 
CuratorException, org.apache.thrift.TException;
-
-public ChildData getPathChildrenCacheDataForPath(CuratorProjection 
projection, PathChildrenCacheProjection cacheProjection, String path) throws 
CuratorException, org.apache.thrift.TException;
-
-public boolean isLeader(CuratorProjection projection, LeaderProjection 
leaderProjection) throws CuratorException, org.apache.thrift.TException;
-
-public CuratorProjection newCuratorProjection(String connectionName) 
throws CuratorException, org.apache.thrift.TException;
-
-public void pingCuratorProjection(CuratorProjection projection) throws 
org.apache.thrift.TException;
-
-public OptionalStat setData(CuratorProjection projection, SetDataSpec 
spec) throws CuratorException, org.apache.thrift.TException;
-
-public LeaderResult startLeaderSelector(CuratorProjection projection, 
String path, String participantId, int waitForLeadershipMs) throws 
CuratorException, org.apache.thrift.TException;
-
-public NodeCacheProjection startNodeCache(CuratorProjection projection, 
String path, boolean dataIsCompressed, boolean buildInitial) throws 
CuratorException, org.apache.thrift.TException;
-
-public PathChildrenCacheProjection 
startPathChildrenCache(CuratorProjection projection, String path, boolean 
cacheData, boolean dataIsCompressed, PathChildrenCacheStartMode startMode) 
throws CuratorException, org.apache.thrift.TException;
-
-public PersistentEphemeralNodeProjection 
startPersistentEphemeralNode(CuratorProjection projection, String path, 
ByteBuffer data, 

[06/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/EventService.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/EventService.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/EventService.java
deleted file mode 100644
index 9854e0e..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/EventService.java
+++ /dev/null
@@ -1,1082 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class EventService {
-
-  public interface Iface {
-
-public CuratorEvent getNextEvent(CuratorProjection projection) throws 
CuratorException, org.apache.thrift.TException;
-
-  }
-
-  public interface AsyncIface {
-
-public void getNextEvent(CuratorProjection projection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-  }
-
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
-public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
-  public Factory() {}
-  public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
-return new Client(prot);
-  }
-  public Client getClient(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-return new Client(iprot, oprot);
-  }
-}
-
-public Client(org.apache.thrift.protocol.TProtocol prot)
-{
-  super(prot, prot);
-}
-
-public Client(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-  super(iprot, oprot);
-}
-
-public CuratorEvent getNextEvent(CuratorProjection projection) throws 
CuratorException, org.apache.thrift.TException
-{
-  send_getNextEvent(projection);
-  return recv_getNextEvent();
-}
-
-public void send_getNextEvent(CuratorProjection projection) throws 
org.apache.thrift.TException
-{
-  getNextEvent_args args = new getNextEvent_args();
-  args.setProjection(projection);
-  sendBase("getNextEvent", args);
-}
-
-public CuratorEvent recv_getNextEvent() throws CuratorException, 
org.apache.thrift.TException
-{
-  getNextEvent_result result = new getNextEvent_result();
-  receiveBase(result, "getNextEvent");
-  if (result.isSetSuccess()) {
-return result.success;
-  }
-  if (result.ex1 != null) {
-throw result.ex1;
-  }
-  throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getNextEvent failed: unknown result");
-}
-
-  }
-  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient 
implements AsyncIface {
-public static class Factory implements 
org.apache.thrift.async.TAsyncClientFactory {
-  private org.apache.thrift.async.TAsyncClientManager clientManager;
-  private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
-  public Factory(org.apache.thrift.async.TAsyncClientManager 
clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
-this.clientManager = clientManager;
-this.protocolFactory = protocolFactory;
-  }
-  public AsyncClient 
getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
-return new AsyncClient(protocolFactory, clientManager, transport);
-  }
-}
-
-public AsyncClient(org.apache.thrift.protocol.TProtocolFactory 
protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, 
org.apache.thrift.transport.TNonblockingTransport transport) {
-  super(protocolFactory, clientManager, transport);
-}
-
-public void getNextEvent(CuratorProjection projection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
-  checkReady();
-  

[08/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
deleted file mode 100644
index 7e64f0f..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
+++ /dev/null
@@ -1,7236 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DiscoveryService {
-
-  public interface Iface {
-
-public List getAllInstances(CuratorProjection 
projection, DiscoveryProviderProjection providerProjection) throws 
CuratorException, org.apache.thrift.TException;
-
-public DiscoveryInstance getInstance(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public DiscoveryInstance makeDiscoveryInstance(String name, ByteBuffer 
payload, int port) throws CuratorException, org.apache.thrift.TException;
-
-public void noteError(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, String instanceId) throws 
CuratorException, org.apache.thrift.TException;
-
-public DiscoveryProjection startDiscovery(CuratorProjection projection, 
String basePath, DiscoveryInstance yourInstance) throws CuratorException, 
org.apache.thrift.TException;
-
-public DiscoveryProviderProjection startProvider(CuratorProjection 
projection, DiscoveryProjection discoveryProjection, String serviceName, 
ProviderStrategyType providerStrategy, int downTimeoutMs, int 
downErrorThreshold) throws CuratorException, org.apache.thrift.TException;
-
-  }
-
-  public interface AsyncIface {
-
-public void getAllInstances(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void getInstance(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void makeDiscoveryInstance(String name, ByteBuffer payload, int 
port, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void noteError(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, String instanceId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void startDiscovery(CuratorProjection projection, String basePath, 
DiscoveryInstance yourInstance, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
-
-public void startProvider(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String serviceName, 
ProviderStrategyType providerStrategy, int downTimeoutMs, int 
downErrorThreshold, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
-
-  }
-
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
-public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
-  public Factory() {}
-  public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
-return new Client(prot);
-  }
-  public Client getClient(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-return new Client(iprot, oprot);
-  }
-}
-
-public Client(org.apache.thrift.protocol.TProtocol prot)
-{
-  super(prot, prot);
-}
-
-public Client(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-  super(iprot, oprot);
-}
-
-public List 

[04/17] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java
deleted file mode 100644
index d14f14d..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class LeaseProjection implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("LeaseProjection");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("id", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
LeaseProjectionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new LeaseProjectionTupleSchemeFactory());
-  }
-
-  public String id; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-ID((short)1, "id");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // ID
-  return ID;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LeaseProjection.class,
 metaDataMap);
-  }
-
-  public LeaseProjection() {
-  }
-
-  public LeaseProjection(
-String id)
-  {
-this();
-this.id = id;
-  }
-
-  /**
-   * Performs a deep copy on other.
-   */
-  public LeaseProjection(LeaseProjection other) {
-if (other.isSetId()) {
-  this.id = other.id;
-}
-  

[01/17] curator git commit: Squashed commit of the following:

[randgalt]

Repository: curator
Updated Branches:
  refs/heads/CURATOR-425 1eb8aa849 -> 334950f61


http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java
deleted file mode 100644
index d629635..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Version implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("Version");
-
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = 
new org.apache.thrift.protocol.TField("version", 
org.apache.thrift.protocol.TType.I32, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new VersionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new VersionTupleSchemeFactory());
-  }
-
-  public int version; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-VERSION((short)1, "version");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // VERSION
-  return VERSION;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  private static final int __VERSION_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.VERSION, new 
org.apache.thrift.meta_data.FieldMetaData("version", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Version.class, 
metaDataMap);
-  }
-
-  public Version() {
-  }
-
-  public Version(
-int version)
-  {
-this();
-this.version = version;
-setVersionIsSet(true);
-  }
-
-  /**
-   * 

curator git commit: Updated assert message for testConcurrency1 as well

[randgalt]

Repository: curator
Updated Branches:
  refs/heads/CURATOR-426 3ad6ca765 -> 7b780b5b0


Updated assert message for testConcurrency1 as well


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

Branch: refs/heads/CURATOR-426
Commit: 7b780b5b01cdd5ad75ac9b42bfd276d73cb42c3b
Parents: 3ad6ca7
Author: randgalt 
Authored: Fri Jul 21 11:32:51 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 11:32:51 2017 -0500

--
 .../apache/curator/x/async/migrations/TestMigrationManager.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/7b780b5b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
--
diff --git 
a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
 
b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
index 063b961..bc724f5 100644
--- 
a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
+++ 
b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
@@ -313,7 +313,7 @@ public class TestMigrationManager extends 
CompletableBaseClassForTests
 }
 catch ( Throwable e )
 {
-Assert.assertTrue(Throwables.getRootCause(e) instanceof 
AsyncWrappers.TimeoutException);
+Assert.assertTrue(Throwables.getRootCause(e) instanceof 
AsyncWrappers.TimeoutException, "Should throw AsyncWrappers.TimeoutException, 
was: " + Throwables.getStackTraceAsString(Throwables.getRootCause(e)));
 }
 
 latch.countDown();

curator git commit: Avoid test flakiness by not starting the second migration until the first is in filter()

[randgalt]

Repository: curator
Updated Branches:
  refs/heads/CURATOR-426 71ed99d3d -> 3ad6ca765


Avoid test flakiness by not starting the second migration until the first is in 
filter()


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

Branch: refs/heads/CURATOR-426
Commit: 3ad6ca7658b92d38417c47be536ddf3aa8dc61f1
Parents: 71ed99d
Author: randgalt 
Authored: Fri Jul 21 11:26:47 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 11:26:47 2017 -0500

--
 .../apache/curator/x/async/migrations/TestMigrationManager.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/3ad6ca76/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
--
diff --git 
a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
 
b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
index c781f60..063b961 100644
--- 
a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
+++ 
b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
@@ -67,6 +67,7 @@ public class TestMigrationManager extends 
CompletableBaseClassForTests
 private CuratorOp v3op;
 private MigrationManager manager;
 private final AtomicReference filterLatch = new 
AtomicReference<>();
+private final CountDownLatch filterIsSetLatch = new CountDownLatch(1);
 
 @BeforeMethod
 @Override
@@ -99,6 +100,7 @@ public class TestMigrationManager extends 
CompletableBaseClassForTests
 CountDownLatch localLatch = filterLatch.getAndSet(null);
 if ( localLatch != null )
 {
+filterIsSetLatch.countDown();
 try
 {
 localLatch.await();
@@ -301,6 +303,7 @@ public class TestMigrationManager extends 
CompletableBaseClassForTests
 CountDownLatch latch = new CountDownLatch(1);
 filterLatch.set(latch);
 CompletionStage first = manager.migrate(migrationSet);
+Assert.assertTrue(timing.awaitLatch(filterIsSetLatch));
 
 MigrationManager manager2 = new MigrationManager(client, LOCK_PATH, 
META_DATA_PATH, executor, 
Duration.ofMillis(timing.forSleepingABit().milliseconds()));
 try
@@ -328,6 +331,7 @@ public class TestMigrationManager extends 
CompletableBaseClassForTests
 CountDownLatch latch = new CountDownLatch(1);
 filterLatch.set(latch);
 CompletionStage first = manager.migrate(migrationSet);
+Assert.assertTrue(timing.awaitLatch(filterIsSetLatch));
 
 CompletionStage second = manager.migrate(migrationSet);
 try

[13/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java
--
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java
deleted file mode 100644
index a31e11e..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Acl implements org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("Acl");
-
-  private static final org.apache.thrift.protocol.TField PERMS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("perms", 
org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("id", 
org.apache.thrift.protocol.TType.STRUCT, (short)2);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new AclStandardSchemeFactory());
-schemes.put(TupleScheme.class, new AclTupleSchemeFactory());
-  }
-
-  public int perms; // required
-  public Id id; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-PERMS((short)1, "perms"),
-ID((short)2, "id");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // PERMS
-  return PERMS;
-case 2: // ID
-  return ID;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  private static final int __PERMS_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.PERMS, new 
org.apache.thrift.meta_data.FieldMetaData("perms", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 

[14/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
deleted file mode 100644
index 2cb4462..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.curator.x.rpc.idl.structs;
-
-import com.facebook.swift.codec.ThriftField;
-import com.facebook.swift.codec.ThriftStruct;
-import org.apache.curator.framework.recipes.cache.ChildData;
-
-@ThriftStruct("ChildData")
-public class RpcChildData
-{
-@ThriftField(1)
-public String path;
-
-@ThriftField(2)
-public RpcStat stat;
-
-@ThriftField(3)
-public byte[] data;
-
-public RpcChildData()
-{
-}
-
-public RpcChildData(ChildData data)
-{
-if ( data != null )
-{
-this.path = data.getPath();
-this.stat = RpcCuratorEvent.toRpcStat(data.getStat());
-this.data = data.getData();
-}
-}
-
-public RpcChildData(String path, RpcStat stat, byte[] data)
-{
-this.path = path;
-this.stat = stat;
-this.data = data;
-}
-}

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
deleted file mode 100644
index 020f283..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.curator.x.rpc.idl.structs;
-
-import com.facebook.swift.codec.ThriftEnum;
-
-@ThriftEnum("CreateMode")
-public enum RpcCreateMode
-{
-PERSISTENT,
-PERSISTENT_SEQUENTIAL,
-EPHEMERAL,
-EPHEMERAL_SEQUENTIAL,
-CONTAINER
-}

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
deleted file mode 100644
index 18591a5..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- 

[06/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/EventService.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/EventService.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/EventService.java
deleted file mode 100644
index 9854e0e..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/EventService.java
+++ /dev/null
@@ -1,1082 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class EventService {
-
-  public interface Iface {
-
-public CuratorEvent getNextEvent(CuratorProjection projection) throws 
CuratorException, org.apache.thrift.TException;
-
-  }
-
-  public interface AsyncIface {
-
-public void getNextEvent(CuratorProjection projection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-  }
-
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
-public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
-  public Factory() {}
-  public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
-return new Client(prot);
-  }
-  public Client getClient(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-return new Client(iprot, oprot);
-  }
-}
-
-public Client(org.apache.thrift.protocol.TProtocol prot)
-{
-  super(prot, prot);
-}
-
-public Client(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-  super(iprot, oprot);
-}
-
-public CuratorEvent getNextEvent(CuratorProjection projection) throws 
CuratorException, org.apache.thrift.TException
-{
-  send_getNextEvent(projection);
-  return recv_getNextEvent();
-}
-
-public void send_getNextEvent(CuratorProjection projection) throws 
org.apache.thrift.TException
-{
-  getNextEvent_args args = new getNextEvent_args();
-  args.setProjection(projection);
-  sendBase("getNextEvent", args);
-}
-
-public CuratorEvent recv_getNextEvent() throws CuratorException, 
org.apache.thrift.TException
-{
-  getNextEvent_result result = new getNextEvent_result();
-  receiveBase(result, "getNextEvent");
-  if (result.isSetSuccess()) {
-return result.success;
-  }
-  if (result.ex1 != null) {
-throw result.ex1;
-  }
-  throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getNextEvent failed: unknown result");
-}
-
-  }
-  public static class AsyncClient extends org.apache.thrift.async.TAsyncClient 
implements AsyncIface {
-public static class Factory implements 
org.apache.thrift.async.TAsyncClientFactory {
-  private org.apache.thrift.async.TAsyncClientManager clientManager;
-  private org.apache.thrift.protocol.TProtocolFactory protocolFactory;
-  public Factory(org.apache.thrift.async.TAsyncClientManager 
clientManager, org.apache.thrift.protocol.TProtocolFactory protocolFactory) {
-this.clientManager = clientManager;
-this.protocolFactory = protocolFactory;
-  }
-  public AsyncClient 
getAsyncClient(org.apache.thrift.transport.TNonblockingTransport transport) {
-return new AsyncClient(protocolFactory, clientManager, transport);
-  }
-}
-
-public AsyncClient(org.apache.thrift.protocol.TProtocolFactory 
protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, 
org.apache.thrift.transport.TNonblockingTransport transport) {
-  super(protocolFactory, clientManager, transport);
-}
-
-public void getNextEvent(CuratorProjection projection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
-  checkReady();
-  

[07/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
deleted file mode 100644
index 169192e..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
+++ /dev/null
@@ -1,6966 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DiscoveryServiceLowLevel {
-
-  public interface Iface {
-
-public DiscoveryInstance queryForInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String name, String id) throws 
CuratorException, org.apache.thrift.TException;
-
-public List queryForInstances(CuratorProjection 
projection, DiscoveryProjection discoveryProjection, String name) throws 
CuratorException, org.apache.thrift.TException;
-
-public List queryForNames(CuratorProjection projection, 
DiscoveryProjection discoveryProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public void registerInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
CuratorException, org.apache.thrift.TException;
-
-public void unregisterInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
CuratorException, org.apache.thrift.TException;
-
-public void updateInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
CuratorException, org.apache.thrift.TException;
-
-  }
-
-  public interface AsyncIface {
-
-public void queryForInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String name, String id, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void queryForInstances(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String name, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void queryForNames(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void registerInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void unregisterInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void updateInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-  }
-
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
-public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
-  public Factory() {}
-  public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
-return new Client(prot);
-  }
-  public Client getClient(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-return new Client(iprot, oprot);
-  }
-}
-
-public Client(org.apache.thrift.protocol.TProtocol prot)
-{
-  super(prot, prot);
-}
-
-public Client(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-  super(iprot, oprot);
-}
-
-

[09/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java
deleted file mode 100644
index f278e6e..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DeleteSpec implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("DeleteSpec");
-
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new 
org.apache.thrift.protocol.TField("path", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField GUARANTEED_FIELD_DESC 
= new org.apache.thrift.protocol.TField("guaranteed", 
org.apache.thrift.protocol.TType.BOOL, (short)2);
-  private static final org.apache.thrift.protocol.TField 
ASYNC_CONTEXT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("asyncContext", 
org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = 
new org.apache.thrift.protocol.TField("version", 
org.apache.thrift.protocol.TType.STRUCT, (short)4);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new DeleteSpecStandardSchemeFactory());
-schemes.put(TupleScheme.class, new DeleteSpecTupleSchemeFactory());
-  }
-
-  public String path; // required
-  public boolean guaranteed; // required
-  public String asyncContext; // required
-  public Version version; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-PATH((short)1, "path"),
-GUARANTEED((short)2, "guaranteed"),
-ASYNC_CONTEXT((short)3, "asyncContext"),
-VERSION((short)4, "version");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // PATH
-  return PATH;
-case 2: // GUARANTEED
-  return GUARANTEED;
-case 3: // ASYNC_CONTEXT
-  return ASYNC_CONTEXT;
-case 4: // VERSION
-  return VERSION;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
- 

[10/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
deleted file mode 100644
index 63d46ee..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
+++ /dev/null
@@ -1,24123 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CuratorService {
-
-  public interface Iface {
-
-public OptionalLockProjection acquireLock(CuratorProjection projection, 
String path, int maxWaitMs) throws CuratorException, 
org.apache.thrift.TException;
-
-public List acquireSemaphore(CuratorProjection 
projection, String path, int acquireQty, int maxWaitMs, int maxLeases) throws 
CuratorException, org.apache.thrift.TException;
-
-public void closeCuratorProjection(CuratorProjection projection) throws 
org.apache.thrift.TException;
-
-public boolean closeGenericProjection(CuratorProjection projection, String 
id) throws CuratorException, org.apache.thrift.TException;
-
-public OptionalPath createNode(CuratorProjection projection, CreateSpec 
spec) throws CuratorException, org.apache.thrift.TException;
-
-public void deleteNode(CuratorProjection projection, DeleteSpec spec) 
throws CuratorException, org.apache.thrift.TException;
-
-public OptionalStat exists(CuratorProjection projection, ExistsSpec spec) 
throws CuratorException, org.apache.thrift.TException;
-
-public OptionalChildrenList getChildren(CuratorProjection projection, 
GetChildrenSpec spec) throws CuratorException, org.apache.thrift.TException;
-
-public OptionalData getData(CuratorProjection projection, GetDataSpec 
spec) throws CuratorException, org.apache.thrift.TException;
-
-public List getLeaderParticipants(CuratorProjection 
projection, LeaderProjection leaderProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public ChildData getNodeCacheData(CuratorProjection projection, 
NodeCacheProjection cacheProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public List getPathChildrenCacheData(CuratorProjection 
projection, PathChildrenCacheProjection cacheProjection) throws 
CuratorException, org.apache.thrift.TException;
-
-public ChildData getPathChildrenCacheDataForPath(CuratorProjection 
projection, PathChildrenCacheProjection cacheProjection, String path) throws 
CuratorException, org.apache.thrift.TException;
-
-public boolean isLeader(CuratorProjection projection, LeaderProjection 
leaderProjection) throws CuratorException, org.apache.thrift.TException;
-
-public CuratorProjection newCuratorProjection(String connectionName) 
throws CuratorException, org.apache.thrift.TException;
-
-public void pingCuratorProjection(CuratorProjection projection) throws 
org.apache.thrift.TException;
-
-public OptionalStat setData(CuratorProjection projection, SetDataSpec 
spec) throws CuratorException, org.apache.thrift.TException;
-
-public LeaderResult startLeaderSelector(CuratorProjection projection, 
String path, String participantId, int waitForLeadershipMs) throws 
CuratorException, org.apache.thrift.TException;
-
-public NodeCacheProjection startNodeCache(CuratorProjection projection, 
String path, boolean dataIsCompressed, boolean buildInitial) throws 
CuratorException, org.apache.thrift.TException;
-
-public PathChildrenCacheProjection 
startPathChildrenCache(CuratorProjection projection, String path, boolean 
cacheData, boolean dataIsCompressed, PathChildrenCacheStartMode startMode) 
throws CuratorException, org.apache.thrift.TException;
-
-public PersistentEphemeralNodeProjection 
startPersistentEphemeralNode(CuratorProjection projection, String path, 
ByteBuffer data, 

[15/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
deleted file mode 100644
index 42c90b9..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.curator.x.rpc.idl.discovery;
-
-import com.facebook.swift.service.ThriftMethod;
-import com.facebook.swift.service.ThriftService;
-import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import org.apache.curator.utils.ThreadUtils;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceInstance;
-import org.apache.curator.x.rpc.connections.ConnectionManager;
-import org.apache.curator.x.rpc.connections.CuratorEntry;
-import org.apache.curator.x.rpc.idl.exceptions.RpcException;
-import org.apache.curator.x.rpc.idl.structs.CuratorProjection;
-import java.util.Collection;
-
-@ThriftService
-public class DiscoveryServiceLowLevel
-{
-private final ConnectionManager connectionManager;
-
-public DiscoveryServiceLowLevel(ConnectionManager connectionManager)
-{
-this.connectionManager = connectionManager;
-}
-
-@ThriftMethod
-public void registerInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
RpcException
-{
-try
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-serviceDiscovery.registerService(instance.toReal());
-}
-catch ( Exception e )
-{
-ThreadUtils.checkInterrupted(e);
-throw new RpcException(e);
-}
-}
-
-@ThriftMethod
-public void updateInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
RpcException
-{
-try
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-serviceDiscovery.updateService(instance.toReal());
-}
-catch ( Exception e )
-{
-ThreadUtils.checkInterrupted(e);
-throw new RpcException(e);
-}
-}
-
-@ThriftMethod
-public void unregisterInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
RpcException
-{
-try
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-serviceDiscovery.unregisterService(instance.toReal());
-}
-catch ( Exception e )
-{
-ThreadUtils.checkInterrupted(e);
-throw new RpcException(e);
-}
-}
-
-@ThriftMethod
-public Collection queryForNames(CuratorProjection projection, 
DiscoveryProjection discoveryProjection) throws RpcException
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-try
-

[12/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEvent.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEvent.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEvent.java
deleted file mode 100644
index 23ecbf4..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorEvent.java
+++ /dev/null
@@ -1,1636 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CuratorEvent implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("CuratorEvent");
-
-  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new 
org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, 
(short)2);
-  private static final org.apache.thrift.protocol.TField 
RESULT_CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("resultCode", 
org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new 
org.apache.thrift.protocol.TField("path", 
org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField CONTEXT_FIELD_DESC = 
new org.apache.thrift.protocol.TField("context", 
org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField STAT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("stat", 
org.apache.thrift.protocol.TType.STRUCT, (short)6);
-  private static final org.apache.thrift.protocol.TField DATA_FIELD_DESC = new 
org.apache.thrift.protocol.TField("data", 
org.apache.thrift.protocol.TType.STRING, (short)7);
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("name", 
org.apache.thrift.protocol.TType.STRING, (short)8);
-  private static final org.apache.thrift.protocol.TField CHILDREN_FIELD_DESC = 
new org.apache.thrift.protocol.TField("children", 
org.apache.thrift.protocol.TType.LIST, (short)9);
-  private static final org.apache.thrift.protocol.TField ACL_LIST_FIELD_DESC = 
new org.apache.thrift.protocol.TField("aclList", 
org.apache.thrift.protocol.TType.LIST, (short)10);
-  private static final org.apache.thrift.protocol.TField 
WATCHED_EVENT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("watchedEvent", 
org.apache.thrift.protocol.TType.STRUCT, (short)11);
-  private static final org.apache.thrift.protocol.TField 
LEADER_EVENT_FIELD_DESC = new org.apache.thrift.protocol.TField("leaderEvent", 
org.apache.thrift.protocol.TType.STRUCT, (short)12);
-  private static final org.apache.thrift.protocol.TField 
CHILDREN_CACHE_EVENT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("childrenCacheEvent", 
org.apache.thrift.protocol.TType.STRUCT, (short)13);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new CuratorEventStandardSchemeFactory());
-schemes.put(TupleScheme.class, new CuratorEventTupleSchemeFactory());
-  }
-
-  /**
-   * 
-   * @see CuratorEventType
-   */
-  public CuratorEventType type; // required
-  public int resultCode; // required
-  public String path; // required
-  public String context; // required
-  public Stat stat; // required
-  public ByteBuffer data; // required
-  public String name; // required
-  public List children; // required
-  public List aclList; // required
-  public WatchedEvent watchedEvent; // required
-  public LeaderEvent leaderEvent; // required
-  public PathChildrenCacheEvent childrenCacheEvent; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and 

[08/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
deleted file mode 100644
index 7e64f0f..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
+++ /dev/null
@@ -1,7236 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DiscoveryService {
-
-  public interface Iface {
-
-public List getAllInstances(CuratorProjection 
projection, DiscoveryProviderProjection providerProjection) throws 
CuratorException, org.apache.thrift.TException;
-
-public DiscoveryInstance getInstance(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public DiscoveryInstance makeDiscoveryInstance(String name, ByteBuffer 
payload, int port) throws CuratorException, org.apache.thrift.TException;
-
-public void noteError(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, String instanceId) throws 
CuratorException, org.apache.thrift.TException;
-
-public DiscoveryProjection startDiscovery(CuratorProjection projection, 
String basePath, DiscoveryInstance yourInstance) throws CuratorException, 
org.apache.thrift.TException;
-
-public DiscoveryProviderProjection startProvider(CuratorProjection 
projection, DiscoveryProjection discoveryProjection, String serviceName, 
ProviderStrategyType providerStrategy, int downTimeoutMs, int 
downErrorThreshold) throws CuratorException, org.apache.thrift.TException;
-
-  }
-
-  public interface AsyncIface {
-
-public void getAllInstances(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void getInstance(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void makeDiscoveryInstance(String name, ByteBuffer payload, int 
port, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void noteError(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, String instanceId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void startDiscovery(CuratorProjection projection, String basePath, 
DiscoveryInstance yourInstance, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
-
-public void startProvider(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String serviceName, 
ProviderStrategyType providerStrategy, int downTimeoutMs, int 
downErrorThreshold, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
-
-  }
-
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
-public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
-  public Factory() {}
-  public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
-return new Client(prot);
-  }
-  public Client getClient(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-return new Client(iprot, oprot);
-  }
-}
-
-public Client(org.apache.thrift.protocol.TProtocol prot)
-{
-  super(prot, prot);
-}
-
-public Client(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-  super(iprot, oprot);
-}
-
-public List 

[18/18] curator git commit: Include the unexpected exception in the assertion

[randgalt]

Include the unexpected exception in the assertion


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

Branch: refs/heads/CURATOR-426
Commit: 71ed99d3d8a6c3b7f6a54b55b3b052daf927f8e0
Parents: d3aadde
Author: randgalt 
Authored: Fri Jul 21 11:12:38 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 11:12:38 2017 -0500

--
 .../apache/curator/x/async/migrations/TestMigrationManager.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/curator/blob/71ed99d3/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
--
diff --git 
a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
 
b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
index 47d09ab..c781f60 100644
--- 
a/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
+++ 
b/curator-x-async/src/test/java/org/apache/curator/x/async/migrations/TestMigrationManager.java
@@ -337,7 +337,7 @@ public class TestMigrationManager extends 
CompletableBaseClassForTests
 }
 catch ( Throwable e )
 {
-Assert.assertTrue(Throwables.getRootCause(e) instanceof 
TimeoutException);
+Assert.assertTrue(Throwables.getRootCause(e) instanceof 
TimeoutException, "Should throw TimeoutException, was: " + 
Throwables.getStackTraceAsString(Throwables.getRootCause(e)));
 }
 
 latch.countDown();

[04/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java
deleted file mode 100644
index d14f14d..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class LeaseProjection implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("LeaseProjection");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("id", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
LeaseProjectionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new LeaseProjectionTupleSchemeFactory());
-  }
-
-  public String id; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-ID((short)1, "id");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // ID
-  return ID;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LeaseProjection.class,
 metaDataMap);
-  }
-
-  public LeaseProjection() {
-  }
-
-  public LeaseProjection(
-String id)
-  {
-this();
-this.id = id;
-  }
-
-  /**
-   * Performs a deep copy on other.
-   */
-  public LeaseProjection(LeaseProjection other) {
-if (other.isSetId()) {
-  this.id = other.id;
-}
-  

[11/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
deleted file mode 100644
index a2b18e3..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CuratorProjection implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("CuratorProjection");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("id", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
CuratorProjectionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new CuratorProjectionTupleSchemeFactory());
-  }
-
-  public String id; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-ID((short)1, "id");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // ID
-  return ID;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CuratorProjection.class,
 metaDataMap);
-  }
-
-  public CuratorProjection() {
-  }
-
-  public CuratorProjection(
-String id)
-  {
-this();
-this.id = id;
-  }
-
-  /**
-   * Performs a deep copy on other.
-   */
-  public CuratorProjection(CuratorProjection other) {
-if (other.isSetId()) {
-  

[03/18] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/OptionalPath.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/OptionalPath.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/OptionalPath.java
deleted file mode 100644
index e4d8bcd..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/OptionalPath.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class OptionalPath implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("OptionalPath");
-
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new 
org.apache.thrift.protocol.TField("path", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new OptionalPathStandardSchemeFactory());
-schemes.put(TupleScheme.class, new OptionalPathTupleSchemeFactory());
-  }
-
-  public String path; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-PATH((short)1, "path");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // PATH
-  return PATH;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.PATH, new 
org.apache.thrift.meta_data.FieldMetaData("path", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(OptionalPath.class,
 metaDataMap);
-  }
-
-  public OptionalPath() {
-  }
-
-  public OptionalPath(
-String path)
-  {
-this();
-this.path = path;
-  }
-
-  /**
-   * Performs a deep copy on other.
-   */
-  public OptionalPath(OptionalPath other) {
-if (other.isSetPath()) {
-  this.path = other.path;
-}
-  }
-
-  public 

[16/18] curator git commit: Squashed commit of the following:

[randgalt]

Squashed commit of the following:

commit 1e7902427f627f0efc5e2486437929a26bd237bd
Author: randgalt 
Date:   Thu Jul 20 14:42:41 2017 -0500

Remove Curator RPC code from git

commit 939994838320b7f0394bdf4f8919df101f5b7359
Author: randgalt 
Date:   Thu Jul 20 13:54:44 2017 -0500

Removed Curator RPC


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

Branch: refs/heads/CURATOR-426
Commit: 95b70d2b4b04ca86194cbf54e9b5dc1869b36b3b
Parents: 7e611bd
Author: randgalt 
Authored: Fri Jul 21 06:29:57 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 06:29:57 2017 -0500

--
 curator-x-rpc/pom.xml   |   189 -
 .../curator/x/rpc/CuratorProjectionServer.java  |   152 -
 .../AuthorizationConfiguration.java |45 -
 ...dedExponentialBackoffRetryConfiguration.java |69 -
 .../x/rpc/configuration/Configuration.java  |86 -
 .../rpc/configuration/ConfigurationBuilder.java |87 -
 .../configuration/ConnectionConfiguration.java  |   129 -
 .../ExponentialBackoffRetryConfiguration.java   |58 -
 .../configuration/RetryNTimesConfiguration.java |58 -
 .../configuration/RetryPolicyConfiguration.java |28 -
 .../curator/x/rpc/connections/Closer.java   |24 -
 .../x/rpc/connections/ConnectionManager.java|   141 -
 .../curator/x/rpc/connections/CuratorEntry.java |   170 -
 .../x/rpc/details/RpcBackgroundCallback.java|44 -
 .../curator/x/rpc/details/RpcWatcher.java   |43 -
 .../x/rpc/idl/discovery/DiscoveryInstance.java  |95 -
 .../idl/discovery/DiscoveryInstanceType.java|26 -
 .../rpc/idl/discovery/DiscoveryProjection.java  |38 -
 .../discovery/DiscoveryProviderProjection.java  |38 -
 .../x/rpc/idl/discovery/DiscoveryService.java   |   259 -
 .../idl/discovery/DiscoveryServiceLowLevel.java |   159 -
 .../rpc/idl/discovery/ProviderStrategyType.java |27 -
 .../x/rpc/idl/exceptions/ExceptionType.java |26 -
 .../x/rpc/idl/exceptions/NodeExceptionType.java |27 -
 .../x/rpc/idl/exceptions/RpcException.java  |98 -
 .../idl/exceptions/ZooKeeperExceptionType.java  |40 -
 .../idl/services/CuratorProjectionService.java  |   765 -
 .../x/rpc/idl/services/EventService.java|55 -
 .../curator/x/rpc/idl/structs/CreateSpec.java   |66 -
 .../x/rpc/idl/structs/CuratorProjection.java|38 -
 .../curator/x/rpc/idl/structs/DeleteSpec.java   |50 -
 .../curator/x/rpc/idl/structs/ExistsSpec.java   |46 -
 .../x/rpc/idl/structs/GetChildrenSpec.java  |46 -
 .../curator/x/rpc/idl/structs/GetDataSpec.java  |50 -
 .../curator/x/rpc/idl/structs/LeaderEvent.java  |46 -
 .../x/rpc/idl/structs/LeaderProjection.java |38 -
 .../curator/x/rpc/idl/structs/LeaderResult.java |42 -
 .../x/rpc/idl/structs/LeaseProjection.java  |38 -
 .../x/rpc/idl/structs/LockProjection.java   |38 -
 .../x/rpc/idl/structs/NodeCacheProjection.java  |38 -
 .../x/rpc/idl/structs/OptionalChildrenList.java |39 -
 .../curator/x/rpc/idl/structs/OptionalData.java |38 -
 .../rpc/idl/structs/OptionalLockProjection.java |38 -
 .../curator/x/rpc/idl/structs/OptionalPath.java |38 -
 .../x/rpc/idl/structs/OptionalRpcStat.java  |38 -
 .../structs/PathChildrenCacheProjection.java|38 -
 .../idl/structs/PathChildrenCacheStartMode.java |26 -
 .../PersistentEphemeralNodeProjection.java  |38 -
 .../curator/x/rpc/idl/structs/RpcAcl.java   |42 -
 .../curator/x/rpc/idl/structs/RpcChildData.java |57 -
 .../x/rpc/idl/structs/RpcCreateMode.java|31 -
 .../x/rpc/idl/structs/RpcCuratorEvent.java  |   224 -
 .../x/rpc/idl/structs/RpcCuratorEventType.java  |46 -
 .../curator/x/rpc/idl/structs/RpcEventType.java |31 -
 .../apache/curator/x/rpc/idl/structs/RpcId.java |42 -
 .../x/rpc/idl/structs/RpcKeeperState.java   |34 -
 .../x/rpc/idl/structs/RpcParticipant.java   |42 -
 .../idl/structs/RpcPathChildrenCacheEvent.java  |54 -
 .../structs/RpcPathChildrenCacheEventType.java  |33 -
 .../structs/RpcPersistentEphemeralNodeMode.java |30 -
 .../curator/x/rpc/idl/structs/RpcStat.java  |95 -
 .../x/rpc/idl/structs/RpcWatchedEvent.java  |54 -
 .../curator/x/rpc/idl/structs/SetDataSpec.java  |58 -
 .../curator/x/rpc/idl/structs/Version.java  |38 -
 .../src/main/resources/curator/help.txt |72 -
 curator-x-rpc/src/main/scripts/apply-thrift.sh  |36 -
 curator-x-rpc/src/main/scripts/generate.sh  |56 -
 curator-x-rpc/src/main/thrift/curator.thrift|   297 -
 

[17/18] curator git commit: Merge branch 'master' into CURATOR-426

[randgalt]

Merge branch 'master' into CURATOR-426


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

Branch: refs/heads/CURATOR-426
Commit: d3aaddefceaf659cb32d865ead1cd3e294f2fddb
Parents: ee6859e 95b70d2
Author: randgalt 
Authored: Fri Jul 21 06:32:53 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 06:32:53 2017 -0500

--
 curator-x-rpc/pom.xml   |   189 -
 .../curator/x/rpc/CuratorProjectionServer.java  |   152 -
 .../AuthorizationConfiguration.java |45 -
 ...dedExponentialBackoffRetryConfiguration.java |69 -
 .../x/rpc/configuration/Configuration.java  |86 -
 .../rpc/configuration/ConfigurationBuilder.java |87 -
 .../configuration/ConnectionConfiguration.java  |   129 -
 .../ExponentialBackoffRetryConfiguration.java   |58 -
 .../configuration/RetryNTimesConfiguration.java |58 -
 .../configuration/RetryPolicyConfiguration.java |28 -
 .../curator/x/rpc/connections/Closer.java   |24 -
 .../x/rpc/connections/ConnectionManager.java|   141 -
 .../curator/x/rpc/connections/CuratorEntry.java |   170 -
 .../x/rpc/details/RpcBackgroundCallback.java|44 -
 .../curator/x/rpc/details/RpcWatcher.java   |43 -
 .../x/rpc/idl/discovery/DiscoveryInstance.java  |95 -
 .../idl/discovery/DiscoveryInstanceType.java|26 -
 .../rpc/idl/discovery/DiscoveryProjection.java  |38 -
 .../discovery/DiscoveryProviderProjection.java  |38 -
 .../x/rpc/idl/discovery/DiscoveryService.java   |   259 -
 .../idl/discovery/DiscoveryServiceLowLevel.java |   159 -
 .../rpc/idl/discovery/ProviderStrategyType.java |27 -
 .../x/rpc/idl/exceptions/ExceptionType.java |26 -
 .../x/rpc/idl/exceptions/NodeExceptionType.java |27 -
 .../x/rpc/idl/exceptions/RpcException.java  |98 -
 .../idl/exceptions/ZooKeeperExceptionType.java  |40 -
 .../idl/services/CuratorProjectionService.java  |   765 -
 .../x/rpc/idl/services/EventService.java|55 -
 .../curator/x/rpc/idl/structs/CreateSpec.java   |66 -
 .../x/rpc/idl/structs/CuratorProjection.java|38 -
 .../curator/x/rpc/idl/structs/DeleteSpec.java   |50 -
 .../curator/x/rpc/idl/structs/ExistsSpec.java   |46 -
 .../x/rpc/idl/structs/GetChildrenSpec.java  |46 -
 .../curator/x/rpc/idl/structs/GetDataSpec.java  |50 -
 .../curator/x/rpc/idl/structs/LeaderEvent.java  |46 -
 .../x/rpc/idl/structs/LeaderProjection.java |38 -
 .../curator/x/rpc/idl/structs/LeaderResult.java |42 -
 .../x/rpc/idl/structs/LeaseProjection.java  |38 -
 .../x/rpc/idl/structs/LockProjection.java   |38 -
 .../x/rpc/idl/structs/NodeCacheProjection.java  |38 -
 .../x/rpc/idl/structs/OptionalChildrenList.java |39 -
 .../curator/x/rpc/idl/structs/OptionalData.java |38 -
 .../rpc/idl/structs/OptionalLockProjection.java |38 -
 .../curator/x/rpc/idl/structs/OptionalPath.java |38 -
 .../x/rpc/idl/structs/OptionalRpcStat.java  |38 -
 .../structs/PathChildrenCacheProjection.java|38 -
 .../idl/structs/PathChildrenCacheStartMode.java |26 -
 .../PersistentEphemeralNodeProjection.java  |38 -
 .../curator/x/rpc/idl/structs/RpcAcl.java   |42 -
 .../curator/x/rpc/idl/structs/RpcChildData.java |57 -
 .../x/rpc/idl/structs/RpcCreateMode.java|31 -
 .../x/rpc/idl/structs/RpcCuratorEvent.java  |   224 -
 .../x/rpc/idl/structs/RpcCuratorEventType.java  |46 -
 .../curator/x/rpc/idl/structs/RpcEventType.java |31 -
 .../apache/curator/x/rpc/idl/structs/RpcId.java |42 -
 .../x/rpc/idl/structs/RpcKeeperState.java   |34 -
 .../x/rpc/idl/structs/RpcParticipant.java   |42 -
 .../idl/structs/RpcPathChildrenCacheEvent.java  |54 -
 .../structs/RpcPathChildrenCacheEventType.java  |33 -
 .../structs/RpcPersistentEphemeralNodeMode.java |30 -
 .../curator/x/rpc/idl/structs/RpcStat.java  |95 -
 .../x/rpc/idl/structs/RpcWatchedEvent.java  |54 -
 .../curator/x/rpc/idl/structs/SetDataSpec.java  |58 -
 .../curator/x/rpc/idl/structs/Version.java  |38 -
 .../src/main/resources/curator/help.txt |72 -
 curator-x-rpc/src/main/scripts/apply-thrift.sh  |36 -
 curator-x-rpc/src/main/scripts/generate.sh  |56 -
 curator-x-rpc/src/main/thrift/curator.thrift|   297 -
 .../site/confluence/configuration.confluence|   143 -
 .../src/site/confluence/deploy.confluence   |31 -
 .../src/site/confluence/events.confluence   |90 -
 .../src/site/confluence/index.confluence|49 -
 .../src/site/confluence/reference.confluence|   120 -
 .../src/site/confluence/usage.confluence  

[01/18] curator git commit: Squashed commit of the following:

[randgalt]

Repository: curator
Updated Branches:
  refs/heads/CURATOR-426 ee6859eee -> 71ed99d3d


http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java
deleted file mode 100644
index d629635..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Version implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("Version");
-
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = 
new org.apache.thrift.protocol.TField("version", 
org.apache.thrift.protocol.TType.I32, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new VersionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new VersionTupleSchemeFactory());
-  }
-
-  public int version; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-VERSION((short)1, "version");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // VERSION
-  return VERSION;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  private static final int __VERSION_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.VERSION, new 
org.apache.thrift.meta_data.FieldMetaData("version", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Version.class, 
metaDataMap);
-  }
-
-  public Version() {
-  }
-
-  public Version(
-int version)
-  {
-this();
-this.version = version;
-setVersionIsSet(true);
-  }
-
-  /**
-   * 

[02/16] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/PersistentEphemeralNodeProjection.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/PersistentEphemeralNodeProjection.java
 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/PersistentEphemeralNodeProjection.java
deleted file mode 100644
index 607f247..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/PersistentEphemeralNodeProjection.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class PersistentEphemeralNodeProjection implements 
org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("PersistentEphemeralNodeProjection");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("id", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
PersistentEphemeralNodeProjectionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new 
PersistentEphemeralNodeProjectionTupleSchemeFactory());
-  }
-
-  public String id; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-ID((short)1, "id");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // ID
-  return ID;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PersistentEphemeralNodeProjection.class,
 metaDataMap);
-  }
-
-  public PersistentEphemeralNodeProjection() {
-  }
-
-  public 

[14/16] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
deleted file mode 100644
index 2cb4462..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcChildData.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.curator.x.rpc.idl.structs;
-
-import com.facebook.swift.codec.ThriftField;
-import com.facebook.swift.codec.ThriftStruct;
-import org.apache.curator.framework.recipes.cache.ChildData;
-
-@ThriftStruct("ChildData")
-public class RpcChildData
-{
-@ThriftField(1)
-public String path;
-
-@ThriftField(2)
-public RpcStat stat;
-
-@ThriftField(3)
-public byte[] data;
-
-public RpcChildData()
-{
-}
-
-public RpcChildData(ChildData data)
-{
-if ( data != null )
-{
-this.path = data.getPath();
-this.stat = RpcCuratorEvent.toRpcStat(data.getStat());
-this.data = data.getData();
-}
-}
-
-public RpcChildData(String path, RpcStat stat, byte[] data)
-{
-this.path = path;
-this.stat = stat;
-this.data = data;
-}
-}

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
deleted file mode 100644
index 020f283..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCreateMode.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.curator.x.rpc.idl.structs;
-
-import com.facebook.swift.codec.ThriftEnum;
-
-@ThriftEnum("CreateMode")
-public enum RpcCreateMode
-{
-PERSISTENT,
-PERSISTENT_SEQUENTIAL,
-EPHEMERAL,
-EPHEMERAL_SEQUENTIAL,
-CONTAINER
-}

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
deleted file mode 100644
index 18591a5..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/structs/RpcCuratorEvent.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- 

[15/16] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
--
diff --git 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
 
b/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
deleted file mode 100644
index 42c90b9..000
--- 
a/curator-x-rpc/src/main/java/org/apache/curator/x/rpc/idl/discovery/DiscoveryServiceLowLevel.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.curator.x.rpc.idl.discovery;
-
-import com.facebook.swift.service.ThriftMethod;
-import com.facebook.swift.service.ThriftService;
-import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import org.apache.curator.utils.ThreadUtils;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceInstance;
-import org.apache.curator.x.rpc.connections.ConnectionManager;
-import org.apache.curator.x.rpc.connections.CuratorEntry;
-import org.apache.curator.x.rpc.idl.exceptions.RpcException;
-import org.apache.curator.x.rpc.idl.structs.CuratorProjection;
-import java.util.Collection;
-
-@ThriftService
-public class DiscoveryServiceLowLevel
-{
-private final ConnectionManager connectionManager;
-
-public DiscoveryServiceLowLevel(ConnectionManager connectionManager)
-{
-this.connectionManager = connectionManager;
-}
-
-@ThriftMethod
-public void registerInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
RpcException
-{
-try
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-serviceDiscovery.registerService(instance.toReal());
-}
-catch ( Exception e )
-{
-ThreadUtils.checkInterrupted(e);
-throw new RpcException(e);
-}
-}
-
-@ThriftMethod
-public void updateInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
RpcException
-{
-try
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-serviceDiscovery.updateService(instance.toReal());
-}
-catch ( Exception e )
-{
-ThreadUtils.checkInterrupted(e);
-throw new RpcException(e);
-}
-}
-
-@ThriftMethod
-public void unregisterInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
RpcException
-{
-try
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-serviceDiscovery.unregisterService(instance.toReal());
-}
-catch ( Exception e )
-{
-ThreadUtils.checkInterrupted(e);
-throw new RpcException(e);
-}
-}
-
-@ThriftMethod
-public Collection queryForNames(CuratorProjection projection, 
DiscoveryProjection discoveryProjection) throws RpcException
-{
-CuratorEntry entry = CuratorEntry.mustGetEntry(connectionManager, 
projection);
-@SuppressWarnings("unchecked")
-ServiceDiscovery serviceDiscovery = 
CuratorEntry.mustGetThing(entry, discoveryProjection.id, 
ServiceDiscovery.class);
-try
-

[07/16] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
deleted file mode 100644
index 169192e..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryServiceLowLevel.java
+++ /dev/null
@@ -1,6966 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DiscoveryServiceLowLevel {
-
-  public interface Iface {
-
-public DiscoveryInstance queryForInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String name, String id) throws 
CuratorException, org.apache.thrift.TException;
-
-public List queryForInstances(CuratorProjection 
projection, DiscoveryProjection discoveryProjection, String name) throws 
CuratorException, org.apache.thrift.TException;
-
-public List queryForNames(CuratorProjection projection, 
DiscoveryProjection discoveryProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public void registerInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
CuratorException, org.apache.thrift.TException;
-
-public void unregisterInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
CuratorException, org.apache.thrift.TException;
-
-public void updateInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance) throws 
CuratorException, org.apache.thrift.TException;
-
-  }
-
-  public interface AsyncIface {
-
-public void queryForInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String name, String id, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void queryForInstances(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String name, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void queryForNames(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void registerInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void unregisterInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void updateInstance(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, DiscoveryInstance instance, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-  }
-
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
-public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
-  public Factory() {}
-  public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
-return new Client(prot);
-  }
-  public Client getClient(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-return new Client(iprot, oprot);
-  }
-}
-
-public Client(org.apache.thrift.protocol.TProtocol prot)
-{
-  super(prot, prot);
-}
-
-public Client(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-  super(iprot, oprot);
-}
-
-

[11/16] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
deleted file mode 100644
index a2b18e3..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorProjection.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CuratorProjection implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("CuratorProjection");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("id", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
CuratorProjectionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new CuratorProjectionTupleSchemeFactory());
-  }
-
-  public String id; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-ID((short)1, "id");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // ID
-  return ID;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CuratorProjection.class,
 metaDataMap);
-  }
-
-  public CuratorProjection() {
-  }
-
-  public CuratorProjection(
-String id)
-  {
-this();
-this.id = id;
-  }
-
-  /**
-   * Performs a deep copy on other.
-   */
-  public CuratorProjection(CuratorProjection other) {
-if (other.isSetId()) {
-  

[04/16] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java
deleted file mode 100644
index d14f14d..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/LeaseProjection.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class LeaseProjection implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("LeaseProjection");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("id", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
LeaseProjectionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new LeaseProjectionTupleSchemeFactory());
-  }
-
-  public String id; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-ID((short)1, "id");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // ID
-  return ID;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LeaseProjection.class,
 metaDataMap);
-  }
-
-  public LeaseProjection() {
-  }
-
-  public LeaseProjection(
-String id)
-  {
-this();
-this.id = id;
-  }
-
-  /**
-   * Performs a deep copy on other.
-   */
-  public LeaseProjection(LeaseProjection other) {
-if (other.isSetId()) {
-  this.id = other.id;
-}
-  

[09/16] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java
deleted file mode 100644
index f278e6e..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/DeleteSpec.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DeleteSpec implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("DeleteSpec");
-
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new 
org.apache.thrift.protocol.TField("path", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField GUARANTEED_FIELD_DESC 
= new org.apache.thrift.protocol.TField("guaranteed", 
org.apache.thrift.protocol.TType.BOOL, (short)2);
-  private static final org.apache.thrift.protocol.TField 
ASYNC_CONTEXT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("asyncContext", 
org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = 
new org.apache.thrift.protocol.TField("version", 
org.apache.thrift.protocol.TType.STRUCT, (short)4);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new DeleteSpecStandardSchemeFactory());
-schemes.put(TupleScheme.class, new DeleteSpecTupleSchemeFactory());
-  }
-
-  public String path; // required
-  public boolean guaranteed; // required
-  public String asyncContext; // required
-  public Version version; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-PATH((short)1, "path"),
-GUARANTEED((short)2, "guaranteed"),
-ASYNC_CONTEXT((short)3, "asyncContext"),
-VERSION((short)4, "version");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // PATH
-  return PATH;
-case 2: // GUARANTEED
-  return GUARANTEED;
-case 3: // ASYNC_CONTEXT
-  return ASYNC_CONTEXT;
-case 4: // VERSION
-  return VERSION;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
- 

[01/16] curator git commit: Squashed commit of the following:

[randgalt]

Repository: curator
Updated Branches:
  refs/heads/master 7e611bd1c -> 95b70d2b4


http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java
deleted file mode 100644
index d629635..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/Version.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Version implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("Version");
-
-  private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = 
new org.apache.thrift.protocol.TField("version", 
org.apache.thrift.protocol.TType.I32, (short)1);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new VersionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new VersionTupleSchemeFactory());
-  }
-
-  public int version; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-VERSION((short)1, "version");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // VERSION
-  return VERSION;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  private static final int __VERSION_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.VERSION, new 
org.apache.thrift.meta_data.FieldMetaData("version", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
-
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Version.class, 
metaDataMap);
-  }
-
-  public Version() {
-  }
-
-  public Version(
-int version)
-  {
-this();
-this.version = version;
-setVersionIsSet(true);
-  }
-
-  /**
-   * Performs a 

[08/16] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
deleted file mode 100644
index 7e64f0f..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/DiscoveryService.java
+++ /dev/null
@@ -1,7236 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DiscoveryService {
-
-  public interface Iface {
-
-public List getAllInstances(CuratorProjection 
projection, DiscoveryProviderProjection providerProjection) throws 
CuratorException, org.apache.thrift.TException;
-
-public DiscoveryInstance getInstance(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public DiscoveryInstance makeDiscoveryInstance(String name, ByteBuffer 
payload, int port) throws CuratorException, org.apache.thrift.TException;
-
-public void noteError(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, String instanceId) throws 
CuratorException, org.apache.thrift.TException;
-
-public DiscoveryProjection startDiscovery(CuratorProjection projection, 
String basePath, DiscoveryInstance yourInstance) throws CuratorException, 
org.apache.thrift.TException;
-
-public DiscoveryProviderProjection startProvider(CuratorProjection 
projection, DiscoveryProjection discoveryProjection, String serviceName, 
ProviderStrategyType providerStrategy, int downTimeoutMs, int 
downErrorThreshold) throws CuratorException, org.apache.thrift.TException;
-
-  }
-
-  public interface AsyncIface {
-
-public void getAllInstances(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void getInstance(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void makeDiscoveryInstance(String name, ByteBuffer payload, int 
port, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void noteError(CuratorProjection projection, 
DiscoveryProviderProjection providerProjection, String instanceId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-public void startDiscovery(CuratorProjection projection, String basePath, 
DiscoveryInstance yourInstance, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
-
-public void startProvider(CuratorProjection projection, 
DiscoveryProjection discoveryProjection, String serviceName, 
ProviderStrategyType providerStrategy, int downTimeoutMs, int 
downErrorThreshold, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
-
-  }
-
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
-public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
-  public Factory() {}
-  public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
-return new Client(prot);
-  }
-  public Client getClient(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-return new Client(iprot, oprot);
-  }
-}
-
-public Client(org.apache.thrift.protocol.TProtocol prot)
-{
-  super(prot, prot);
-}
-
-public Client(org.apache.thrift.protocol.TProtocol iprot, 
org.apache.thrift.protocol.TProtocol oprot) {
-  super(iprot, oprot);
-}
-
-public List 

[13/16] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java
--
diff --git a/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java
deleted file mode 100644
index a31e11e..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/Acl.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class Acl implements org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("Acl");
-
-  private static final org.apache.thrift.protocol.TField PERMS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("perms", 
org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new 
org.apache.thrift.protocol.TField("id", 
org.apache.thrift.protocol.TType.STRUCT, (short)2);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new AclStandardSchemeFactory());
-schemes.put(TupleScheme.class, new AclTupleSchemeFactory());
-  }
-
-  public int perms; // required
-  public Id id; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-PERMS((short)1, "perms"),
-ID((short)2, "id");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // PERMS
-  return PERMS;
-case 2: // ID
-  return ID;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // isset id assignments
-  private static final int __PERMS_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> 
metaDataMap;
-  static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-tmpMap.put(_Fields.PERMS, new 
org.apache.thrift.meta_data.FieldMetaData("perms", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-new 

[05/16] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java
deleted file mode 100644
index 5644401..000
--- a/curator-x-rpc/src/test/java/org/apache/curator/generated/GetDataSpec.java
+++ /dev/null
@@ -1,680 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class GetDataSpec implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("GetDataSpec");
-
-  private static final org.apache.thrift.protocol.TField PATH_FIELD_DESC = new 
org.apache.thrift.protocol.TField("path", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField WATCHED_FIELD_DESC = 
new org.apache.thrift.protocol.TField("watched", 
org.apache.thrift.protocol.TType.BOOL, (short)2);
-  private static final org.apache.thrift.protocol.TField 
ASYNC_CONTEXT_FIELD_DESC = new 
org.apache.thrift.protocol.TField("asyncContext", 
org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField 
DECOMPRESSED_FIELD_DESC = new org.apache.thrift.protocol.TField("decompressed", 
org.apache.thrift.protocol.TType.BOOL, (short)4);
-
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new GetDataSpecStandardSchemeFactory());
-schemes.put(TupleScheme.class, new GetDataSpecTupleSchemeFactory());
-  }
-
-  public String path; // required
-  public boolean watched; // required
-  public String asyncContext; // required
-  public boolean decompressed; // required
-
-  /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-PATH((short)1, "path"),
-WATCHED((short)2, "watched"),
-ASYNC_CONTEXT((short)3, "asyncContext"),
-DECOMPRESSED((short)4, "decompressed");
-
-private static final Map byName = new HashMap();
-
-static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
-byName.put(field.getFieldName(), field);
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, or null if its not 
found.
- */
-public static _Fields findByThriftId(int fieldId) {
-  switch(fieldId) {
-case 1: // PATH
-  return PATH;
-case 2: // WATCHED
-  return WATCHED;
-case 3: // ASYNC_CONTEXT
-  return ASYNC_CONTEXT;
-case 4: // DECOMPRESSED
-  return DECOMPRESSED;
-default:
-  return null;
-  }
-}
-
-/**
- * Find the _Fields constant that matches fieldId, throwing an exception
- * if it is not found.
- */
-public static _Fields findByThriftIdOrThrow(int fieldId) {
-  _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
-  return fields;
-}
-
-/**
- * Find the _Fields constant that matches name, or null if its not found.
- */
-public static _Fields findByName(String name) {
-  return byName.get(name);
-}
-
-private final short _thriftId;
-private final String _fieldName;
-
-_Fields(short thriftId, String fieldName) {
-  _thriftId = thriftId;
-  _fieldName = fieldName;
-}
-
-public short getThriftFieldId() {
-  return _thriftId;
-}
-
-public String getFieldName() {
-  return _fieldName;
-}
-  }
-
-  // 

[10/16] curator git commit: Squashed commit of the following:

[randgalt]

http://git-wip-us.apache.org/repos/asf/curator/blob/95b70d2b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
--
diff --git 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java 
b/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
deleted file mode 100644
index 63d46ee..000
--- 
a/curator-x-rpc/src/test/java/org/apache/curator/generated/CuratorService.java
+++ /dev/null
@@ -1,24123 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.1)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.curator.generated;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CuratorService {
-
-  public interface Iface {
-
-public OptionalLockProjection acquireLock(CuratorProjection projection, 
String path, int maxWaitMs) throws CuratorException, 
org.apache.thrift.TException;
-
-public List acquireSemaphore(CuratorProjection 
projection, String path, int acquireQty, int maxWaitMs, int maxLeases) throws 
CuratorException, org.apache.thrift.TException;
-
-public void closeCuratorProjection(CuratorProjection projection) throws 
org.apache.thrift.TException;
-
-public boolean closeGenericProjection(CuratorProjection projection, String 
id) throws CuratorException, org.apache.thrift.TException;
-
-public OptionalPath createNode(CuratorProjection projection, CreateSpec 
spec) throws CuratorException, org.apache.thrift.TException;
-
-public void deleteNode(CuratorProjection projection, DeleteSpec spec) 
throws CuratorException, org.apache.thrift.TException;
-
-public OptionalStat exists(CuratorProjection projection, ExistsSpec spec) 
throws CuratorException, org.apache.thrift.TException;
-
-public OptionalChildrenList getChildren(CuratorProjection projection, 
GetChildrenSpec spec) throws CuratorException, org.apache.thrift.TException;
-
-public OptionalData getData(CuratorProjection projection, GetDataSpec 
spec) throws CuratorException, org.apache.thrift.TException;
-
-public List getLeaderParticipants(CuratorProjection 
projection, LeaderProjection leaderProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public ChildData getNodeCacheData(CuratorProjection projection, 
NodeCacheProjection cacheProjection) throws CuratorException, 
org.apache.thrift.TException;
-
-public List getPathChildrenCacheData(CuratorProjection 
projection, PathChildrenCacheProjection cacheProjection) throws 
CuratorException, org.apache.thrift.TException;
-
-public ChildData getPathChildrenCacheDataForPath(CuratorProjection 
projection, PathChildrenCacheProjection cacheProjection, String path) throws 
CuratorException, org.apache.thrift.TException;
-
-public boolean isLeader(CuratorProjection projection, LeaderProjection 
leaderProjection) throws CuratorException, org.apache.thrift.TException;
-
-public CuratorProjection newCuratorProjection(String connectionName) 
throws CuratorException, org.apache.thrift.TException;
-
-public void pingCuratorProjection(CuratorProjection projection) throws 
org.apache.thrift.TException;
-
-public OptionalStat setData(CuratorProjection projection, SetDataSpec 
spec) throws CuratorException, org.apache.thrift.TException;
-
-public LeaderResult startLeaderSelector(CuratorProjection projection, 
String path, String participantId, int waitForLeadershipMs) throws 
CuratorException, org.apache.thrift.TException;
-
-public NodeCacheProjection startNodeCache(CuratorProjection projection, 
String path, boolean dataIsCompressed, boolean buildInitial) throws 
CuratorException, org.apache.thrift.TException;
-
-public PathChildrenCacheProjection 
startPathChildrenCache(CuratorProjection projection, String path, boolean 
cacheData, boolean dataIsCompressed, PathChildrenCacheStartMode startMode) 
throws CuratorException, org.apache.thrift.TException;
-
-public PersistentEphemeralNodeProjection 
startPersistentEphemeralNode(CuratorProjection projection, String path, 
ByteBuffer data, 

[16/16] curator git commit: Squashed commit of the following:

[randgalt]

Squashed commit of the following:

commit 1e7902427f627f0efc5e2486437929a26bd237bd
Author: randgalt 
Date:   Thu Jul 20 14:42:41 2017 -0500

Remove Curator RPC code from git

commit 939994838320b7f0394bdf4f8919df101f5b7359
Author: randgalt 
Date:   Thu Jul 20 13:54:44 2017 -0500

Removed Curator RPC


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

Branch: refs/heads/master
Commit: 95b70d2b4b04ca86194cbf54e9b5dc1869b36b3b
Parents: 7e611bd
Author: randgalt 
Authored: Fri Jul 21 06:29:57 2017 -0500
Committer: randgalt 
Committed: Fri Jul 21 06:29:57 2017 -0500

--
 curator-x-rpc/pom.xml   |   189 -
 .../curator/x/rpc/CuratorProjectionServer.java  |   152 -
 .../AuthorizationConfiguration.java |45 -
 ...dedExponentialBackoffRetryConfiguration.java |69 -
 .../x/rpc/configuration/Configuration.java  |86 -
 .../rpc/configuration/ConfigurationBuilder.java |87 -
 .../configuration/ConnectionConfiguration.java  |   129 -
 .../ExponentialBackoffRetryConfiguration.java   |58 -
 .../configuration/RetryNTimesConfiguration.java |58 -
 .../configuration/RetryPolicyConfiguration.java |28 -
 .../curator/x/rpc/connections/Closer.java   |24 -
 .../x/rpc/connections/ConnectionManager.java|   141 -
 .../curator/x/rpc/connections/CuratorEntry.java |   170 -
 .../x/rpc/details/RpcBackgroundCallback.java|44 -
 .../curator/x/rpc/details/RpcWatcher.java   |43 -
 .../x/rpc/idl/discovery/DiscoveryInstance.java  |95 -
 .../idl/discovery/DiscoveryInstanceType.java|26 -
 .../rpc/idl/discovery/DiscoveryProjection.java  |38 -
 .../discovery/DiscoveryProviderProjection.java  |38 -
 .../x/rpc/idl/discovery/DiscoveryService.java   |   259 -
 .../idl/discovery/DiscoveryServiceLowLevel.java |   159 -
 .../rpc/idl/discovery/ProviderStrategyType.java |27 -
 .../x/rpc/idl/exceptions/ExceptionType.java |26 -
 .../x/rpc/idl/exceptions/NodeExceptionType.java |27 -
 .../x/rpc/idl/exceptions/RpcException.java  |98 -
 .../idl/exceptions/ZooKeeperExceptionType.java  |40 -
 .../idl/services/CuratorProjectionService.java  |   765 -
 .../x/rpc/idl/services/EventService.java|55 -
 .../curator/x/rpc/idl/structs/CreateSpec.java   |66 -
 .../x/rpc/idl/structs/CuratorProjection.java|38 -
 .../curator/x/rpc/idl/structs/DeleteSpec.java   |50 -
 .../curator/x/rpc/idl/structs/ExistsSpec.java   |46 -
 .../x/rpc/idl/structs/GetChildrenSpec.java  |46 -
 .../curator/x/rpc/idl/structs/GetDataSpec.java  |50 -
 .../curator/x/rpc/idl/structs/LeaderEvent.java  |46 -
 .../x/rpc/idl/structs/LeaderProjection.java |38 -
 .../curator/x/rpc/idl/structs/LeaderResult.java |42 -
 .../x/rpc/idl/structs/LeaseProjection.java  |38 -
 .../x/rpc/idl/structs/LockProjection.java   |38 -
 .../x/rpc/idl/structs/NodeCacheProjection.java  |38 -
 .../x/rpc/idl/structs/OptionalChildrenList.java |39 -
 .../curator/x/rpc/idl/structs/OptionalData.java |38 -
 .../rpc/idl/structs/OptionalLockProjection.java |38 -
 .../curator/x/rpc/idl/structs/OptionalPath.java |38 -
 .../x/rpc/idl/structs/OptionalRpcStat.java  |38 -
 .../structs/PathChildrenCacheProjection.java|38 -
 .../idl/structs/PathChildrenCacheStartMode.java |26 -
 .../PersistentEphemeralNodeProjection.java  |38 -
 .../curator/x/rpc/idl/structs/RpcAcl.java   |42 -
 .../curator/x/rpc/idl/structs/RpcChildData.java |57 -
 .../x/rpc/idl/structs/RpcCreateMode.java|31 -
 .../x/rpc/idl/structs/RpcCuratorEvent.java  |   224 -
 .../x/rpc/idl/structs/RpcCuratorEventType.java  |46 -
 .../curator/x/rpc/idl/structs/RpcEventType.java |31 -
 .../apache/curator/x/rpc/idl/structs/RpcId.java |42 -
 .../x/rpc/idl/structs/RpcKeeperState.java   |34 -
 .../x/rpc/idl/structs/RpcParticipant.java   |42 -
 .../idl/structs/RpcPathChildrenCacheEvent.java  |54 -
 .../structs/RpcPathChildrenCacheEventType.java  |33 -
 .../structs/RpcPersistentEphemeralNodeMode.java |30 -
 .../curator/x/rpc/idl/structs/RpcStat.java  |95 -
 .../x/rpc/idl/structs/RpcWatchedEvent.java  |54 -
 .../curator/x/rpc/idl/structs/SetDataSpec.java  |58 -
 .../curator/x/rpc/idl/structs/Version.java  |38 -
 .../src/main/resources/curator/help.txt |72 -
 curator-x-rpc/src/main/scripts/apply-thrift.sh  |36 -
 curator-x-rpc/src/main/scripts/generate.sh  |56 -
 curator-x-rpc/src/main/thrift/curator.thrift|   297 -