From d82219b63b5ac37aa1c215d3d64c4121851b92b3 Mon Sep 17 00:00:00 2001
From: Miles-Garnsey <miles.garnsey@datastax.com>
Date: Wed, 23 Aug 2023 18:46:12 +1000
Subject: [PATCH] Fix rebase problems.

---
 .../com/datastax/mgmtapi/NodeOpsProvider.java | 18 ++++-----
 .../mgmtapi/rpc/models/RingRange.java         | 37 +++++++++++++++++++
 2 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 management-api-agent-common/src/main/java/com/datastax/mgmtapi/rpc/models/RingRange.java

diff --git a/management-api-agent-common/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java b/management-api-agent-common/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java
index 6fc701ba..1c573550 100644
--- a/management-api-agent-common/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java
+++ b/management-api-agent-common/src/main/java/com/datastax/mgmtapi/NodeOpsProvider.java
@@ -744,10 +744,10 @@ public String repair(
       @RpcParam(name = "tables") List<String> tables,
       @RpcParam(name = "full") Boolean full,
       @RpcParam(name = "notifications") boolean notifications,
-      @RpcParam(name = "repairParallelism") RepairParallelism repairParallelism,
-      @RpcParam(name = "datacenters") Collection<String> datacenters,
-      @RpcParam(name = "associatedTokens") List<RingRange> associatedTokens,
-      @RpcParam(name = "repairThreadCount") int repairThreadCount)
+      @RpcParam(name = "repairParallelism") Optional<RepairParallelism> repairParallelism,
+      @RpcParam(name = "datacenters") Optional<Collection<String>> datacenters,
+      @RpcParam(name = "associatedTokens") Optional<List<RingRange>> associatedTokens,
+      @RpcParam(name = "repairThreadCount") Optional<Integer> repairThreadCount)
       throws IOException {
     // At least one keyspace is required
     assert(keyspace != null);
@@ -776,7 +776,7 @@ public String repair(
                     .collect(Collectors.toList()),
                 ",")
                 )
-            ));
+            );
           }
       datacenters.map( dcs ->
           options.put(RepairOption.DATACENTERS_KEY, StringUtils.join(dcs, ","))
@@ -784,8 +784,8 @@ public String repair(
 
       // Since Cassandra provides us with a async, we don't need to use our executor interface for
       // this.
-      final int repairJobId =
-          ShimLoader.instance.get().getStorageService().repairAsync(keyspace, options);
+     final int repairJobId =
+    ShimLoader.instance.get().getStorageService().repairAsync(keyspace, options);
 
       if (!notifications) {
         return Integer.valueOf(repairJobId).toString();
@@ -850,10 +850,6 @@ public String repair(
       return job.getJobId();
     }
 
-    throw new RuntimeException("At least one keyspace must be defined");
-
-  }
-
   @Rpc(name = "move")
   public String move(
       @RpcParam(name = "newToken") String newToken, @RpcParam(name = "async") boolean async)
diff --git a/management-api-agent-common/src/main/java/com/datastax/mgmtapi/rpc/models/RingRange.java b/management-api-agent-common/src/main/java/com/datastax/mgmtapi/rpc/models/RingRange.java
new file mode 100644
index 00000000..8d81b8ed
--- /dev/null
+++ b/management-api-agent-common/src/main/java/com/datastax/mgmtapi/rpc/models/RingRange.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+
+package com.datastax.mgmtapi.rpc.models;
+
+import java.math.BigInteger;
+import java.util.Comparator;
+
+public final class RingRange {
+
+  public static final Comparator<RingRange> START_COMPARATOR
+      = (RingRange o1, RingRange o2) -> o1.start.compareTo(o2.start);
+
+  public final BigInteger start;
+  public final BigInteger end;
+
+  public RingRange(BigInteger start, BigInteger end) {
+    this.start = start;
+    this.end = end;
+  }
+
+  public RingRange(String... range) {
+    start = new BigInteger(range[0]);
+    end = new BigInteger(range[1]);
+  }
+
+  public BigInteger getStart() {
+    return start;
+  }
+
+  public BigInteger getEnd() {
+    return end;
+  }
+}
\ No newline at end of file