Formatting...

k8ssandra · Aug 20, 2024 · cf88568 · cf88568
1 parent 2dc6d11
commit cf88568
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 38 deletions.
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
@@ -60,7 +60,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /** Replace JMX calls with CQL 'CALL' methods via the Rpc framework */
 public class NodeOpsProvider {
   private static final Logger logger = LoggerFactory.getLogger(NodeOpsProvider.class);
@@ -943,10 +942,9 @@ public String move(
 
   @Rpc(name = "reloadTruststore")
   public void reloadTruststore() throws Exception {
-   ShimLoader.instance.get().reloadTrustManager();
+    ShimLoader.instance.get().reloadTrustManager();
   }
 
-
   @Rpc(name = "getRangeToEndpointMap")
   public Map<List<String>, List<String>> getRangeToEndpointMap(
       @RpcParam(name = "keyspaceName") String keyspaceName) {

diff --git a/management-api-agent-dse-6.9/src/main/java/com/datastax/mgmtapi/shim/DseAPI69.java b/management-api-agent-dse-6.9/src/main/java/com/datastax/mgmtapi/shim/DseAPI69.java
@@ -338,5 +338,4 @@ public HintsService getHintsService() {
   public void reloadTrustManager() throws Exception {
     DseReloadableTrustManager.serverEncryptionInstance().reloadTrustManager();
   }
-
 }
diff --git a/management-api-common/src/main/java/com/datastax/mgmtapi/shims/CassandraAPI.java b/management-api-common/src/main/java/com/datastax/mgmtapi/shims/CassandraAPI.java
@@ -86,5 +86,4 @@ default List<String> getKeyspaces() {
   default void reloadTrustManager() throws Exception {
     throw new Exception("Unimplemented for Cassandra, only available for DSE");
   };
-
 }
diff --git a/management-api-server/src/main/java/com/datastax/mgmtapi/resources/NodeOpsResources.java b/management-api-server/src/main/java/com/datastax/mgmtapi/resources/NodeOpsResources.java
@@ -663,39 +663,38 @@ public Response searchIndexRebuild(
         });
   }
 
-    @POST
-    @Path("/reload-truststore")
-    @Produces(MediaType.TEXT_PLAIN)
-    @ApiResponse(
-            responseCode = "200",
-            description = "Truststore reloaded successfully",
-            content =
-            @Content(
-                    mediaType = MediaType.TEXT_PLAIN,
-                    schema = @Schema(implementation = String.class),
-                    examples = @ExampleObject(value = "OK")))
-    @Operation(summary = "reload truststore", operationId = "reloadTruststore")
-    public Response reloadTruststore() {
-        return handle(
-                () -> {
-                    final String releaseVersion =
-                            ResponseTools.getSingleRowStringResponse(
-                                    app.dbUnixSocketFile, app.cqlService, CASSANDRA_VERSION_CQL_STRING);
-                    if (!releaseVersion.startsWith("4.0.0.68") && !releaseVersion.startsWith("4.0.0.69")) {
-                        // rebuilding search index is only possible on DSE
-                        return Response.status(Response.Status.BAD_REQUEST)
-                                .entity("Reloading the truststore manually is only possible on DSE")
-                                .build();
-                    }
-
-                    app.cqlService.executeCql(app.dbUnixSocketFile, "CALL NodeOps.reloadTruststore()");
-
-                    return Response.ok("OK").build();
-                });
-    }
-
-
-    private static final String FQL_QUERY_RESPONSE_EXAMPLE =
+  @POST
+  @Path("/reload-truststore")
+  @Produces(MediaType.TEXT_PLAIN)
+  @ApiResponse(
+      responseCode = "200",
+      description = "Truststore reloaded successfully",
+      content =
+          @Content(
+              mediaType = MediaType.TEXT_PLAIN,
+              schema = @Schema(implementation = String.class),
+              examples = @ExampleObject(value = "OK")))
+  @Operation(summary = "reload truststore", operationId = "reloadTruststore")
+  public Response reloadTruststore() {
+    return handle(
+        () -> {
+          final String releaseVersion =
+              ResponseTools.getSingleRowStringResponse(
+                  app.dbUnixSocketFile, app.cqlService, CASSANDRA_VERSION_CQL_STRING);
+          if (!releaseVersion.startsWith("4.0.0.68") && !releaseVersion.startsWith("4.0.0.69")) {
+            // rebuilding search index is only possible on DSE
+            return Response.status(Response.Status.BAD_REQUEST)
+                .entity("Reloading the truststore manually is only possible on DSE")
+                .build();
+          }
+
+          app.cqlService.executeCql(app.dbUnixSocketFile, "CALL NodeOps.reloadTruststore()");
+
+          return Response.ok("OK").build();
+        });
+  }
+
+  private static final String FQL_QUERY_RESPONSE_EXAMPLE =
       "{\n"
           + "    \"entity\": false,\n"
           + "    \"variant\": {\n"