diff options
author | Martin Polden <mpolden@mpolden.no> | 2024-03-05 14:42:05 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2024-03-05 14:44:45 +0100 |
commit | e8e099766712a504bda2a96e664265cd77a3c223 (patch) | |
tree | 606664971d39599dfdcb3b24a379210bc151f245 | |
parent | 65c1240681f7e4d091776974a2f4348937d00d75 (diff) |
Move ExponentialBackoff to vespajlib
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/time/ExponentialBackoff.java (renamed from zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ExponentialBackoff.java) | 2 | ||||
-rw-r--r-- | vespajlib/src/test/java/com/yahoo/time/ExponentialBackoffTest.java (renamed from zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ExponentialBackoffTest.java) | 3 | ||||
-rw-r--r-- | zookeeper-common/pom.xml | 7 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java | 1 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java | 1 |
5 files changed, 11 insertions, 3 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ExponentialBackoff.java b/vespajlib/src/main/java/com/yahoo/time/ExponentialBackoff.java index 590504f74b9..95926a143e0 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ExponentialBackoff.java +++ b/vespajlib/src/main/java/com/yahoo/time/ExponentialBackoff.java @@ -1,5 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.zookeeper; +package com.yahoo.time; import java.time.Duration; import java.util.Random; diff --git a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ExponentialBackoffTest.java b/vespajlib/src/test/java/com/yahoo/time/ExponentialBackoffTest.java index bc5c4531e51..07295891cd0 100644 --- a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ExponentialBackoffTest.java +++ b/vespajlib/src/test/java/com/yahoo/time/ExponentialBackoffTest.java @@ -1,12 +1,11 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.zookeeper; +package com.yahoo.time; import org.junit.Test; import java.time.Duration; import java.util.List; import java.util.Random; -import java.util.stream.Collectors; import java.util.stream.IntStream; import static org.junit.Assert.assertEquals; diff --git a/zookeeper-common/pom.xml b/zookeeper-common/pom.xml index 2c8ed8fe476..16dc7d07f9b 100644 --- a/zookeeper-common/pom.xml +++ b/zookeeper-common/pom.xml @@ -23,6 +23,13 @@ <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>vespajlib</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>defaults</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java index 201bb7af272..755dcd5c8e3 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java @@ -5,6 +5,7 @@ import com.yahoo.cloud.config.ZookeeperServerConfig; import com.yahoo.component.AbstractComponent; import com.yahoo.component.annotation.Inject; import com.yahoo.protect.Process; +import com.yahoo.time.ExponentialBackoff; import com.yahoo.vespa.zookeeper.server.VespaZooKeeperServer; import com.yahoo.yolean.Exceptions; diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java index 9c18dde3380..9234fa4cc36 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.zookeeper; import com.yahoo.cloud.config.ZookeeperServerConfig; import com.yahoo.concurrent.DaemonThreadFactory; import com.yahoo.protect.Process; +import com.yahoo.time.ExponentialBackoff; import com.yahoo.vespa.zookeeper.server.VespaZooKeeperServer; import com.yahoo.yolean.Exceptions; |