ensure that we return 200 instead of 204 for success

Author: kahing

clusterhq/queue/src/main/java/us/hxbc/clusterhq/queue/Api.java

@@ -11,11 +11,13 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Map;
 
 import static java.util.Objects.requireNonNull;
 
+@Path("/")
 public class Api {
     private final java.nio.file.Path dir;
     private final long CHUNK_SIZE;
@@ -28,17 +30,20 @@ public class Api {
 
     @Path("/{topic}/{username}")
     @POST
-    public void subscribe(@PathParam("topic") String topic,
+    public Response subscribe(@PathParam("topic") String topic,
                           @PathParam("username") String username) throws IOException {
         ensureTopic(topic).subscribe(username);
+        return Response.ok().build();
     }
 
     private Queue ensureTopic(@PathParam("topic") String topic) throws IOException {
         Queue q;
         synchronized (topics) {
             q = topics.get(topic);
             if (q == null) {
-                q = new Queue(dir, CHUNK_SIZE);
+                java.nio.file.Path p = dir.resolve(topic);
+                Files.createDirectory(p);
+                q = new Queue(p, CHUNK_SIZE);
                 topics.put(topic, q);
             }
         }
@@ -47,26 +52,28 @@ private Queue ensureTopic(@PathParam("topic") String topic) throws IOException {
 
     @Path("/{topic}/{username}")
     @DELETE
-    public void unsubscribe(@PathParam("topic") String topic,
+    public Response unsubscribe(@PathParam("topic") String topic,
                             @PathParam("username") String username) throws IOException {
         Queue q;
         synchronized (topics) {
             q = topics.get(topic);
         }
 
         if (q == null) {
-            throw new ClientErrorException(Response.Status.NOT_FOUND);
+            return Response.status(Response.Status.NOT_FOUND).build();
         } else {
             q.unsubscribe(username);
+            return Response.ok().build();
         }
     }
 
     @Path("/{topic}")
     @POST
-    public void publish(@PathParam("topic") String topic,
+    public Response publish(@PathParam("topic") String topic,
                         @Context Request request) throws IOException {
         ensureTopic(topic).post(request.getInputStream());
         request.getInputStream().close();
+        return Response.ok().build();
     }
 
     @Path("/{topic}/{username}")

clusterhq/queue/src/main/java/us/hxbc/clusterhq/queue/Main.java

@@ -1,6 +1,6 @@
 package us.hxbc.clusterhq.queue;
 
-import org.glassfish.grizzly.http.server.HttpServer;
+import org.glassfish.jersey.filter.LoggingFilter;
 import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.slf4j.Logger;
@@ -27,9 +27,11 @@ public static void main(String[] args) {
             System.exit(1);
         }
 
-        HttpServer server;
         ResourceConfig rc = new ResourceConfig();
-        rc.register(new Api(dir, 4096));
+        rc.registerInstances(new Api(dir, 4096));
+        if (logger.isDebugEnabled()) {
+            rc.register(new LoggingFilter(java.util.logging.Logger.getGlobal(), false));
+        }
         GrizzlyHttpServerFactory.createHttpServer(URI.create("http://0.0.0.0:" + port), rc);
     }
 }