parameters,
+ @JsonProperty("wildcardType") String wildcardType,
+ @JsonProperty("wildcardSubtype") String wildcardSubtype) {
+ this.type = type;
+ this.subtype = subtype;
+ this.parameters = parameters;
+ this.wildcardType = wildcardType;
+ this.wildcardSubtype = wildcardSubtype;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 5;
+ hash = 83 * hash + Objects.hashCode(this.type);
+ hash = 83 * hash + Objects.hashCode(this.subtype);
+ hash = 83 * hash + Objects.hashCode(this.parameters);
+ hash = 83 * hash + Objects.hashCode(this.wildcardType);
+ hash = 83 * hash + Objects.hashCode(this.wildcardSubtype);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final MediaType other = (MediaType) obj;
+ if (!Objects.equals(this.type, other.type)) {
+ return false;
+ }
+ if (!Objects.equals(this.subtype, other.subtype)) {
+ return false;
+ }
+ if (!Objects.equals(this.parameters, other.parameters)) {
+ return false;
+ }
+ if (!Objects.equals(this.wildcardType, other.wildcardType)) {
+ return false;
+ }
+ return Objects.equals(this.wildcardSubtype, other.wildcardSubtype);
+ }
+ }
+
+ public static class Variant {
+
+ @JsonProperty(value = "language", required = false)
+ public final String language;
+
+ @JsonProperty(value = "mediaType", required = false)
+ public final MediaType mediaType;
+
+ @JsonProperty(value = "encoding", required = false)
+ public final String encoding;
+
+ @JsonProperty(value = "languageString", required = false)
+ public final String languageString;
+
+ @JsonCreator
+ public Variant(
+ @JsonProperty("language") String language,
+ @JsonProperty("mediaType") MediaType mediaType,
+ @JsonProperty("encoding") String encoding,
+ @JsonProperty("languageString") String languageString) {
+ this.language = language;
+ this.mediaType = mediaType;
+ this.encoding = encoding;
+ this.languageString = languageString;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 5;
+ hash = 83 * hash + Objects.hashCode(this.language);
+ hash = 83 * hash + Objects.hashCode(this.mediaType);
+ hash = 83 * hash + Objects.hashCode(this.encoding);
+ hash = 83 * hash + Objects.hashCode(this.languageString);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final Variant other = (Variant) obj;
+ if (!Objects.equals(this.language, other.language)) {
+ return false;
+ }
+ if (!Objects.equals(this.mediaType, other.mediaType)) {
+ return false;
+ }
+ if (!Objects.equals(this.encoding, other.encoding)) {
+ return false;
+ }
+ return Objects.equals(this.languageString, other.languageString);
+ }
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Compaction.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Compaction.java
new file mode 100644
index 00000000..6c648a92
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Compaction.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+package com.datastax.mgmtapi.resources.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Describes the state of an active compaction running on the server.
+ *
+ * Some fields are specific to certain Cassandra versions, this is indicated in their comment.
+ */
+public class Compaction {
+
+ // Note: for simplicity, we use the same keys in our JSON payload as the map returned by
+ // Cassandra. These constants are used for both, do not change them or the corresponding JSON
+ // fields will always be empty.
+ private static final String ID_KEY = "id";
+ private static final String KEYSPACE_KEY = "keyspace";
+ private static final String COLUMN_FAMILY_KEY = "columnfamily";
+ private static final String COMPLETED_KEY = "completed";
+ private static final String TOTAL_KEY = "total";
+ private static final String TASK_TYPE_KEY = "taskType";
+ private static final String UNIT_KEY = "unit";
+ private static final String COMPACTION_ID_KEY = "compactionId";
+ private static final String SSTABLES_KEY = "sstables";
+ private static final String TARGET_DIRECTORY_KEY = "targetDirectory";
+ private static final String OPERATION_TYPE_KEY = "operationType";
+ private static final String OPERATION_ID_KEY = "operationId";
+ private static final String DESCRIPTION_KEY = "description";
+
+ @JsonProperty(ID_KEY)
+ public final String id;
+
+ @JsonProperty(KEYSPACE_KEY)
+ public final String keyspace;
+
+ @JsonProperty(COLUMN_FAMILY_KEY)
+ public final String columnFamily;
+
+ @JsonProperty(COMPLETED_KEY)
+ public final Long completed;
+
+ @JsonProperty(TOTAL_KEY)
+ public final Long total;
+
+ /** Only present in OSS Cassandra. */
+ @JsonProperty(TASK_TYPE_KEY)
+ public final String taskType;
+
+ @JsonProperty(UNIT_KEY)
+ public final String unit;
+
+ /** Only present in OSS Cassandra. */
+ @JsonProperty(COMPACTION_ID_KEY)
+ public final String compactionId;
+
+ /** Only present in OSS Cassandra 4 or above. */
+ @JsonProperty(SSTABLES_KEY)
+ public final String ssTables;
+
+ /** Only present in OSS Cassandra 5. */
+ @JsonProperty(TARGET_DIRECTORY_KEY)
+ public final String targetDirectory;
+
+ /** Only present in DSE. */
+ @JsonProperty(OPERATION_TYPE_KEY)
+ public final String operationType;
+
+ /** Only present in DSE. */
+ @JsonProperty(OPERATION_ID_KEY)
+ public final String operationId;
+
+ /** Only present in DSE 6.8. */
+ @JsonProperty(DESCRIPTION_KEY)
+ public final String description;
+
+ @JsonCreator
+ public Compaction(
+ @JsonProperty(ID_KEY) String id,
+ @JsonProperty(KEYSPACE_KEY) String keyspace,
+ @JsonProperty(COLUMN_FAMILY_KEY) String columnFamily,
+ @JsonProperty(COMPLETED_KEY) Long completed,
+ @JsonProperty(TOTAL_KEY) Long total,
+ @JsonProperty(TASK_TYPE_KEY) String taskType,
+ @JsonProperty(UNIT_KEY) String unit,
+ @JsonProperty(COMPACTION_ID_KEY) String compactionId,
+ @JsonProperty(SSTABLES_KEY) String ssTables,
+ @JsonProperty(TARGET_DIRECTORY_KEY) String targetDirectory,
+ @JsonProperty(OPERATION_TYPE_KEY) String operationType,
+ @JsonProperty(OPERATION_ID_KEY) String operationId,
+ @JsonProperty(DESCRIPTION_KEY) String description) {
+
+ this.id = id;
+ this.keyspace = keyspace;
+ this.columnFamily = columnFamily;
+ this.completed = completed;
+ this.total = total;
+ this.taskType = taskType;
+ this.unit = unit;
+ this.compactionId = compactionId;
+ this.ssTables = ssTables;
+ this.targetDirectory = targetDirectory;
+ this.operationId = operationId;
+ this.operationType = operationType;
+ this.description = description;
+ }
+
+ public static Compaction fromMap(Map m) {
+ return new Compaction(
+ m.get(ID_KEY),
+ m.get(KEYSPACE_KEY),
+ m.get(COLUMN_FAMILY_KEY),
+ parseLongOrNull(m.get(COMPLETED_KEY)),
+ parseLongOrNull(m.get(TOTAL_KEY)),
+ m.get(TASK_TYPE_KEY),
+ m.get(UNIT_KEY),
+ m.get(COMPACTION_ID_KEY),
+ m.get(SSTABLES_KEY),
+ m.get(TARGET_DIRECTORY_KEY),
+ m.get(OPERATION_TYPE_KEY),
+ m.get(OPERATION_ID_KEY),
+ m.get(DESCRIPTION_KEY));
+ }
+
+ private static Long parseLongOrNull(String s) {
+ try {
+ return Long.parseLong(s);
+ } catch (NumberFormatException e) {
+ return null;
+ }
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ Compaction that = (Compaction) o;
+ return Objects.equals(id, that.id)
+ && Objects.equals(keyspace, that.keyspace)
+ && Objects.equals(columnFamily, that.columnFamily)
+ && Objects.equals(completed, that.completed)
+ && Objects.equals(total, that.total)
+ && Objects.equals(taskType, that.taskType)
+ && Objects.equals(unit, that.unit)
+ && Objects.equals(compactionId, that.compactionId)
+ && Objects.equals(ssTables, that.ssTables)
+ && Objects.equals(targetDirectory, that.targetDirectory)
+ && Objects.equals(operationType, that.operationType)
+ && Objects.equals(operationId, that.operationId)
+ && Objects.equals(description, that.description);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(
+ id,
+ keyspace,
+ columnFamily,
+ completed,
+ total,
+ taskType,
+ unit,
+ compactionId,
+ ssTables,
+ targetDirectory,
+ operationType,
+ operationId,
+ description);
+ }
+
+ @Override
+ public String toString() {
+ try {
+ return new ObjectMapper().writeValueAsString(this);
+ } catch (JsonProcessingException je) {
+ return String.format("Unable to format compaction (%s)", je.getMessage());
+ }
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/EndpointStates.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/EndpointStates.java
index 6591f5f2..54f44e84 100644
--- a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/EndpointStates.java
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/EndpointStates.java
@@ -7,30 +7,17 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-public class EndpointStates {
+public class EndpointStates extends BaseEntity {
@JsonProperty(value = "entity", required = true)
public final List> entity;
- @JsonProperty(value = "variant", required = false)
- public final Variant variant;
-
- @JsonProperty(value = "annotations", required = false)
- public final List annotations;
-
- @JsonProperty(value = "mediaType", required = false)
- public final MediaType mediaType;
-
- @JsonProperty(value = "language", required = false)
- public final String language;
-
- @JsonProperty(value = "encoding", required = false)
- public final String encoding;
-
@JsonCreator
public EndpointStates(
@JsonProperty("entity") List> entity,
@@ -39,23 +26,14 @@ public EndpointStates(
@JsonProperty("mediaType") MediaType mediaType,
@JsonProperty("language") String language,
@JsonProperty("encoding") String encoding) {
+ super(variant, annotations, mediaType, language, encoding);
this.entity = entity;
- this.variant = variant;
- this.annotations = annotations;
- this.mediaType = mediaType;
- this.language = language;
- this.encoding = encoding;
}
@Override
public int hashCode() {
- int hash = 5;
+ int hash = super.hashCode();
hash = 83 * hash + Objects.hashCode(this.entity);
- hash = 83 * hash + Objects.hashCode(this.variant);
- hash = 83 * hash + Objects.hashCode(this.annotations);
- hash = 83 * hash + Objects.hashCode(this.mediaType);
- hash = 83 * hash + Objects.hashCode(this.language);
- hash = 83 * hash + Objects.hashCode(this.encoding);
return hash;
}
@@ -74,149 +52,15 @@ public boolean equals(Object obj) {
if (!Objects.equals(this.entity, other.entity)) {
return false;
}
- if (!Objects.equals(this.variant, other.variant)) {
- return false;
- }
- if (!Objects.equals(this.annotations, other.annotations)) {
- return false;
- }
- if (!Objects.equals(this.mediaType, other.mediaType)) {
- return false;
- }
- if (!Objects.equals(this.language, other.language)) {
- return false;
- }
- return Objects.equals(this.encoding, other.encoding);
- }
-
- public static class MediaType {
-
- @JsonProperty(value = "type", required = false)
- public final String type;
-
- @JsonProperty(value = "subtype", required = false)
- public final String subtype;
-
- @JsonProperty(value = "parameters", required = false)
- public final Map parameters;
-
- @JsonProperty(value = "wildcardType", required = false)
- public final String wildcardType;
-
- @JsonProperty(value = "wildcardSubtype", required = false)
- public final String wildcardSubtype;
-
- @JsonCreator
- public MediaType(
- @JsonProperty("type") String type,
- @JsonProperty("subtype") String subtype,
- @JsonProperty("parameters") Map parameters,
- @JsonProperty("wildcardType") String wildcardType,
- @JsonProperty("wildcardSubtype") String wildcardSubtype) {
- this.type = type;
- this.subtype = subtype;
- this.parameters = parameters;
- this.wildcardType = wildcardType;
- this.wildcardSubtype = wildcardSubtype;
- }
-
- @Override
- public int hashCode() {
- int hash = 5;
- hash = 83 * hash + Objects.hashCode(this.type);
- hash = 83 * hash + Objects.hashCode(this.subtype);
- hash = 83 * hash + Objects.hashCode(this.parameters);
- hash = 83 * hash + Objects.hashCode(this.wildcardType);
- hash = 83 * hash + Objects.hashCode(this.wildcardSubtype);
- return hash;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final MediaType other = (MediaType) obj;
- if (!Objects.equals(this.type, other.type)) {
- return false;
- }
- if (!Objects.equals(this.subtype, other.subtype)) {
- return false;
- }
- if (!Objects.equals(this.parameters, other.parameters)) {
- return false;
- }
- if (!Objects.equals(this.wildcardType, other.wildcardType)) {
- return false;
- }
- return Objects.equals(this.wildcardSubtype, other.wildcardSubtype);
- }
+ return super.equals(obj);
}
- public static class Variant {
-
- @JsonProperty(value = "language", required = false)
- public final String language;
-
- @JsonProperty(value = "mediaType", required = false)
- public final MediaType mediaType;
-
- @JsonProperty(value = "encoding", required = false)
- public final String encoding;
-
- @JsonProperty(value = "languageString", required = false)
- public final String languageString;
-
- @JsonCreator
- public Variant(
- @JsonProperty("language") String language,
- @JsonProperty("mediaType") MediaType mediaType,
- @JsonProperty("encoding") String encoding,
- @JsonProperty("languageString") String languageString) {
- this.language = language;
- this.mediaType = mediaType;
- this.encoding = encoding;
- this.languageString = languageString;
- }
-
- @Override
- public int hashCode() {
- int hash = 5;
- hash = 83 * hash + Objects.hashCode(this.language);
- hash = 83 * hash + Objects.hashCode(this.mediaType);
- hash = 83 * hash + Objects.hashCode(this.encoding);
- hash = 83 * hash + Objects.hashCode(this.languageString);
- return hash;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final Variant other = (Variant) obj;
- if (!Objects.equals(this.language, other.language)) {
- return false;
- }
- if (!Objects.equals(this.mediaType, other.mediaType)) {
- return false;
- }
- if (!Objects.equals(this.encoding, other.encoding)) {
- return false;
- }
- return Objects.equals(this.languageString, other.languageString);
+ @Override
+ public String toString() {
+ try {
+ return new ObjectMapper().writeValueAsString(this);
+ } catch (JsonProcessingException je) {
+ return "Unable to parse endpoint states into an entity";
}
}
}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Job.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Job.java
index 9dbc82f4..d2ead968 100644
--- a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Job.java
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Job.java
@@ -8,6 +8,7 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
+import java.util.List;
public class Job implements Serializable {
public enum JobStatus {
@@ -34,6 +35,38 @@ public enum JobStatus {
@JsonProperty(value = "error")
private String error;
+ public class StatusChange {
+ @JsonProperty(value = "status")
+ String status;
+
+ @JsonProperty(value = "change_time")
+ long changeTime;
+
+ @JsonProperty(value = "message")
+ String message;
+
+ public StatusChange(String type, String message) {
+ changeTime = System.currentTimeMillis();
+ status = type;
+ this.message = message;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public long getChangeTime() {
+ return changeTime;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+ }
+
+ @JsonProperty(value = "status_changes")
+ private List statusChanges;
+
@JsonCreator
public Job(
@JsonProperty(value = "id") String jobId,
@@ -41,13 +74,15 @@ public Job(
@JsonProperty(value = "status") String status,
@JsonProperty(value = "submit_time") long submitTime,
@JsonProperty(value = "end_time") long finishedTime,
- @JsonProperty(value = "error") String error) {
+ @JsonProperty(value = "error") String error,
+ @JsonProperty(value = "status_changes") List changes) {
this.jobId = jobId;
this.jobType = jobType;
this.status = JobStatus.valueOf(status);
this.submitTime = submitTime;
this.finishedTime = finishedTime;
this.error = error;
+ this.statusChanges = changes;
}
public String getJobId() {
@@ -70,6 +105,10 @@ public long getFinishedTime() {
return finishedTime;
}
+ public List getStatusChanges() {
+ return statusChanges;
+ }
+
public String getError() {
return error;
}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/SnapshotDetails.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/SnapshotDetails.java
new file mode 100644
index 00000000..7a90f758
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/SnapshotDetails.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+package com.datastax.mgmtapi.resources.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+public class SnapshotDetails extends BaseEntity {
+
+ @JsonProperty(value = "entity", required = true)
+ public final List> entity;
+
+ @JsonCreator
+ public SnapshotDetails(
+ @JsonProperty("entity") List> entity,
+ @JsonProperty("variant") BaseEntity.Variant variant,
+ @JsonProperty("annotations") List annotations,
+ @JsonProperty("mediaType") BaseEntity.MediaType mediaType,
+ @JsonProperty("language") String language,
+ @JsonProperty("encoding") String encoding) {
+ super(variant, annotations, mediaType, language, encoding);
+ this.entity = entity;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = super.hashCode();
+ hash = 83 * hash + Objects.hashCode(this.entity);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final SnapshotDetails other = (SnapshotDetails) obj;
+ if (!Objects.equals(this.entity, other.entity)) {
+ return false;
+ }
+ return super.equals(obj);
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/StreamingInfo.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/StreamingInfo.java
new file mode 100644
index 00000000..42f468a3
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/StreamingInfo.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+package com.datastax.mgmtapi.resources.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+public class StreamingInfo extends BaseEntity {
+
+ @JsonProperty(value = "entity", required = true)
+ public final List>>> entity;
+
+ @JsonCreator
+ public StreamingInfo(
+ @JsonProperty("entity") List>>> entity,
+ @JsonProperty("variant") Variant variant,
+ @JsonProperty("annotations") List annotations,
+ @JsonProperty("mediaType") MediaType mediaType,
+ @JsonProperty("language") String language,
+ @JsonProperty("encoding") String encoding) {
+ super(variant, annotations, mediaType, language, encoding);
+ this.entity = entity;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = super.hashCode();
+ hash = 83 * hash + Objects.hashCode(this.entity);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final StreamingInfo other = (StreamingInfo) obj;
+ if (!Objects.equals(this.entity, other.entity)) {
+ return false;
+ }
+ return super.equals(obj);
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Table.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Table.java
new file mode 100644
index 00000000..41b1e1d4
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/models/Table.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+package com.datastax.mgmtapi.resources.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Map;
+import java.util.Objects;
+
+public class Table {
+ @JsonProperty(value = "name", required = true)
+ public final String name;
+
+ @JsonProperty(value = "compaction")
+ public final Map compaction;
+
+ @JsonCreator
+ public Table(
+ @JsonProperty("name") String name,
+ @JsonProperty("compaction") Map compaction) {
+ this.name = name;
+ this.compaction = compaction;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ Table table = (Table) o;
+ return Objects.equals(name, table.name) && Objects.equals(compaction, table.compaction);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(name, compaction);
+ }
+
+ @Override
+ public String toString() {
+ try {
+ return new ObjectMapper().writeValueAsString(this);
+ } catch (JsonProcessingException je) {
+ return String.format("Unable to format table (%s)", je.getMessage());
+ }
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v1/NodeOpsResources.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v1/NodeOpsResources.java
index ed8f5d6c..0b1c70a8 100644
--- a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v1/NodeOpsResources.java
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v1/NodeOpsResources.java
@@ -8,6 +8,7 @@
import com.datastax.mgmtapi.ManagementApplication;
import com.datastax.mgmtapi.resources.common.BaseResources;
import com.datastax.mgmtapi.resources.helpers.ResponseTools;
+import com.datastax.mgmtapi.resources.models.RepairRequest;
import com.datastax.oss.driver.api.core.cql.Row;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -120,4 +121,49 @@ public Response schemaVersions() {
return Response.ok(schemaVersions).build();
});
}
+
+ @POST
+ @Path("/repair")
+ @Produces(MediaType.TEXT_PLAIN)
+ @ApiResponse(
+ responseCode = "202",
+ description = "Job ID for successfully scheduled Cassandra repair request",
+ content =
+ @Content(
+ mediaType = MediaType.TEXT_PLAIN,
+ schema = @Schema(implementation = String.class),
+ examples = @ExampleObject(value = "repair-1234567")))
+ @ApiResponse(
+ responseCode = "400",
+ description = "Repair request missing Keyspace name",
+ content =
+ @Content(
+ mediaType = MediaType.TEXT_PLAIN,
+ schema = @Schema(implementation = String.class),
+ examples = @ExampleObject(value = "keyspaceName must be specified")))
+ @Operation(summary = "Execute a nodetool repair operation", operationId = "repair")
+ public Response repair(RepairRequest repairRequest) {
+ return handle(
+ () -> {
+ if (repairRequest.keyspaceName == null) {
+ return Response.status(Response.Status.BAD_REQUEST)
+ .entity("keyspaceName must be specified")
+ .build();
+ }
+ return Response.accepted(
+ ResponseTools.getSingleRowStringResponse(
+ app.dbUnixSocketFile,
+ app.cqlService,
+ "CALL NodeOps.repair(?, ?, ?, ?, ?, ?, ?, ?)",
+ repairRequest.keyspaceName,
+ repairRequest.tables,
+ repairRequest.full,
+ true,
+ null,
+ null,
+ null,
+ null))
+ .build();
+ });
+ }
}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v1/TableOpsResources.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v1/TableOpsResources.java
index 9d4917fc..e48e080c 100644
--- a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v1/TableOpsResources.java
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v1/TableOpsResources.java
@@ -9,16 +9,27 @@
import com.datastax.mgmtapi.resources.common.BaseResources;
import com.datastax.mgmtapi.resources.helpers.ResponseTools;
import com.datastax.mgmtapi.resources.models.CompactRequest;
+import com.datastax.mgmtapi.resources.models.Compaction;
import com.datastax.mgmtapi.resources.models.KeyspaceRequest;
import com.datastax.mgmtapi.resources.models.ScrubRequest;
+import com.datastax.mgmtapi.resources.models.Table;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.type.reflect.GenericType;
+import com.google.common.collect.Lists;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.ExampleObject;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
@@ -32,6 +43,9 @@
@Path("/api/v1/ops/tables")
public class TableOpsResources extends BaseResources {
+ private static final GenericType>> LIST_OF_MAP_OF_STRINGS =
+ GenericType.listOf(GenericType.mapOf(String.class, String.class));
+
public TableOpsResources(ManagementApplication application) {
super(application);
}
@@ -228,4 +242,74 @@ public Response compact(CompactRequest compactRequest) {
.build();
});
}
+
+ @GET
+ @Path("/compactions")
+ @Operation(summary = "Returns active compactions", operationId = "getCompactions")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiResponse(
+ responseCode = "200",
+ description = "Compactions",
+ content =
+ @Content(
+ mediaType = MediaType.APPLICATION_JSON,
+ array = @ArraySchema(schema = @Schema(implementation = Compaction.class))))
+ public Response getCompactions() {
+ return handle(
+ () -> {
+ ResultSet result =
+ app.cqlService.executeCql(app.dbUnixSocketFile, "CALL NodeOps.getCompactions()");
+ Row row = result.one();
+ assert row != null;
+ List compactions =
+ row.get(0, LIST_OF_MAP_OF_STRINGS).stream()
+ .map(Compaction::fromMap)
+ .collect(Collectors.toList());
+ return Response.ok(compactions, MediaType.APPLICATION_JSON).build();
+ });
+ }
+
+ @GET
+ @Produces({MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON})
+ @ApiResponse(
+ responseCode = "200",
+ description = "Table list",
+ content =
+ @Content(
+ mediaType = MediaType.APPLICATION_JSON,
+ array = @ArraySchema(schema = @Schema(implementation = Table.class))))
+ @ApiResponse(
+ responseCode = "400",
+ description = "Keyspace name not provided",
+ content =
+ @Content(
+ mediaType = MediaType.TEXT_PLAIN,
+ schema = @Schema(implementation = String.class),
+ examples =
+ @ExampleObject(
+ value = "List tables failed. Non-empty 'keyspaceName' must be provided")))
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Operation(summary = "List the table names in the given keyspace", operationId = "listTablesV1")
+ public Response list(
+ @Parameter(required = true) @QueryParam(value = "keyspaceName") String keyspaceName) {
+ if (StringUtils.isBlank(keyspaceName)) {
+ return Response.status(HttpStatus.SC_BAD_REQUEST)
+ .entity("List tables failed. Non-empty 'keyspaceName' must be provided")
+ .build();
+ }
+ return handle(
+ () -> {
+ ResultSet result =
+ app.cqlService.executePreparedStatement(
+ app.dbUnixSocketFile, "CALL NodeOps.getTables(?)", keyspaceName);
+ List tables = Lists.newArrayList();
+ for (Row row : result) {
+ tables.add(
+ new Table(
+ row.getString("name"), row.getMap("compaction", String.class, String.class)));
+ }
+ return Response.ok(tables, MediaType.APPLICATION_JSON).build();
+ });
+ }
}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/RepairResourcesV2.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/RepairResourcesV2.java
new file mode 100644
index 00000000..98e2559a
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/RepairResourcesV2.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+package com.datastax.mgmtapi.resources.v2;
+
+import com.datastax.mgmtapi.ManagementApplication;
+import com.datastax.mgmtapi.resources.common.BaseResources;
+import com.datastax.mgmtapi.resources.v2.models.RepairParallelism;
+import com.datastax.mgmtapi.resources.v2.models.RepairRequest;
+import com.datastax.mgmtapi.resources.v2.models.RepairRequestResponse;
+import com.datastax.mgmtapi.resources.v2.models.RingRange;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import java.util.List;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("/api/v2/repairs")
+public class RepairResourcesV2 extends BaseResources {
+
+ public RepairResourcesV2(ManagementApplication application) {
+ super(application);
+ }
+
+ @PUT
+ @Operation(summary = "Initiate a new repair", operationId = "putRepairV2")
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes("application/json")
+ @ApiResponse(
+ responseCode = "202",
+ description = "Repair Successfully requested",
+ content =
+ @Content(
+ mediaType = MediaType.APPLICATION_JSON,
+ schema = @Schema(implementation = RepairRequestResponse.class),
+ examples = @ExampleObject(value = "Accepted")))
+ @ApiResponse(
+ responseCode = "400",
+ description = "Repair request missing Keyspace name",
+ content =
+ @Content(
+ mediaType = MediaType.TEXT_PLAIN,
+ schema = @Schema(implementation = Response.Status.class),
+ examples = @ExampleObject(value = "keyspace must be specified")))
+ @ApiResponse(
+ responseCode = "500",
+ description = "internal error, we did not receive the expected repair ID from Cassandra.",
+ content =
+ @Content(
+ mediaType = MediaType.TEXT_PLAIN,
+ schema = @Schema(implementation = Response.Status.class),
+ examples =
+ @ExampleObject(
+ value =
+ "internal error, we did not receive the expected repair ID from Cassandra.")))
+ public final Response repair(RepairRequest request) {
+ return handle(
+ () -> {
+ if (request.keyspace == null) {
+ return Response.status(Response.Status.BAD_REQUEST)
+ .entity("keyspaceName must be specified")
+ .build();
+ }
+
+ ResultSet res =
+ app.cqlService.executePreparedStatement(
+ app.dbUnixSocketFile,
+ "CALL NodeOps.repair(?, ?, ?, ?, ?, ?, ?, ?)",
+ request.keyspace,
+ request.tables,
+ request.fullRepair,
+ request.notifications,
+ getParallelismName(request.repairParallelism),
+ request.datacenters,
+ getRingRangeString(request.associatedTokens),
+ request.repairThreadCount);
+ try {
+ Row row = res.one();
+ String repairID = row.getString(0);
+ return Response.accepted(new RepairRequestResponse(repairID)).build();
+ } catch (Exception e) {
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+ .entity("Repair request failed: " + e.getMessage())
+ .build();
+ }
+ });
+ }
+
+ @DELETE
+ @Operation(summary = "Cancel all repairs", operationId = "deleteRepairsV2")
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiResponse(
+ responseCode = "202",
+ description = "Cancel repairs Successfully requested",
+ content =
+ @Content(
+ mediaType = MediaType.APPLICATION_JSON,
+ schema = @Schema(implementation = RepairRequestResponse.class),
+ examples = @ExampleObject(value = "Accepted")))
+ public Response cancelAllRepairs() {
+ return handle(
+ () -> {
+ app.cqlService.executePreparedStatement(
+ app.dbUnixSocketFile, "CALL NodeOps.stopAllRepairs()");
+ return Response.accepted().build();
+ });
+ }
+
+ private String getParallelismName(RepairParallelism parallelism) {
+ return parallelism != null ? parallelism.getName() : null;
+ }
+
+ private String getRingRangeString(List associatedTokens) {
+ if (associatedTokens != null && !associatedTokens.isEmpty()) {
+ StringBuilder sb = new StringBuilder();
+ for (RingRange ringRange : associatedTokens) {
+ sb.append(toRangeString(ringRange)).append(",");
+ }
+ // remove trailing comma
+ return sb.substring(0, sb.length() - 2);
+ }
+ return null;
+ }
+
+ private String toRangeString(RingRange ringRange) {
+ return String.join(":", ringRange.start.toString(), ringRange.end.toString());
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/TokenResourcesV2.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/TokenResourcesV2.java
new file mode 100644
index 00000000..8595ab25
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/TokenResourcesV2.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+package com.datastax.mgmtapi.resources.v2;
+
+import com.datastax.mgmtapi.ManagementApplication;
+import com.datastax.mgmtapi.resources.common.BaseResources;
+import com.datastax.mgmtapi.resources.helpers.ResponseTools;
+import com.datastax.mgmtapi.resources.v2.models.TokenRangeToEndpointResponse;
+import com.datastax.mgmtapi.resources.v2.models.TokenRangeToEndpoints;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("/api/v2/tokens")
+public class TokenResourcesV2 extends BaseResources {
+
+ public TokenResourcesV2(ManagementApplication application) {
+ super(application);
+ }
+
+ @GET
+ @Path("/rangetoendpoint")
+ @Produces(MediaType.APPLICATION_JSON)
+ @Operation(
+ summary = "Retrieve a mapping of Token ranges to endpoints",
+ operationId = "getRangeToEndpointMapV2")
+ @ApiResponse(
+ responseCode = "200",
+ description = "Token range retrieval was successful",
+ content =
+ @Content(
+ mediaType = MediaType.APPLICATION_JSON,
+ schema = @Schema(implementation = TokenRangeToEndpointResponse.class)))
+ @ApiResponse(
+ responseCode = "404",
+ description = "Keyspace not found",
+ content =
+ @Content(
+ mediaType = MediaType.TEXT_PLAIN,
+ schema = @Schema(implementation = String.class),
+ examples = @ExampleObject(value = "keyspace not found")))
+ public Response getRangeToEndpointMap(@QueryParam(value = "keyspaceName") String keyspaceName) {
+ return handle(
+ () -> {
+ if (keyspaceName != null && !keyspaceExists(keyspaceName)) {
+ return Response.status(Response.Status.NOT_FOUND).entity("keyspace not found").build();
+ }
+
+ Map, List> map =
+ (Map, List>)
+ ResponseTools.getSingleRowResponse(
+ app.dbUnixSocketFile,
+ app.cqlService,
+ "CALL NodeOps.getRangeToEndpointMap(?)",
+ keyspaceName);
+ return Response.ok(convert(map)).build();
+ });
+ }
+
+ private TokenRangeToEndpointResponse convert(Map, List> map) {
+ List rangesToEndpoints = new ArrayList<>(map.size());
+ map.entrySet()
+ .forEach(
+ (Map.Entry, List> e) -> {
+ rangesToEndpoints.add(
+ new TokenRangeToEndpoints(convertRanges(e.getKey()), e.getValue()));
+ });
+ return new TokenRangeToEndpointResponse(rangesToEndpoints);
+ }
+
+ private List convertRanges(List range) {
+ // each Range should be exactly 2 strings: start, end
+ assert range.size() == 2;
+ List tokenRange = Arrays.asList(Long.valueOf(range.get(0)), Long.parseLong(range.get(1)));
+ return tokenRange;
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RepairParallelism.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RepairParallelism.java
new file mode 100644
index 00000000..69670d73
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RepairParallelism.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+
+package com.datastax.mgmtapi.resources.v2.models;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum RepairParallelism {
+ SEQUENTIAL("sequential"),
+ PARALLEL("parallel"),
+ DATACENTER_AWARE("dc_parallel");
+
+ private final String name;
+
+ public static RepairParallelism fromName(String name) {
+ if (PARALLEL.getName().equals(name)) {
+ return PARALLEL;
+ } else {
+ return DATACENTER_AWARE.getName().equals(name) ? DATACENTER_AWARE : SEQUENTIAL;
+ }
+ }
+
+ private RepairParallelism(String name) {
+ this.name = name;
+ }
+
+ @JsonValue
+ public String getName() {
+ return this.name;
+ }
+
+ @Override
+ public String toString() {
+ return this.getName();
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RepairRequest.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RepairRequest.java
new file mode 100644
index 00000000..f6dd47ce
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RepairRequest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+package com.datastax.mgmtapi.resources.v2.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.util.Objects;
+import javax.annotation.Nullable;
+
+public class RepairRequest {
+
+ @JsonProperty(value = "keyspace", required = true)
+ public final String keyspace;
+
+ @Nullable
+ @JsonProperty(value = "tables")
+ public final List tables;
+
+ @JsonProperty(value = "full_repair", defaultValue = "true")
+ public final Boolean fullRepair;
+
+ @JsonProperty(value = "notifications", defaultValue = "true")
+ public final Boolean notifications;
+
+ @Nullable
+ @JsonProperty(value = "associated_tokens")
+ public final List associatedTokens;
+
+ @Nullable
+ @JsonProperty(value = "repair_parallelism")
+ public final RepairParallelism repairParallelism;
+
+ @Nullable
+ @JsonProperty(value = "datacenters")
+ public final List datacenters;
+
+ @Nullable
+ @JsonProperty(value = "repair_thread_count")
+ public final Integer repairThreadCount;
+
+ @JsonCreator
+ public RepairRequest(
+ @JsonProperty(value = "keyspace", required = true) String keyspace,
+ @JsonProperty(value = "tables") List tables,
+ @JsonProperty(value = "full_repair", defaultValue = "true") Boolean fullRepair,
+ @JsonProperty(value = "notifications", defaultValue = "true") boolean notifications,
+ @JsonProperty(value = "associated_tokens") List associatedTokens,
+ @JsonProperty(value = "repair_parallelism") RepairParallelism repairParallelism,
+ @JsonProperty(value = "datacenters") List datacenters,
+ @JsonProperty(value = "repair_thread_count") Integer repairThreadCount) {
+ this.keyspace = keyspace;
+ this.tables = tables;
+ this.fullRepair = fullRepair;
+ this.notifications = notifications;
+ this.associatedTokens = associatedTokens;
+ this.datacenters = datacenters;
+ this.repairParallelism = repairParallelism;
+ this.repairThreadCount = repairThreadCount;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ RepairRequest other = (RepairRequest) o;
+ return Objects.equals(keyspace, other.keyspace)
+ && Objects.equals(tables, other.tables)
+ && Objects.equals(fullRepair, other.fullRepair)
+ && Objects.equals(associatedTokens, other.associatedTokens)
+ && Objects.equals(datacenters, other.datacenters)
+ && Objects.equals(repairParallelism, other.repairParallelism)
+ && Objects.equals(repairThreadCount, other.repairThreadCount);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(keyspace)
+ + Objects.hashCode(tables)
+ + Objects.hashCode(fullRepair)
+ + Objects.hashCode(associatedTokens)
+ + Objects.hashCode(datacenters)
+ + Objects.hashCode(repairParallelism)
+ + Objects.hashCode(repairThreadCount);
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RepairRequestResponse.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RepairRequestResponse.java
new file mode 100644
index 00000000..0e57f45b
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RepairRequestResponse.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+
+package com.datastax.mgmtapi.resources.v2.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Objects;
+
+public class RepairRequestResponse {
+ @JsonProperty(value = "repair_id", required = true)
+ public final String repairID;
+
+ @JsonCreator
+ public RepairRequestResponse(
+ @JsonProperty(value = "repair_id", required = true) String repairID) {
+ this.repairID = repairID;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ return Objects.equals(repairID, ((RepairRequestResponse) o).repairID);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(repairID);
+ }
+
+ @Override
+ public String toString() {
+ try {
+ return new ObjectMapper().writeValueAsString(this);
+ } catch (Exception e) {
+ return this.repairID;
+ }
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RingRange.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RingRange.java
new file mode 100644
index 00000000..f685897c
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/RingRange.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+
+package com.datastax.mgmtapi.resources.v2.models;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Comparator;
+import java.util.Objects;
+
+public final class RingRange {
+ public static final Comparator START_COMPARATOR =
+ (RingRange o1, RingRange o2) -> o1.start.compareTo(o2.start);
+
+ @JsonProperty(value = "start", required = true)
+ public final Long start;
+
+ @JsonProperty(value = "end", required = true)
+ public final Long end;
+
+ public RingRange(
+ @JsonProperty(value = "start", required = true) Long start,
+ @JsonProperty(value = "end", required = true) Long end) {
+ this.start = start;
+ this.end = end;
+ }
+
+ public RingRange(String... range) {
+ start = Long.valueOf(range[0]);
+ end = Long.valueOf(range[1]);
+ }
+
+ public Long getStart() {
+ return start;
+ }
+
+ public Long getEnd() {
+ return end;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(start) + Objects.hashCode(end);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == null || !(o instanceof RingRange)) {
+ return false;
+ }
+ RingRange other = (RingRange) o;
+ return Objects.equals(start, other.start) && Objects.equals(end, other.end);
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/TokenRangeToEndpointResponse.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/TokenRangeToEndpointResponse.java
new file mode 100644
index 00000000..819a9858
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/TokenRangeToEndpointResponse.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+package com.datastax.mgmtapi.resources.v2.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.List;
+import java.util.Objects;
+
+public class TokenRangeToEndpointResponse {
+
+ @JsonProperty(value = "token_range_to_endpoints", required = true)
+ public final List tokenRangeToEndpoints;
+
+ @JsonCreator
+ public TokenRangeToEndpointResponse(
+ @JsonProperty(value = "token_range_to_endpoints", required = true)
+ List list) {
+ this.tokenRangeToEndpoints = list;
+ }
+
+ @Override
+ public int hashCode() {
+ return 83 * Objects.hashCode(tokenRangeToEndpoints);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ TokenRangeToEndpointResponse other = (TokenRangeToEndpointResponse) obj;
+ return Objects.equals(this.tokenRangeToEndpoints, other.tokenRangeToEndpoints);
+ }
+
+ @Override
+ public String toString() {
+ try {
+ return new ObjectMapper().writeValueAsString(this);
+ } catch (JsonProcessingException e) {
+ return String.format("Unable to format TokenRangeToEndpointResponse (%s)", e.getMessage());
+ }
+ }
+}
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/TokenRangeToEndpoints.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/TokenRangeToEndpoints.java
new file mode 100644
index 00000000..ddb73242
--- /dev/null
+++ b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/v2/models/TokenRangeToEndpoints.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+package com.datastax.mgmtapi.resources.v2.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.List;
+import java.util.Objects;
+
+public class TokenRangeToEndpoints {
+
+ @JsonProperty(value = "tokens", required = true)
+ public final List tokens;
+
+ @JsonProperty(value = "endpoints", required = true)
+ public final List endpoints;
+
+ @JsonCreator
+ public TokenRangeToEndpoints(
+ @JsonProperty(value = "tokens", required = true) List tokens,
+ @JsonProperty(value = "endpoints", required = true) List endpoints) {
+ this.tokens = tokens;
+ this.endpoints = endpoints;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ TokenRangeToEndpoints other = (TokenRangeToEndpoints) obj;
+ if (!Objects.equals(this.tokens, other.tokens)) {
+ return false;
+ }
+ return Objects.equals(this.endpoints, other.endpoints);
+ }
+
+ @Override
+ public int hashCode() {
+ return 83 * Objects.hashCode(this.tokens) * Objects.hashCode(this.endpoints);
+ }
+
+ @Override
+ public String toString() {
+ try {
+ return new ObjectMapper().writeValueAsString(this);
+ } catch (JsonProcessingException e) {
+ return String.format("Unable to format TokenRangeToEndpoints (%s)", e.getMessage());
+ }
+ }
+}
diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/BaseDockerIntegrationTest.java b/management-api-server/src/test/java/com/datastax/mgmtapi/BaseDockerIntegrationTest.java
index 99cd1398..030ed480 100644
--- a/management-api-server/src/test/java/com/datastax/mgmtapi/BaseDockerIntegrationTest.java
+++ b/management-api-server/src/test/java/com/datastax/mgmtapi/BaseDockerIntegrationTest.java
@@ -5,17 +5,30 @@
*/
package com.datastax.mgmtapi;
+import static io.netty.util.CharsetUtil.UTF_8;
+import static org.junit.Assert.assertTrue;
+
import com.datastax.mgmtapi.helpers.DockerHelper;
import com.datastax.mgmtapi.helpers.NettyHttpClient;
+import com.datastax.mgmtapi.resources.models.CreateOrAlterKeyspaceRequest;
+import com.datastax.mgmtapi.resources.models.ReplicationSetting;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
+import io.netty.handler.codec.http.FullHttpResponse;
import java.io.File;
import java.io.IOError;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.net.ssl.SSLException;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.utils.URIBuilder;
import org.junit.AfterClass;
import org.junit.AssumptionViolatedException;
import org.junit.Before;
@@ -26,13 +39,14 @@
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
import org.junit.runners.Parameterized;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class BaseDockerIntegrationTest {
- protected static final Logger logger = LoggerFactory.getLogger(BaseDockerIntegrationTest.class);
protected static final String BASE_PATH = "http://localhost:8080/api/v0";
+ protected static final String BASE_PATH_V1 = "http://localhost:8080/api/v1";
+ protected static final String BASE_PATH_V2 = "http://localhost:8080/api/v2";
+ protected static final String BASE_HOST = "http://localhost:8080";
protected static final URL BASE_URL;
+ protected static final ObjectMapper JSON_MAPPER = new ObjectMapper();
static {
try {
@@ -59,7 +73,7 @@ protected void failed(Throwable e, Description description) {
System.err.flush();
if (null != docker) {
- int numberOfLines = 100;
+ int numberOfLines = 1000;
System.out.printf("=====> Showing last %d entries of system.log%n", numberOfLines);
docker.tailSystemLog(numberOfLines);
System.out.printf("=====> End of last %d entries of system.log%n", numberOfLines);
@@ -162,4 +176,54 @@ protected static File getTempDir() {
protected NettyHttpClient getClient() throws SSLException {
return new NettyHttpClient(BASE_URL);
}
+
+ protected void createKeyspace(NettyHttpClient client, String localDc, String keyspaceName, int rf)
+ throws IOException, URISyntaxException {
+ CreateOrAlterKeyspaceRequest request =
+ new CreateOrAlterKeyspaceRequest(
+ keyspaceName, Arrays.asList(new ReplicationSetting(localDc, rf)));
+ String requestAsJSON = JSON_MAPPER.writeValueAsString(request);
+
+ URI uri = new URIBuilder(BASE_PATH + "/ops/keyspace/create").build();
+ boolean requestSuccessful =
+ client
+ .post(uri.toURL(), requestAsJSON)
+ .thenApply(r -> r.status().code() == HttpStatus.SC_OK)
+ .join();
+ assertTrue(requestSuccessful);
+ }
+
+ protected String responseAsString(FullHttpResponse r) {
+ if (r.status().code() == HttpStatus.SC_OK) {
+ byte[] result = new byte[r.content().readableBytes()];
+ r.content().readBytes(result);
+
+ return new String(result);
+ }
+
+ return null;
+ }
+
+ protected Pair responseAsCodeAndBody(FullHttpResponse r) {
+ FullHttpResponse copy = r.copy();
+ if (copy.content().readableBytes() > 0) {
+ return Pair.of(copy.status().code(), copy.content().toString(UTF_8));
+ }
+
+ return Pair.of(copy.status().code(), null);
+ }
+
+ protected int getNumTokenRanges() {
+ if (this.version.startsWith("3")) {
+ return 256;
+ }
+ if (this.version.startsWith("dse-68")) {
+ return 1;
+ }
+ if (this.version.startsWith("4")) {
+ return 16;
+ }
+ // unsupported Cassandra/DSE version
+ throw new UnsupportedOperationException("Cassandra version " + this.version + " not supported");
+ }
}
diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/DSESpecificIT.java b/management-api-server/src/test/java/com/datastax/mgmtapi/DSESpecificIT.java
index a52ceacb..fc2ef7af 100644
--- a/management-api-server/src/test/java/com/datastax/mgmtapi/DSESpecificIT.java
+++ b/management-api-server/src/test/java/com/datastax/mgmtapi/DSESpecificIT.java
@@ -9,7 +9,6 @@
import static com.datastax.mgmtapi.BaseDockerIntegrationTest.BASE_URL;
import static com.datastax.mgmtapi.NonDestructiveOpsIT.ensureStarted;
import static com.datastax.oss.driver.api.core.config.DefaultDriverOption.LOAD_BALANCING_LOCAL_DATACENTER;
-import static io.netty.util.CharsetUtil.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -29,7 +28,6 @@
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import io.netty.handler.codec.http.FullHttpResponse;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.URI;
@@ -160,19 +158,4 @@ private void createKeyspace(NettyHttpClient client, String localDc, String keysp
.join();
assertTrue(requestSuccessful);
}
-
- private String responseAsString(FullHttpResponse r) {
- if (r.status().code() == HttpStatus.SC_OK) {
- byte[] result = new byte[r.content().readableBytes()];
- r.content().readBytes(result);
-
- return new String(result);
- }
-
- return null;
- }
-
- private Pair responseAsCodeAndBody(FullHttpResponse r) {
- return Pair.of(r.status().code(), r.content().toString(UTF_8));
- }
}
diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/K8OperatorResourcesTest.java b/management-api-server/src/test/java/com/datastax/mgmtapi/K8OperatorResourcesTest.java
index cc201e69..ba3dddfc 100644
--- a/management-api-server/src/test/java/com/datastax/mgmtapi/K8OperatorResourcesTest.java
+++ b/management-api-server/src/test/java/com/datastax/mgmtapi/K8OperatorResourcesTest.java
@@ -45,6 +45,7 @@
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -1657,7 +1658,59 @@ public void testRepair() throws Exception {
assertThat(response.getStatus()).isEqualTo(HttpStatus.SC_OK);
verify(context.cqlService)
.executePreparedStatement(
- any(), eq("CALL NodeOps.repair(?, ?, ?)"), eq("test_ks"), eq(null), eq(true));
+ any(),
+ eq("CALL NodeOps.repair(?, ?, ?, ?, ?, ?, ?, ?)"),
+ eq("test_ks"),
+ eq(null),
+ eq(true),
+ eq(false),
+ eq(null),
+ eq(null),
+ eq(null),
+ eq(null));
+ }
+
+ @Test
+ public void testRepairAsync() throws Exception {
+ Context context = setup();
+ when(context.cqlService.executePreparedStatement(any(), anyString())).thenReturn(null);
+
+ RepairRequest repairRequest = new RepairRequest("test_ks", null, Boolean.TRUE);
+ String repairRequestAsJSON = WriterUtility.asString(repairRequest, MediaType.APPLICATION_JSON);
+
+ ResultSet mockResultSet = mock(ResultSet.class);
+ Row mockRow = mock(Row.class);
+
+ when(context.cqlService.executePreparedStatement(any(), any(), any()))
+ .thenReturn(mockResultSet);
+
+ when(mockResultSet.one()).thenReturn(mockRow);
+
+ when(mockRow.getString(0)).thenReturn("0fe65b47-98c2-47d8-9c3c-5810c9988e10");
+
+ MockHttpRequest request =
+ MockHttpRequest.post("/api/v1/ops/node/repair")
+ .content(repairRequestAsJSON.getBytes())
+ .accept(MediaType.TEXT_PLAIN)
+ .contentType(MediaType.APPLICATION_JSON_TYPE);
+
+ MockHttpResponse response = context.invoke(request);
+
+ Assert.assertEquals(HttpStatus.SC_ACCEPTED, response.getStatus());
+ Assert.assertEquals("0fe65b47-98c2-47d8-9c3c-5810c9988e10", response.getContentAsString());
+
+ verify(context.cqlService)
+ .executePreparedStatement(
+ any(),
+ eq("CALL NodeOps.repair(?, ?, ?, ?, ?, ?, ?, ?)"),
+ eq("test_ks"),
+ eq(null),
+ eq(true),
+ eq(true),
+ eq(null),
+ eq(null),
+ eq(null),
+ eq(null));
}
@Test
@@ -1737,20 +1790,21 @@ public void testGetReplicationKeyspaceDoesNotExist() throws Exception {
public void testListTables() throws Exception {
Context context = setup();
ResultSet mockResultSet = mock(ResultSet.class);
- Row mockRow = mock(Row.class);
+ Row mockRow1 = mock(Row.class);
+ Row mockRow2 = mock(Row.class);
MockHttpRequest request = MockHttpRequest.get(ROOT_PATH + "/ops/tables?keyspaceName=ks1");
when(context.cqlService.executePreparedStatement(any(), anyString(), anyString()))
.thenReturn(mockResultSet);
- when(mockResultSet.one()).thenReturn(mockRow);
- List result = ImmutableList.of("table1", "table2");
- when(mockRow.getList(0, String.class)).thenReturn(result);
+ when(mockResultSet.all()).thenReturn(Lists.newArrayList(mockRow1, mockRow2));
+ when(mockRow1.getString("name")).thenReturn("table1");
+ when(mockRow2.getString("name")).thenReturn("table2");
MockHttpResponse response = context.invoke(request);
assertThat(response.getStatus()).isEqualTo(HttpStatus.SC_OK);
String[] actual = new JsonMapper().readValue(response.getContentAsString(), String[].class);
- assertThat(actual).containsExactlyElementsOf(result);
+ assertThat(actual).containsExactly("table1", "table2");
verify(context.cqlService)
.executePreparedStatement(any(), eq("CALL NodeOps.getTables(?)"), eq("ks1"));
}
diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/MetadataResourcesTest.java b/management-api-server/src/test/java/com/datastax/mgmtapi/MetadataResourcesTest.java
index 03e32ef1..c7a901a3 100644
--- a/management-api-server/src/test/java/com/datastax/mgmtapi/MetadataResourcesTest.java
+++ b/management-api-server/src/test/java/com/datastax/mgmtapi/MetadataResourcesTest.java
@@ -24,17 +24,15 @@
import org.apache.http.HttpStatus;
import org.jboss.resteasy.mock.MockHttpRequest;
import org.jboss.resteasy.mock.MockHttpResponse;
-import org.junit.Assert;
import org.junit.Test;
public class MetadataResourcesTest {
-
@Test
public void testGetReleaseVersion() throws Exception {
K8OperatorResourcesTest.Context context = setup();
MockHttpResponse response = getMockHttpResponse(context, "/metadata/versions/release");
assertEquals(HttpStatus.SC_OK, response.getStatus());
- Assert.assertTrue(response.getContentAsString().contains("1.2.3"));
+ assertTrue(response.getContentAsString().contains("1.2.3"));
}
@Test
diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/NonDestructiveOpsIT.java b/management-api-server/src/test/java/com/datastax/mgmtapi/NonDestructiveOpsIT.java
index 598c40c2..ccb7feca 100644
--- a/management-api-server/src/test/java/com/datastax/mgmtapi/NonDestructiveOpsIT.java
+++ b/management-api-server/src/test/java/com/datastax/mgmtapi/NonDestructiveOpsIT.java
@@ -5,7 +5,7 @@
*/
package com.datastax.mgmtapi;
-import static io.netty.util.CharsetUtil.UTF_8;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.awaitility.Awaitility.await;
@@ -30,7 +30,10 @@
import com.datastax.mgmtapi.resources.models.RepairRequest;
import com.datastax.mgmtapi.resources.models.ReplicationSetting;
import com.datastax.mgmtapi.resources.models.ScrubRequest;
+import com.datastax.mgmtapi.resources.models.Table;
import com.datastax.mgmtapi.resources.models.TakeSnapshotRequest;
+import com.datastax.mgmtapi.resources.v2.models.RepairParallelism;
+import com.datastax.mgmtapi.resources.v2.models.RepairRequestResponse;
import com.datastax.oss.driver.api.core.metadata.schema.ClusteringOrder;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -40,7 +43,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.Uninterruptibles;
-import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.util.IllegalReferenceCountException;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -49,14 +52,10 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import javax.ws.rs.core.MediaType;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.http.HttpStatus;
import org.apache.http.client.utils.URIBuilder;
import org.assertj.core.util.Lists;
-import org.jboss.resteasy.core.messagebody.ReaderUtility;
-import org.jboss.resteasy.core.messagebody.WriterUtility;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -115,7 +114,7 @@ public static void ensureStarted() throws IOException {
if (ready) break;
- Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS);
+ Uninterruptibles.sleepUninterruptibly(10, SECONDS);
}
logger.info("CASSANDRA ALIVE: {}", ready);
@@ -347,6 +346,8 @@ public void testGetEndpoints() throws IOException, URISyntaxException {
List> entity = (List>) response.get("entity");
Map endpoint = entity.get(0);
assertThat(endpoint.get("PARTITIONER")).endsWith("Murmur3Partitioner");
+ assertThat(endpoint.get("CLUSTER_NAME")).matches("Test Cluster");
+ assertThat(endpoint.get("IS_LOCAL")).isEqualTo("true");
Iterable tokens = Splitter.on(",").split(endpoint.get("TOKENS"));
assertThat(tokens)
.allSatisfy(
@@ -362,8 +363,7 @@ public void testCleanup() throws IOException, URISyntaxException, InterruptedExc
KeyspaceRequest keyspaceRequest =
new KeyspaceRequest(1, "system_traces", Collections.singletonList("events"));
- String keyspaceRequestAsJSON =
- WriterUtility.asString(keyspaceRequest, MediaType.APPLICATION_JSON);
+ String keyspaceRequestAsJSON = JSON_MAPPER.writeValueAsString(keyspaceRequest);
URI uri = new URIBuilder(BASE_PATH + "/ops/keyspace/cleanup").build();
// Get job_id here..
@@ -437,7 +437,7 @@ public void testScrub() throws IOException, URISyntaxException {
ScrubRequest scrubRequest =
new ScrubRequest(
true, true, true, true, 2, "system_traces", Collections.singletonList("events"));
- String requestAsJSON = WriterUtility.asString(scrubRequest, MediaType.APPLICATION_JSON);
+ String requestAsJSON = JSON_MAPPER.writeValueAsString(scrubRequest);
URI uri = new URIBuilder(BASE_PATH + "/ops/tables/scrub").build();
boolean requestSuccessful =
client
@@ -457,7 +457,7 @@ public void testCompact() throws IOException, URISyntaxException {
CompactRequest compactRequest =
new CompactRequest(
false, false, null, null, "system_traces", null, Collections.singletonList("events"));
- String requestAsJSON = WriterUtility.asString(compactRequest, MediaType.APPLICATION_JSON);
+ String requestAsJSON = JSON_MAPPER.writeValueAsString(compactRequest);
URI uri = new URIBuilder(BASE_PATH + "/ops/tables/compact").build();
boolean requestSuccessful =
client
@@ -476,8 +476,7 @@ public void testGarbageCollect() throws IOException, URISyntaxException {
KeyspaceRequest keyspaceRequest =
new KeyspaceRequest(1, "system_traces", Collections.singletonList("events"));
- String keyspaceRequestAsJSON =
- WriterUtility.asString(keyspaceRequest, MediaType.APPLICATION_JSON);
+ String keyspaceRequestAsJSON = JSON_MAPPER.writeValueAsString(keyspaceRequest);
URI uri = new URIBuilder(BASE_PATH + "/ops/tables/garbagecollect").build();
boolean requestSuccessful =
client
@@ -495,8 +494,7 @@ public void testFlush() throws IOException, URISyntaxException {
NettyHttpClient client = new NettyHttpClient(BASE_URL);
KeyspaceRequest keyspaceRequest = new KeyspaceRequest(1, null, null);
- String keyspaceRequestAsJSON =
- WriterUtility.asString(keyspaceRequest, MediaType.APPLICATION_JSON);
+ String keyspaceRequestAsJSON = JSON_MAPPER.writeValueAsString(keyspaceRequest);
URI uri = new URIBuilder(BASE_PATH + "/ops/tables/flush").build();
boolean requestSuccessful =
client
@@ -514,8 +512,7 @@ public void testUpgradeSSTables() throws IOException, URISyntaxException {
NettyHttpClient client = new NettyHttpClient(BASE_URL);
KeyspaceRequest keyspaceRequest = new KeyspaceRequest(1, "", null);
- String keyspaceRequestAsJSON =
- WriterUtility.asString(keyspaceRequest, MediaType.APPLICATION_JSON);
+ String keyspaceRequestAsJSON = JSON_MAPPER.writeValueAsString(keyspaceRequest);
URI uri = new URIBuilder(BASE_PATH + "/ops/tables/sstables/upgrade").build();
boolean requestSuccessful =
client
@@ -550,7 +547,7 @@ public void testCreateKeyspace() throws IOException, URISyntaxException {
.thenApply(this::responseAsString)
.join();
- createKeyspace(client, localDc, "someTestKeyspace");
+ createKeyspace(client, localDc, "someTestKeyspace", 1);
}
@Test
@@ -566,11 +563,11 @@ public void testAlterKeyspace() throws IOException, URISyntaxException {
.join();
String ks = "alteringKeyspaceTest";
- createKeyspace(client, localDc, ks);
+ createKeyspace(client, localDc, ks, 1);
CreateOrAlterKeyspaceRequest request =
new CreateOrAlterKeyspaceRequest(ks, Arrays.asList(new ReplicationSetting(localDc, 3)));
- String requestAsJSON = WriterUtility.asString(request, MediaType.APPLICATION_JSON);
+ String requestAsJSON = JSON_MAPPER.writeValueAsString(request);
boolean requestSuccessful =
client
@@ -593,7 +590,7 @@ public void testGetKeyspaces() throws IOException, URISyntaxException {
.join();
String ks = "getkeyspacestest";
- createKeyspace(client, localDc, ks);
+ createKeyspace(client, localDc, ks, 1);
URI uri = new URIBuilder(BASE_PATH + "/ops/keyspace").build();
String response = client.get(uri.toURL()).thenApply(this::responseAsString).join();
@@ -620,7 +617,7 @@ public void testGetSchemaVersions() throws IOException, URISyntaxException {
NettyHttpClient client = new NettyHttpClient(BASE_URL);
- URIBuilder uriBuilder = new URIBuilder("http://localhost:8080/api/v1/ops/node/schema/versions");
+ URIBuilder uriBuilder = new URIBuilder(BASE_PATH_V1 + "/ops/node/schema/versions");
URI uri = uriBuilder.build();
Pair response =
@@ -666,7 +663,7 @@ public void testGetSnapshotDetails()
null,
null,
null);
- String requestAsJSON = WriterUtility.asString(takeSnapshotRequest, MediaType.APPLICATION_JSON);
+ String requestAsJSON = JSON_MAPPER.writeValueAsString(takeSnapshotRequest);
boolean takeSnapshotSuccessful =
client
@@ -680,8 +677,7 @@ public void testGetSnapshotDetails()
String getSnapshotResponse =
client.get(getSnapshotsUri.toURL()).thenApply(this::responseAsString).join();
assertNotNull(getSnapshotResponse);
- Object responseObject =
- ReaderUtility.read(Object.class, MediaType.APPLICATION_JSON, getSnapshotResponse);
+ Object responseObject = JSON_MAPPER.readValue(getSnapshotResponse, Object.class);
assertTrue(responseObject instanceof Map);
Map responseObj = (Map) responseObject;
assertTrue(responseObj.containsKey("entity"));
@@ -710,8 +706,7 @@ public void testGetSnapshotDetails()
getSnapshotResponse =
client.get(getSnapshotsUri.toURL()).thenApply(this::responseAsString).join();
assertNotNull(getSnapshotResponse);
- responseObject =
- ReaderUtility.read(Object.class, MediaType.APPLICATION_JSON, getSnapshotResponse);
+ responseObject = JSON_MAPPER.readValue(getSnapshotResponse, Object.class);
assertTrue(responseObject instanceof Map);
responseObj = (Map) responseObject;
assertTrue(responseObj.containsKey("entity"));
@@ -726,14 +721,23 @@ public void testRepair() throws IOException, URISyntaxException, InterruptedExce
assumeTrue(IntegrationTestUtils.shouldRun());
ensureStarted();
+ // create a keyspace with RF of at least 2
NettyHttpClient client = new NettyHttpClient(BASE_URL);
+ String localDc =
+ client
+ .get(new URIBuilder(BASE_PATH + "/metadata/localdc").build().toURL())
+ .thenApply(this::responseAsString)
+ .join();
+
+ String ks = "someTestKeyspace";
+ createKeyspace(client, localDc, ks, 2);
URIBuilder uriBuilder = new URIBuilder(BASE_PATH + "/ops/node/repair");
URI repairUri = uriBuilder.build();
// execute repair
- RepairRequest repairRequest = new RepairRequest("system_auth", null, Boolean.TRUE);
- String requestAsJSON = WriterUtility.asString(repairRequest, MediaType.APPLICATION_JSON);
+ RepairRequest repairRequest = new RepairRequest(ks, null, Boolean.TRUE);
+ String requestAsJSON = JSON_MAPPER.writeValueAsString(repairRequest);
boolean repairSuccessful =
client
@@ -743,6 +747,68 @@ public void testRepair() throws IOException, URISyntaxException, InterruptedExce
assertTrue("Repair request was not successful", repairSuccessful);
}
+ @Test
+ public void testAsyncRepair() throws IOException, URISyntaxException, InterruptedException {
+ assumeTrue(IntegrationTestUtils.shouldRun());
+ ensureStarted();
+
+ // create a keyspace with RF of at least 2
+ NettyHttpClient client = new NettyHttpClient(BASE_URL);
+ String localDc =
+ client
+ .get(new URIBuilder(BASE_PATH + "/metadata/localdc").build().toURL())
+ .thenApply(this::responseAsString)
+ .join();
+
+ String ks = "someTestKeyspace";
+ createKeyspace(client, localDc, ks, 2);
+
+ URIBuilder uriBuilder = new URIBuilder(BASE_PATH_V1 + "/ops/node/repair");
+ URI repairUri = uriBuilder.build();
+
+ // execute repair
+ RepairRequest repairRequest = new RepairRequest("someTestKeyspace", null, Boolean.TRUE);
+ String requestAsJSON = JSON_MAPPER.writeValueAsString(repairRequest);
+
+ Pair repairResponse =
+ client.post(repairUri.toURL(), requestAsJSON).thenApply(this::responseAsCodeAndBody).join();
+ assertThat(repairResponse.getLeft()).isEqualTo(HttpStatus.SC_ACCEPTED);
+ String jobId = repairResponse.getRight();
+ assertThat(jobId).isNotEmpty();
+
+ URI getJobDetailsUri =
+ new URIBuilder(BASE_PATH + "/ops/executor/job").addParameter("job_id", jobId).build();
+
+ await()
+ .atMost(Duration.ofMinutes(5))
+ .untilAsserted(
+ () -> {
+ Pair getJobDetailsResponse;
+ try {
+ getJobDetailsResponse =
+ client
+ .get(getJobDetailsUri.toURL())
+ .thenApply(this::responseAsCodeAndBody)
+ .join();
+ } catch (IllegalReferenceCountException e) {
+ // Just retry
+ assertFalse(true);
+ return;
+ }
+ assertThat(getJobDetailsResponse.getLeft()).isEqualTo(HttpStatus.SC_OK);
+ Map jobDetails =
+ new JsonMapper()
+ .readValue(
+ getJobDetailsResponse.getRight(),
+ new TypeReference>() {});
+ assertThat(jobDetails)
+ .hasEntrySatisfying("id", value -> assertThat(value).isEqualTo(jobId))
+ .hasEntrySatisfying("type", value -> assertThat(value).isEqualTo("repair"))
+ .hasEntrySatisfying(
+ "status", value -> assertThat(value).isIn("COMPLETED", "ERROR"));
+ });
+ }
+
@Test
public void testGetReplication() throws IOException, URISyntaxException {
assumeTrue(IntegrationTestUtils.shouldRun());
@@ -756,7 +822,7 @@ public void testGetReplication() throws IOException, URISyntaxException {
.join();
String ks = "getreplicationtest";
- createKeyspace(client, localDc, ks);
+ createKeyspace(client, localDc, ks, 1);
// missing keyspace
URI uri = new URIBuilder(BASE_PATH + "/ops/keyspace/replication").build();
@@ -825,6 +891,54 @@ public void testGetTables() throws IOException, URISyntaxException {
"views");
}
+ @Test
+ public void testGetTablesV1() throws IOException, URISyntaxException {
+ assumeTrue(IntegrationTestUtils.shouldRun());
+ ensureStarted();
+
+ NettyHttpClient client = new NettyHttpClient(BASE_URL);
+
+ // missing keyspace
+ URI uri = new URIBuilder(BASE_PATH_V1 + "/ops/tables").build();
+ Pair response =
+ client.get(uri.toURL()).thenApply(this::responseAsCodeAndBody).join();
+ assertThat(response.getLeft()).isEqualTo(HttpStatus.SC_BAD_REQUEST);
+ assertThat(response.getRight()).contains("Non-empty 'keyspaceName' must be provided");
+
+ // non existent keyspace
+ uri = new URIBuilder(BASE_PATH_V1 + "/ops/tables?keyspaceName=nonexistent").build();
+ response = client.get(uri.toURL()).thenApply(this::responseAsCodeAndBody).join();
+ assertThat(response.getLeft()).isEqualTo(HttpStatus.SC_OK);
+ assertThat(response.getRight()).isEqualTo("[]");
+
+ // existing keyspace
+ uri = new URIBuilder(BASE_PATH_V1 + "/ops/tables?keyspaceName=system_schema").build();
+ response = client.get(uri.toURL()).thenApply(this::responseAsCodeAndBody).join();
+ assertThat(response.getLeft()).isEqualTo(HttpStatus.SC_OK);
+
+ List actual =
+ new JsonMapper().readValue(response.getRight(), new TypeReference>() {});
+ assertThat(actual)
+ .extracting("name")
+ .contains(
+ "aggregates",
+ "columns",
+ "functions",
+ "indexes",
+ "keyspaces",
+ "tables",
+ "triggers",
+ "types",
+ "views");
+ assertThat(actual)
+ .allSatisfy(
+ table ->
+ assertThat(table.compaction)
+ .containsEntry(
+ "class",
+ "org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy"));
+ }
+
@Test
public void testCreateTable() throws IOException, URISyntaxException {
assumeTrue(IntegrationTestUtils.shouldRun());
@@ -839,7 +953,7 @@ public void testCreateTable() throws IOException, URISyntaxException {
// this test also tests case sensitivity in CQL identifiers.
String ks = "CreateTableTest";
- createKeyspace(client, localDc, ks);
+ createKeyspace(client, localDc, ks, 1);
CreateTableRequest request =
new CreateTableRequest(
@@ -922,34 +1036,62 @@ public void testMoveNode() throws IOException, URISyntaxException {
});
}
- private void createKeyspace(NettyHttpClient client, String localDc, String keyspaceName)
- throws IOException, URISyntaxException {
- CreateOrAlterKeyspaceRequest request =
- new CreateOrAlterKeyspaceRequest(
- keyspaceName, Arrays.asList(new ReplicationSetting(localDc, 1)));
- String requestAsJSON = WriterUtility.asString(request, MediaType.APPLICATION_JSON);
+ @Test
+ public void testEnsureStatusChanges() throws Exception {
+ assumeTrue(IntegrationTestUtils.shouldRun());
+ ensureStarted();
+ NettyHttpClient client = new NettyHttpClient(BASE_URL);
- URI uri = new URIBuilder(BASE_PATH + "/ops/keyspace/create").build();
- boolean requestSuccessful =
+ com.datastax.mgmtapi.resources.v2.models.RepairRequest req =
+ new com.datastax.mgmtapi.resources.v2.models.RepairRequest(
+ "system_distributed",
+ null,
+ true,
+ true,
+ Collections.singletonList(
+ new com.datastax.mgmtapi.resources.v2.models.RingRange(-1L, 100L)),
+ RepairParallelism.SEQUENTIAL,
+ null,
+ null);
+
+ logger.info("Sending repair request: {}", req);
+ URI repairUri = new URIBuilder(BASE_PATH_V2 + "/repairs").build();
+ Pair repairResp =
client
- .post(uri.toURL(), requestAsJSON)
- .thenApply(r -> r.status().code() == HttpStatus.SC_OK)
+ .put(repairUri.toURL(), new ObjectMapper().writeValueAsString(req))
+ .thenApply(this::responseAsCodeAndBody)
.join();
- assertTrue(requestSuccessful);
- }
-
- private String responseAsString(FullHttpResponse r) {
- if (r.status().code() == HttpStatus.SC_OK) {
- byte[] result = new byte[r.content().readableBytes()];
- r.content().readBytes(result);
-
- return new String(result);
- }
-
- return null;
- }
-
- private Pair responseAsCodeAndBody(FullHttpResponse r) {
- return Pair.of(r.status().code(), r.content().toString(UTF_8));
+ System.out.println("repairResp was " + repairResp);
+ String jobID =
+ new ObjectMapper().readValue(repairResp.getRight(), RepairRequestResponse.class).repairID;
+ Integer repairID =
+ Integer.parseInt(
+ jobID.substring(7) // Trimming off "repair-" prefix.
+ );
+ logger.info("Repair ID: {}", repairID);
+ assertThat(repairID).isNotNull();
+ assertThat(repairID).isGreaterThan(0);
+
+ URI statusUri =
+ new URIBuilder(BASE_PATH_V2 + "/ops/executor/job").addParameter("job_id", jobID).build();
+ Pair statusResp =
+ client.get(statusUri.toURL()).thenApply(this::responseAsCodeAndBody).join();
+ logger.info("Repair job status: {}", statusResp);
+ Job jobStatus = new ObjectMapper().readValue(statusResp.getRight(), Job.class);
+
+ assertThat(jobStatus.getStatus()).isNotNull();
+ assertThat(jobStatus.getStatusChanges()).isNotNull();
+ await()
+ .atMost(5, SECONDS)
+ .until(
+ () -> {
+ Pair statusResp2 =
+ client.get(statusUri.toURL()).thenApply(this::responseAsCodeAndBody).join();
+ logger.info("Repair job status: {}", statusResp);
+ Job jobStatus2 = new ObjectMapper().readValue(statusResp.getRight(), Job.class);
+ return jobStatus2.getStatusChanges().size() > 0
+ && jobStatus2.getStatus()
+ == com.datastax.mgmtapi.resources.models.Job.JobStatus.COMPLETED;
+ });
}
}
diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/helpers/NettyHttpClient.java b/management-api-server/src/test/java/com/datastax/mgmtapi/helpers/NettyHttpClient.java
index c56d4f70..027f638e 100644
--- a/management-api-server/src/test/java/com/datastax/mgmtapi/helpers/NettyHttpClient.java
+++ b/management-api-server/src/test/java/com/datastax/mgmtapi/helpers/NettyHttpClient.java
@@ -157,6 +157,36 @@ public CompletableFuture post(
return result;
}
+ public CompletableFuture put(
+ URL url, final CharSequence body, String contentType) throws UnsupportedEncodingException {
+ CompletableFuture result = new CompletableFuture<>();
+
+ if (!activeRequestFuture.compareAndSet(null, result))
+ throw new RuntimeException("outstanding request");
+
+ DefaultFullHttpRequest request =
+ new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.PUT, url.getFile());
+ request.headers().set(HttpHeaders.Names.CONTENT_TYPE, contentType);
+ request.headers().set(HttpHeaderNames.HOST, url.getHost());
+
+ if (body != null) {
+ request.content().writeBytes(body.toString().getBytes(CharsetUtil.UTF_8.name()));
+ request.headers().set(HttpHeaders.Names.CONTENT_LENGTH, request.content().readableBytes());
+ } else {
+ request.headers().set(HttpHeaders.Names.CONTENT_LENGTH, 0);
+ }
+
+ // Send the HTTP request.
+ client.writeAndFlush(request);
+
+ return result;
+ }
+
+ public CompletableFuture put(URL url, final CharSequence body)
+ throws UnsupportedEncodingException {
+ return post(url, body, "application/json");
+ }
+
public CompletableFuture delete(URL url) {
return buildAndSendRequest(HttpMethod.DELETE, url);
}
diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/resources/v2/NonDestructiveOpsResourcesV2IT.java b/management-api-server/src/test/java/com/datastax/mgmtapi/resources/v2/NonDestructiveOpsResourcesV2IT.java
new file mode 100644
index 00000000..f248b545
--- /dev/null
+++ b/management-api-server/src/test/java/com/datastax/mgmtapi/resources/v2/NonDestructiveOpsResourcesV2IT.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+package com.datastax.mgmtapi.resources.v2;
+
+import static com.datastax.mgmtapi.NonDestructiveOpsIT.ensureStarted;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assume.assumeTrue;
+
+import com.datastax.mgmtapi.BaseDockerIntegrationTest;
+import com.datastax.mgmtapi.helpers.IntegrationTestUtils;
+import com.datastax.mgmtapi.helpers.NettyHttpClient;
+import com.datastax.mgmtapi.resources.v2.models.TokenRangeToEndpointResponse;
+import java.io.IOException;
+import java.net.URI;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.utils.URIBuilder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class NonDestructiveOpsResourcesV2IT extends BaseDockerIntegrationTest {
+
+ public NonDestructiveOpsResourcesV2IT(String version) throws IOException {
+ super(version);
+ }
+
+ @Test
+ public void testGetTokenRangeToEndpointMap() throws Exception {
+ assumeTrue(IntegrationTestUtils.shouldRun());
+ ensureStarted();
+
+ NettyHttpClient client = new NettyHttpClient(BASE_URL);
+ final URIBuilder uriBuilder = new URIBuilder(BASE_PATH_V2 + "/tokens/rangetoendpoint");
+ // test keyspace not found
+ URI uri = uriBuilder.setParameter("keyspaceName", "notfoundkeyspace").build();
+ Pair response =
+ client.get(uri.toURL()).thenApply(this::responseAsCodeAndBody).join();
+ assertThat(response.getLeft()).isEqualTo(HttpStatus.SC_NOT_FOUND);
+ // test keyspace exists
+ uri = uriBuilder.setParameter("keyspaceName", "system_schema").build();
+ response = client.get(uri.toURL()).thenApply(this::responseAsCodeAndBody).join();
+ assertThat(response.getLeft()).isEqualTo(HttpStatus.SC_OK);
+ String mappingString = response.getRight();
+ assertThat(mappingString).isNotNull().isNotEmpty();
+ TokenRangeToEndpointResponse mapping =
+ JSON_MAPPER.readValue(mappingString, TokenRangeToEndpointResponse.class);
+ assertThat(mapping.tokenRangeToEndpoints).isNotNull().isNotEmpty().hasSize(getNumTokenRanges());
+ }
+}
diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/resources/v2/RepairResourcesV2Test.java b/management-api-server/src/test/java/com/datastax/mgmtapi/resources/v2/RepairResourcesV2Test.java
new file mode 100644
index 00000000..12abe689
--- /dev/null
+++ b/management-api-server/src/test/java/com/datastax/mgmtapi/resources/v2/RepairResourcesV2Test.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Please see the included license file for details.
+ */
+package com.datastax.mgmtapi.resources.v2;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.datastax.mgmtapi.CqlService;
+import com.datastax.mgmtapi.ManagementApplication;
+import com.datastax.mgmtapi.resources.v2.models.RepairParallelism;
+import com.datastax.mgmtapi.resources.v2.models.RepairRequest;
+import com.datastax.mgmtapi.resources.v2.models.RepairRequestResponse;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.ws.rs.core.Response;
+import org.junit.Test;
+
+public class RepairResourcesV2Test {
+
+ @Test
+ public void testRepairResourcesSuccess() throws Exception {
+ CqlService mockCqlService = mock(CqlService.class);
+ ManagementApplication app =
+ new ManagementApplication(
+ null, null, new File("/tmp/cassandra.sock"), mockCqlService, null);
+ ResultSet mockResultSet = mock(ResultSet.class);
+ Row mockRow = mock(Row.class);
+ when(mockResultSet.one()).thenReturn(mockRow);
+ when(mockRow.getString(anyInt())).thenReturn("mockRepairID");
+ when(mockCqlService.executePreparedStatement(
+ any(), anyString(), any(), any(), any(), any(), any(), any(), any(), any()))
+ .thenReturn(mockResultSet);
+ RepairResourcesV2 unit = new RepairResourcesV2(app);
+ RepairRequest req =
+ new RepairRequest(
+ "keyspace",
+ Collections.singletonList("table1"),
+ false,
+ true,
+ Collections.EMPTY_LIST,
+ RepairParallelism.DATACENTER_AWARE,
+ Collections.EMPTY_LIST,
+ 1);
+ Response resp = unit.repair(req);
+ assertEquals(202, resp.getStatus());
+ assertEquals("mockRepairID", ((RepairRequestResponse) resp.getEntity()).repairID);
+ verify(mockCqlService)
+ .executePreparedStatement(
+ any(),
+ eq("CALL NodeOps.repair(?, ?, ?, ?, ?, ?, ?, ?)"),
+ eq("keyspace"),
+ eq(Collections.singletonList("table1")),
+ eq(false),
+ eq(true),
+ eq(RepairParallelism.DATACENTER_AWARE.getName()),
+ eq(Collections.EMPTY_LIST),
+ eq(null),
+ eq(Integer.valueOf(1)));
+ }
+
+ @Test
+ public void testRepairResourcesFail() throws Exception {
+ CqlService mockCqlService = mock(CqlService.class);
+ ManagementApplication app =
+ new ManagementApplication(
+ null, null, new File("/tmp/cassandra.sock"), mockCqlService, null);
+ ResultSet mockResultSet = mock(ResultSet.class);
+ Row mockRow = mock(Row.class);
+ when(mockRow.getString(anyString())).thenReturn("mockrepairID");
+ when(mockCqlService.executePreparedStatement(
+ any(), anyString(), any(), any(), any(), any(), any(), any(), any(), any()))
+ .thenReturn(mockResultSet);
+ RepairResourcesV2 unit = new RepairResourcesV2(app);
+ List tables = new ArrayList<>();
+ tables.add("table1");
+ tables.add("table2");
+ RepairRequest req =
+ new RepairRequest(
+ "",
+ tables,
+ false,
+ true,
+ Collections.EMPTY_LIST,
+ RepairParallelism.DATACENTER_AWARE,
+ Collections.EMPTY_LIST,
+ 1);
+ Response resp = unit.repair(req);
+ assertEquals(500, resp.getStatus());
+ }
+
+ @Test
+ public void testCancelAllRepairs() throws Exception {
+ CqlService mockCqlService = mock(CqlService.class);
+ ManagementApplication app =
+ new ManagementApplication(
+ null, null, new File("/tmp/cassandra.sock"), mockCqlService, null);
+ RepairResourcesV2 unit = new RepairResourcesV2(app);
+ Response resp = unit.cancelAllRepairs();
+ assertEquals(202, resp.getStatus());
+ verify(mockCqlService).executePreparedStatement(any(), eq("CALL NodeOps.stopAllRepairs()"));
+ }
+}
diff --git a/pom.xml b/pom.xml
index 63a400d1..95fa28a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
4.0.10
3.2.13
4.13.2
+ 3.17.2
1.12.19
build_version.sh
1.7.25