From 407e413a90148cbfdce88cc4dfc082785f5f77b5 Mon Sep 17 00:00:00 2001
From: Gian Merlino <gianmerlino@gmail.com>
Date: Wed, 1 May 2013 17:13:02 +0300
Subject: [PATCH] IndexerCoordinatorResource: Return 404 with proper json for
 status not found

---
 .../http/IndexerCoordinatorResource.java       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorResource.java b/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorResource.java
index 8fb4211d7bd..3a3a9b4930a 100644
--- a/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorResource.java
+++ b/merger/src/main/java/com/metamx/druid/merger/coordinator/http/IndexerCoordinatorResource.java
@@ -140,12 +140,7 @@ public class IndexerCoordinatorResource
   @Produces("application/json")
   public Response getTaskStatus(@PathParam("taskid") String taskid)
   {
-    final Optional<TaskStatus> status = taskStorageQueryAdapter.getSameGroupMergedStatus(taskid);
-    if (!status.isPresent()) {
-      return Response.status(Response.Status.NOT_FOUND).build();
-    } else {
-      return Response.ok().entity(status.get()).build();
-    }
+    return optionalTaskResponse(taskid, "status", taskStorageQueryAdapter.getSameGroupMergedStatus(taskid));
   }
 
   @GET
@@ -349,6 +344,17 @@ public class IndexerCoordinatorResource
     }
   }
 
+  public <T> Response optionalTaskResponse(String taskid, String objectType, Optional<T> x) {
+    final Map<String, Object> results = Maps.newHashMap();
+    results.put("task", taskid);
+    if (x.isPresent()) {
+      results.put(objectType, x.get());
+      return Response.status(Response.Status.OK).entity(results).build();
+    } else {
+      return Response.status(Response.Status.NOT_FOUND).entity(results).build();
+    }
+  }
+
   public <T> Response asLeaderWith(Optional<T> x, Function<T, Response> f)
   {
     if (x.isPresent()) {