Address jetcd deprecation warnings

Author: jdhoek

uniqueid-etcd/src/main/java/org/lable/oss/uniqueid/etcd/EtcdHelper.java

@@ -100,7 +100,7 @@ public void onCompleted() {
     }
 
     @FunctionalInterface
-    interface OnRelease {
+    public interface OnRelease {
         void cleanUp();
     }
 }

uniqueid-etcd/src/main/java/org/lable/oss/uniqueid/etcd/RegistryBasedResourceClaim.java

@@ -27,6 +27,7 @@
 import io.etcd.jetcd.op.CmpTarget;
 import io.etcd.jetcd.op.Op;
 import io.etcd.jetcd.options.GetOption;
+import io.etcd.jetcd.options.OptionsUtil;
 import io.etcd.jetcd.options.PutOption;
 import io.etcd.jetcd.options.WatchOption;
 import org.slf4j.Logger;
@@ -177,9 +178,9 @@ ResourcePair claimResource(Client etcd,
 
         int registrySize = maxGeneratorCount * clusterIds.size();
 
-        GetOption getOptions = GetOption.newBuilder()
+        GetOption getOptions = GetOption.builder()
                 .withKeysOnly(true)
-                .withPrefix(REGISTRY_KEY)
+                .withRange(OptionsUtil.prefixEndOf(REGISTRY_KEY))
                 .build();
         GetResponse get = etcd.getKVClient().get(REGISTRY_KEY, getOptions).get();
 
@@ -198,7 +199,9 @@ ResourcePair claimResource(Client etcd,
             final CountDownLatch latch = new CountDownLatch(1);
             Watch.Watcher watcher = etcd.getWatchClient().watch(
                     REGISTRY_KEY,
-                    WatchOption.newBuilder().withPrefix(REGISTRY_KEY).build(),
+                    WatchOption.builder()
+                            .withRange(OptionsUtil.prefixEndOf(REGISTRY_KEY))
+                            .build(),
                     watchResponse -> latch.countDown()
             );
             awaitLatchUnlessItTakesTooLong(latch, giveUpAfter);
@@ -221,7 +224,7 @@ ResourcePair claimResource(Client etcd,
                                     Op.put(
                                             resourcePath,
                                             ByteSequence.from(registryEntry, StandardCharsets.UTF_8),
-                                            PutOption.newBuilder().build()
+                                            PutOption.builder().build()
                                     )
                             ).commit().get();
 

uniqueid-etcd/src/main/java/org/lable/oss/uniqueid/etcd/ResourceClaim.java

@@ -27,6 +27,7 @@
 import io.etcd.jetcd.op.CmpTarget;
 import io.etcd.jetcd.op.Op;
 import io.etcd.jetcd.options.GetOption;
+import io.etcd.jetcd.options.OptionsUtil;
 import io.etcd.jetcd.options.PutOption;
 import io.etcd.jetcd.options.WatchOption;
 import io.etcd.jetcd.support.CloseableClient;
@@ -242,9 +243,9 @@ ResourcePair claimResource(Client etcd, int maxGeneratorCount, List<Integer> clu
 
         int poolSize = maxGeneratorCount * clusterIds.size();
 
-        GetOption getOptions = GetOption.newBuilder()
+        GetOption getOptions = GetOption.builder()
                 .withKeysOnly(true)
-                .withPrefix(POOL_KEY)
+                .withRange(OptionsUtil.prefixEndOf(POOL_KEY))
                 .build();
         GetResponse get = etcd.getKVClient().get(POOL_KEY, getOptions).get();
 
@@ -258,7 +259,10 @@ ResourcePair claimResource(Client etcd, int maxGeneratorCount, List<Integer> clu
             final CountDownLatch latch = new CountDownLatch(1);
             Watch.Watcher watcher = etcd.getWatchClient().watch(
                     POOL_KEY,
-                    WatchOption.newBuilder().withPrefix(POOL_KEY).build(),
+                    WatchOption
+                            .builder()
+                            .withRange(OptionsUtil.prefixEndOf(POOL_KEY))
+                            .build(),
                     watchResponse -> latch.countDown()
             );
             awaitLatchUnlessItTakesTooLong(latch, giveUpAfter);
@@ -281,7 +285,7 @@ ResourcePair claimResource(Client etcd, int maxGeneratorCount, List<Integer> clu
                                     Op.put(
                                             resourcePath,
                                             ByteSequence.EMPTY,
-                                            PutOption.newBuilder().withLeaseId(leaseId).build()
+                                            PutOption.builder().withLeaseId(leaseId).build()
                                     )
                             ).commit().get();
 

uniqueid-etcd/src/test/java/org/lable/oss/uniqueid/etcd/EtcdTestCluster.java

@@ -69,6 +69,7 @@ public void evaluate() throws Throwable {
                         .withClusterName(clusterName)
                         .withNodes(nodes)
                         .withSsl(ssl)
+                        .withMountedDataDirectory(false)
                         .build();
 
                 cluster.start();