svn commit: r1658835 - in /tika/trunk/tika-server/src: main/java/org/apache/tika/server/ test/java/org/apache/tika/server/

[tp...@apache.org]

Author: tpalsulich
Date: Tue Feb 10 23:26:47 2015
New Revision: 1658835

URL: http://svn.apache.org/r1658835
Log:
TIKA-1547. Use POST for HTML form input.

Modified:
    tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataResource.java
    tika/trunk/tika-server/src/main/java/org/apache/tika/server/RecursiveMetadataResource.java
    tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
    tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java

Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataResource.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataResource.java?rev=1658835&r1=1658834&r2=1658835&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataResource.java (original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataResource.java Tue Feb 10 23:26:47 2015
@@ -20,6 +20,7 @@ package org.apache.tika.server;
 import java.io.InputStream;
 
 import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -51,7 +52,7 @@ public class MetadataResource {
     this.tikaConfig = tikaConfig;
   }
 
-  @PUT
+  @POST
   @Consumes("multipart/form-data")
   @Produces({"text/csv", "application/json", "application/rdf+xml"})
   @Path("form")

Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/RecursiveMetadataResource.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/RecursiveMetadataResource.java?rev=1658835&r1=1658834&r2=1658835&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/RecursiveMetadataResource.java (original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/RecursiveMetadataResource.java Tue Feb 10 23:26:47 2015
@@ -29,6 +29,7 @@ import org.apache.tika.sax.BasicContentH
 import org.xml.sax.helpers.DefaultHandler;
 
 import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -49,7 +50,7 @@ public class RecursiveMetadataResource {
     this.tikaConfig = tikaConfig;
   }
 
-  @PUT
+  @POST
   @Consumes("multipart/form-data")
   @Produces({"text/csv", "application/json"})
   @Path("form")

Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java?rev=1658835&r1=1658834&r2=1658835&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java (original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java Tue Feb 10 23:26:47 2015
@@ -21,6 +21,7 @@ import javax.mail.internet.ContentDispos
 import javax.mail.internet.ParseException;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -232,7 +233,7 @@ public static void fillMetadata(AutoDete
     }
   }
 
-  @PUT
+  @POST
   @Consumes("multipart/form-data")
   @Produces("text/plain")
   @Path("form")
@@ -303,7 +304,7 @@ public static void fillMetadata(AutoDete
     };
   }
 
-  @PUT
+  @POST
   @Consumes("multipart/form-data")
   @Produces("text/html")
   @Path("form")
@@ -318,7 +319,7 @@ public static void fillMetadata(AutoDete
 	  return produceOutput(is, httpHeaders.getRequestHeaders(), info, "html");
   }
 
-  @PUT
+  @POST
   @Consumes("multipart/form-data")
   @Produces("text/xml")
   @Path("form")

Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java?rev=1658835&r1=1658834&r2=1658835&view=diff
==============================================================================
--- tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java (original)
+++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java Tue Feb 10 23:26:47 2015
@@ -136,7 +136,7 @@ public class TikaResourceTest extends CX
         WebClient webClient = WebClient.create(endPoint + TIKA_PATH + "/form");
         Response response = webClient.type("multipart/form-data")
                 .accept("text/xml")
-                .put(attachmentPart);
+                .post(attachmentPart);
         String responseMsg = getStringFromInputStream((InputStream) response
                 .getEntity());
         assertTrue(responseMsg.contains("test"));