diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-09-17 06:34:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-17 06:34:11 +0200 |
commit | a7a14309b04838023f26c41d294f29eaf6303d5d (patch) | |
tree | 3832bee43ce7c2d1df314897dd9071bb15444618 /clustercontroller-core | |
parent | 4e7d59fc813746b2795ee713b137203c43c80a07 (diff) |
Revert "Hmusum/upgrade to zookeeper 3.5"
Diffstat (limited to 'clustercontroller-core')
-rw-r--r-- | clustercontroller-core/pom.xml | 7 | ||||
-rw-r--r-- | clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java | 26 |
2 files changed, 9 insertions, 24 deletions
diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index 9ac7c93134c..3b1cb16aa96 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -66,13 +66,6 @@ <scope>provided</scope> </dependency> <dependency> - <!-- Not used by this module, but compilation fails without it because zookeeper uses these annotations. - Provided scoped here to avoid dependents getting it transitively. --> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-annotations</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> <scope>provided</scope> diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java index adba17040f0..880f2cdaf19 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java @@ -1,33 +1,25 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.clustercontroller.core.database; -import com.yahoo.log.LogLevel; -import com.yahoo.vdslib.state.Node; -import com.yahoo.vdslib.state.NodeState; -import com.yahoo.vdslib.state.State; import com.yahoo.vespa.clustercontroller.core.AnnotatedClusterState; import com.yahoo.vespa.clustercontroller.core.ClusterStateBundle; import com.yahoo.vespa.clustercontroller.core.ContentCluster; import com.yahoo.vespa.clustercontroller.core.rpc.EnvelopedClusterStateBundleCodec; import com.yahoo.vespa.clustercontroller.core.rpc.SlimeClusterStateBundleCodec; -import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.KeeperException; -import org.apache.zookeeper.WatchedEvent; -import org.apache.zookeeper.Watcher; -import org.apache.zookeeper.ZooDefs; -import org.apache.zookeeper.ZooKeeper; -import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.*; import org.apache.zookeeper.data.Stat; +import org.apache.zookeeper.data.ACL; +import com.yahoo.log.LogLevel; +import com.yahoo.vdslib.state.NodeState; +import com.yahoo.vdslib.state.State; +import com.yahoo.vdslib.state.Node; +import java.util.logging.Logger; +import java.util.*; import java.io.IOException; -import java.io.PrintWriter; import java.io.StringWriter; +import java.io.PrintWriter; import java.nio.charset.Charset; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; -import java.util.TreeMap; -import java.util.logging.Logger; public class ZooKeeperDatabase extends Database { |