svn commit: r1706934 - in /nutch/trunk: CHANGES.txt src/java/org/apache/nutch/service/resources/SeedResource.java

[ma...@apache.org]

Author: mattmann
Date: Mon Oct  5 23:53:40 2015
New Revision: 1706934

URL: http://svn.apache.org/viewvc?rev=1706934&view=rev
Log:
Fix for NUTCH-2123: Seed List REST API returns Text but headers indicate/require JSON contributedy by Sujen Shah and Aron Ahmadia.

Modified:
    nutch/trunk/CHANGES.txt
    nutch/trunk/src/java/org/apache/nutch/service/resources/SeedResource.java

Modified: nutch/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1706934&r1=1706933&r2=1706934&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Mon Oct  5 23:53:40 2015
@@ -2,6 +2,9 @@ Nutch Change Log
    
 Nutch Current Development 1.11-SNAPSHOT
 
+* NUTCH-2123 Seed List REST API returns Text but headers indicate/require JSON
+  (Aron Ahmadia, Sujen Shah via mattmann)
+
 * NUTCH-2086 Nutch 1.X Webui (Sujen Shah, mattmann via lewismc)
 
 * NUTCH-2121 Update javadoc link for Hadoop 2.4.0 in default.properties (Sujen Shah)

Modified: nutch/trunk/src/java/org/apache/nutch/service/resources/SeedResource.java
URL: http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/service/resources/SeedResource.java?rev=1706934&r1=1706933&r2=1706934&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/service/resources/SeedResource.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/service/resources/SeedResource.java Mon Oct  5 23:53:40 2015
@@ -28,6 +28,7 @@ import java.util.Collection;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -49,15 +50,16 @@ public class SeedResource extends Abstra
   @POST
   @Path("/create")
   @Consumes(MediaType.APPLICATION_JSON)
+  @Produces(MediaType.TEXT_PLAIN)
   /**
    * Method creates seed list file and returns temorary directory path
    * @param seedList
    * @return
    */
-  public String createSeedFile(SeedList seedList) {
+  public Response createSeedFile(SeedList seedList) {
     if (seedList == null) {
-      throw new WebApplicationException(Response.status(Status.BAD_REQUEST)
-          .entity("Seed list cannot be empty!").build());
+      return Response.status(Status.BAD_REQUEST)
+          .entity("Seed list cannot be empty!").build();
     }
     File seedFile = createSeedFile();
     BufferedWriter writer = getWriter(seedFile);
@@ -69,7 +71,7 @@ public class SeedResource extends Abstra
       }
     }
 
-    return seedFile.getParent();
+    return Response.ok().entity(seedFile.getParent()).build();
   }
 
   private void writeUrl(BufferedWriter writer, SeedUrl seedUrl) {