Add RepairRun GET resource

thelastpickle · Dec 9, 2014 · d5b61b4 · d5b61b4
1 parent d5a6d09
commit d5b61b4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/src/main/java/com/spotify/reaper/ReaperApplication.java b/src/main/java/com/spotify/reaper/ReaperApplication.java
@@ -15,6 +15,7 @@
 
 import com.spotify.reaper.resources.ClusterResource;
 import com.spotify.reaper.resources.PingResource;
+import com.spotify.reaper.resources.RepairRunResource;
 import com.spotify.reaper.resources.TableResource;
 import com.spotify.reaper.service.RepairRunner;
 import com.spotify.reaper.storage.IStorage;
@@ -60,10 +61,12 @@ public void run(ReaperApplicationConfiguration config,
     final PingResource pingResource = new PingResource();
     final ClusterResource addClusterResource = new ClusterResource(storage);
     final TableResource addTableResource = new TableResource(config, storage);
+    final RepairRunResource addRepairRunResource = new RepairRunResource(storage);
 
     environment.jersey().register(pingResource);
     environment.jersey().register(addClusterResource);
     environment.jersey().register(addTableResource);
+    environment.jersey().register(addRepairRunResource);
 
     LOG.info("Reaper is ready to accept connections");
   }

diff --git a/src/main/java/com/spotify/reaper/resources/RepairRunResource.java b/src/main/java/com/spotify/reaper/resources/RepairRunResource.java
@@ -15,6 +15,7 @@
 
 import com.google.common.base.Optional;
 
+import com.spotify.reaper.core.RepairRun;
 import com.spotify.reaper.storage.IStorage;
 
 import org.slf4j.Logger;
@@ -43,12 +44,13 @@ public RepairRunResource(IStorage storage) {
 
   @GET
   @Path("/{id}")
-  public Response getCluster(@PathParam("id") Long repairRunId) {
+  public Response getRepairRun(@PathParam("id") Long repairRunId) {
     LOG.info("get repair_run called with: id = {}", repairRunId);
-    return Response.ok().entity("not implemented yet").build();
+    RepairRun repairRun = storage.getRepairRun(repairRunId, null);
+    return Response.ok().entity(repairRun).build();
   }
 
   // We probably don't want to create repair runs with this resource,
-  // but actually only by posting the cluster resource.
+  // but actually only by posting the table resource.
   // Get here is used only for providing visibility to what is going on with the run.
 }
diff --git a/src/main/java/com/spotify/reaper/resources/TableResource.java b/src/main/java/com/spotify/reaper/resources/TableResource.java
@@ -63,7 +63,7 @@ public TableResource(ReaperApplicationConfiguration config, IStorage storage) {
 
   @GET
   @Path("/{clusterName}/{keyspace}/{table}")
-  public Response getCluster(@PathParam("clusterName") String clusterName,
+  public Response getTable(@PathParam("clusterName") String clusterName,
                              @PathParam("keyspace") String keyspace,
                              @PathParam("table") String table) {
     LOG.info("get table called with: clusterName = {}, keyspace = {}, table = {}",

diff --git a/src/main/java/com/spotify/reaper/storage/MemoryStorage.java b/src/main/java/com/spotify/reaper/storage/MemoryStorage.java
@@ -23,6 +23,7 @@
 
 import java.math.BigInteger;
 import java.util.Collection;
+import java.util.LinkedHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -40,7 +41,7 @@ public class MemoryStorage implements IStorage {
   private ConcurrentMap<Long, ColumnFamily> columnFamilies = Maps.newConcurrentMap();
   private ConcurrentMap<TableName, ColumnFamily> columnFamiliesByName = Maps.newConcurrentMap();
   private ConcurrentMap<Long, RepairSegment> repairSegments = Maps.newConcurrentMap();
-  private ConcurrentMap<Long, ConcurrentMap<Long, RepairSegment>> repairSegmentsByRunId =
+  private ConcurrentMap<Long, LinkedHashMap<Long, RepairSegment>> repairSegmentsByRunId =
       Maps.newConcurrentMap();
 
   public static class TableName {
@@ -146,8 +147,7 @@ public ColumnFamily getColumnFamily(String cluster, String keyspace, String tabl
 
   @Override
   public int addRepairSegments(Collection<RepairSegment.Builder> segments) {
-    //Collection<RepairSegment> newSegments = Lists.newArrayList();
-    ConcurrentMap<Long, RepairSegment> newSegments = Maps.newConcurrentMap();
+    LinkedHashMap<Long, RepairSegment> newSegments = Maps.newLinkedHashMap();
     for (RepairSegment.Builder segment : segments) {
       RepairSegment newRepairSegment = segment.build(SEGMENT_ID.incrementAndGet());
       repairSegments.put(newRepairSegment.getId(), newRepairSegment);