Add method for converting cluster name to symbolic name valid for URLs

Also added getPartitionarName to ClusterInfo. ClusterResource uses these.

Author: Bj0rnen

src/main/java/com/spotify/reaper/cassandra/ClusterInfo.java

@@ -9,6 +9,7 @@ public class ClusterInfo implements IClusterInfo {
   private String seedHost;
   private int seedPort = 0;
   private String clusterName;
+  private String partitionerName;
 
   private List<String> tokens;
 
@@ -26,6 +27,7 @@ public ClusterInfo init() throws ReaperException {
         seedPort == 0 ? JMXProxy.connect(seedHost) : JMXProxy.connect(seedHost, seedPort);
     tokens = jmx.getTokens();
     clusterName = jmx.getClusterName();
+    partitionerName = jmx.getPartitionerName();
     jmx.close();
     return this;
   }
@@ -40,4 +42,18 @@ public String getClusterName() {
     return clusterName;
   }
 
+  public static String toSymbolicName(String s) {
+    return s.toLowerCase().replaceAll("[^a-z0-9_]", "");
+  }
+
+  @Override
+  public String getSymbolicName() {
+    return toSymbolicName(clusterName);
+  }
+
+  @Override
+  public String getPartitionerName() {
+    return partitionerName;
+  }
+
 }

src/main/java/com/spotify/reaper/cassandra/IClusterInfo.java

@@ -3,8 +3,8 @@
 import java.util.List;
 
 public interface IClusterInfo {
-
-  public List<String> getTokens();
-
-  public String getClusterName();
+  List<String> getTokens();
+  String getClusterName();
+  String getSymbolicName();
+  String getPartitionerName();
 }

src/main/java/com/spotify/reaper/cassandra/JMXProxy.java

@@ -63,6 +63,10 @@ public String getClusterName() {
     return ssProxy.getClusterName();
   }
 
+  public String getPartitionerName() {
+    return ssProxy.getPartitionerName();
+  }
+
   public void close() throws ReaperException {
     try {
       jmxConnector.close();

src/main/java/com/spotify/reaper/resources/ClusterResource.java

@@ -4,6 +4,7 @@
 
 import com.spotify.reaper.ReaperException;
 import com.spotify.reaper.cassandra.ClusterInfo;
+import com.spotify.reaper.cassandra.IClusterInfo;
 import com.spotify.reaper.core.Cluster;
 import com.spotify.reaper.storage.IStorage;
 
@@ -12,6 +13,7 @@
 
 import java.net.URI;
 import java.net.URL;
+import java.util.Collections;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -51,7 +53,7 @@ public Response addCluster(@Context UriInfo uriInfo, @QueryParam("host") Optiona
     }
     LOG.info("add cluster called with host: {}", host);
 
-    ClusterInfo clusterInfo;
+    IClusterInfo clusterInfo;
     try {
       clusterInfo = ClusterInfo.getInstance(host.get());
     } catch (ReaperException e) {
@@ -61,14 +63,23 @@ public Response addCluster(@Context UriInfo uriInfo, @QueryParam("host") Optiona
       return Response.status(400).entity(errMsg).build();
     }
 
+
     URI createdURI = null;
     try {
-      createdURI = (new URL(uriInfo.getAbsolutePath().toURL(), "1")).toURI();
+      createdURI = (new URL(uriInfo.getAbsolutePath().toURL(), clusterInfo.getSymbolicName())).toURI();
     } catch (Exception e) {
-      LOG.error("failed creating target URI: " + uriInfo.getAbsolutePath());
+      String errMsg = "failed creating target for cluster: " + clusterInfo.getSymbolicName();
+      LOG.error(errMsg);
       e.printStackTrace();
+      return Response.status(400).entity(errMsg).build();
     }
 
+    storage.addCluster(new Cluster.Builder()
+                           .name(clusterInfo.getClusterName())
+                           .seedHosts(Collections.singleton(host.get()))
+                           .partitioner(clusterInfo.getPartitionerName())
+                           .build());
+
     String replyMsg = "cluster with name \"" + clusterInfo.getClusterName() + "\" created";
     return Response.created(createdURI).entity(replyMsg).build();
   }

src/test/java/com/spotify/reaper/cassandra/ClusterInfoTest.java

@@ -0,0 +1,13 @@
+package com.spotify.reaper.cassandra;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ClusterInfoTest {
+  @Test
+  public void testGetSymbolicName() {
+    assertEquals("example2cluster", ClusterInfo.toSymbolicName("Example2 Cluster"));
+    assertEquals("example2_cluster", ClusterInfo.toSymbolicName("Example2_Cluster"));
+  }
+}