From 7e852ead979fbb113773c2dfc8bc143d61d9c81b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Hegerfors?= Date: Tue, 17 Mar 2015 17:56:18 +0100 Subject: [PATCH] Add name property to ClusterStatus --- .../java/com/spotify/reaper/resources/ClusterResource.java | 5 +++-- .../com/spotify/reaper/resources/view/ClusterStatus.java | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/spotify/reaper/resources/ClusterResource.java b/src/main/java/com/spotify/reaper/resources/ClusterResource.java index 4a141d894..505e83885 100644 --- a/src/main/java/com/spotify/reaper/resources/ClusterResource.java +++ b/src/main/java/com/spotify/reaper/resources/ClusterResource.java @@ -79,7 +79,7 @@ public Response getCluster( private Response viewCluster(String clusterName, Optional limit, Optional createdURI) { ClusterStatus view = - new ClusterStatus(context.storage.getClusterRunStatuses(clusterName, limit.or(10))); + new ClusterStatus(clusterName, context.storage.getClusterRunStatuses(clusterName, limit.or(10))); if (view.repairRuns == null) { return Response.status(Response.Status.NOT_FOUND) @@ -180,7 +180,8 @@ public Response deleteCluster( } Optional deletedCluster = context.storage.deleteCluster(clusterName); if (deletedCluster.isPresent()) { - return Response.ok(new ClusterStatus(Collections.emptyList())).build(); + return Response.ok(new ClusterStatus(clusterName, Collections.emptyList())) + .build(); } return Response.serverError().entity("delete failed for schedule with name \"" + clusterName + "\"").build(); diff --git a/src/main/java/com/spotify/reaper/resources/view/ClusterStatus.java b/src/main/java/com/spotify/reaper/resources/view/ClusterStatus.java index 8ccc1671d..5752dcf49 100644 --- a/src/main/java/com/spotify/reaper/resources/view/ClusterStatus.java +++ b/src/main/java/com/spotify/reaper/resources/view/ClusterStatus.java @@ -19,10 +19,13 @@ public class ClusterStatus { + @JsonProperty + public final String name; @JsonProperty("repair_runs") public final Collection repairRuns; - public ClusterStatus(Collection repairRuns) { + public ClusterStatus(String name, Collection repairRuns) { + this.name = name; this.repairRuns = repairRuns; } }