[07/15] incubator-twill git commit: (TWILL-69) Removed guava dependencies from twill-api and twill-common modules

[ch...@apache.org]

http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/97f2c37b/twill-zookeeper/src/main/java/org/apache/twill/zookeeper/ZKClientService.java
----------------------------------------------------------------------
diff --git a/twill-zookeeper/src/main/java/org/apache/twill/zookeeper/ZKClientService.java b/twill-zookeeper/src/main/java/org/apache/twill/zookeeper/ZKClientService.java
index 33c23aa..7052044 100644
--- a/twill-zookeeper/src/main/java/org/apache/twill/zookeeper/ZKClientService.java
+++ b/twill-zookeeper/src/main/java/org/apache/twill/zookeeper/ZKClientService.java
@@ -24,6 +24,7 @@ import com.google.common.util.concurrent.Service;
 import org.apache.twill.internal.zookeeper.DefaultZKClientService;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
+import org.apache.zookeeper.server.ZooKeeperServer;
 
 /**
  * A {@link ZKClient} that extends from {@link Service} to provide lifecycle management functions.
@@ -44,10 +45,10 @@ public interface ZKClientService extends ZKClient, Service {
    * Builder for creating an implementation of {@link ZKClientService}.
    * The default client timeout is 10000ms.
    */
-  public static final class Builder {
+  final class Builder {
 
     private final String connectStr;
-    private int timeout = 10000;
+    private int timeout = ZooKeeperServer.DEFAULT_TICK_TIME * 20;
     private Watcher connectionWatcher;
     private Multimap<String, byte[]> auths = ArrayListMultimap.create();
 

http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/97f2c37b/twill-zookeeper/src/test/java/org/apache/twill/zookeeper/ZKClientTest.java
----------------------------------------------------------------------
diff --git a/twill-zookeeper/src/test/java/org/apache/twill/zookeeper/ZKClientTest.java b/twill-zookeeper/src/test/java/org/apache/twill/zookeeper/ZKClientTest.java
index dc1b9eb..c9e7e58 100644
--- a/twill-zookeeper/src/test/java/org/apache/twill/zookeeper/ZKClientTest.java
+++ b/twill-zookeeper/src/test/java/org/apache/twill/zookeeper/ZKClientTest.java
@@ -197,14 +197,14 @@ public class ZKClientTest {
         });
 
         client.create("/expireRewatch", null, CreateMode.PERSISTENT);
-        Assert.assertEquals(Watcher.Event.EventType.NodeCreated, events.poll(20, TimeUnit.SECONDS));
+        Assert.assertEquals(Watcher.Event.EventType.NodeCreated, events.poll(60, TimeUnit.SECONDS));
 
         KillZKSession.kill(client.getZooKeeperSupplier().get(), zkServer.getConnectionStr(), 10000);
 
-        Assert.assertTrue(expireReconnectLatch.await(20, TimeUnit.SECONDS));
+        Assert.assertTrue(expireReconnectLatch.await(60, TimeUnit.SECONDS));
 
         client.delete("/expireRewatch");
-        Assert.assertEquals(Watcher.Event.EventType.NodeDeleted, events.poll(20, TimeUnit.SECONDS));
+        Assert.assertEquals(Watcher.Event.EventType.NodeDeleted, events.poll(60, TimeUnit.SECONDS));
       } finally {
         client.stopAndWait();
       }