update Boilerpipe and JavaReadability resources to use multipart.Form…

…DataParam for POST requests
aaronland · Feb 22, 2022 · dfabd87 · dfabd87
1 parent 0f614f8
commit dfabd87
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ build: todo
 	mvn install
 
 run:
-	java -jar target/extruder-2.0.jar server
+	java -jar target/extruder-2.0.1.jar server
 
 todo:
 	echo "# Generated automatically at" `date` > TODO.txt

diff --git a/TODO.txt b/TODO.txt
@@ -1,10 +1,10 @@
-# Generated automatically at Fri Feb 18 17:32:35 PST 2022
+# Generated automatically at Tue Feb 22 10:39:10 PST 2022
 
 ./src/main/java/info/aaronland/extruder/JavaReadabilityResource.java:54:	// TODO: trap MalformedURLExceptions and return NOT_ACCEPTABLE here (20130901/straup)
 ./src/main/java/info/aaronland/extruder/BoilerpipeResource.java:52:	// TODO: trap MalformedURLExceptions and return NOT_ACCEPTABLE here (20130901/straup)
 ./src/main/java/info/aaronland/extruder/ExtruderApplication.java:40:	// TODO: put me in the config file... (20130908/straup)
 ./src/main/java/com/basistech/readability/Readability.java:93:        // TODO: reset the results.
 ./src/main/java/com/basistech/readability/Readability.java:368:         * http://www.peachpit.com/articles/article.aspx?p=31567&seqNum=5 TODO: Shouldn't this be a reverse
 ./src/main/java/com/basistech/readability/Readability.java:686:         * at the same time without effecting the traversal. TODO: Consider taking into account original
-./src/main/java/info/aaronland/extruder/TikaResource.java:139:    // TO DO: figure out how to make this return HTML instead of text
+./src/main/java/info/aaronland/extruder/TikaResource.java:138:    // TO DO: figure out how to make this return HTML instead of text
 ./src/main/java/info/aaronland/extruder/Upload.java:20:	// TO DO: sort out file extensions etc.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>info.aaronland.extruder</groupId> 
     <artifactId>extruder</artifactId>
-    <version>2.0</version>
+    <version>2.0.1</version>
 
     <dependencies>
 

diff --git a/src/main/java/info/aaronland/extruder/BoilerpipeResource.java b/src/main/java/info/aaronland/extruder/BoilerpipeResource.java
@@ -9,7 +9,7 @@
 
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataParam;
 import javax.ws.rs.core.MediaType;
 
 import javax.ws.rs.GET;
@@ -63,10 +63,7 @@ public Response extrudeThisURL(@QueryParam("url") String url){
 
     @POST
     @Consumes(MediaType.MULTIPART_FORM_DATA)
-    public Response extrudeThisFile(FormDataMultiPart formParams){
-
-	FormDataBodyPart stream = formParams.getField("file");
-	InputStream input = stream.getValueAs(InputStream.class);
+    public Response extrudeThisFile(@FormDataParam("file") InputStream input){
 
 	Upload upload = new Upload();
 	File tmpfile = upload.writeTmpFile(input);

diff --git a/src/main/java/info/aaronland/extruder/JavaReadabilityResource.java b/src/main/java/info/aaronland/extruder/JavaReadabilityResource.java
@@ -17,7 +17,7 @@
 
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataParam;
 
 import java.io.InputStream;
 import java.io.File;
@@ -62,10 +62,7 @@ public Response extrudeThisURL(@QueryParam("url") String url){
 
     @POST
     @Consumes(MediaType.MULTIPART_FORM_DATA)
-    public Response extrudeThisFile(FormDataMultiPart formParams){
-
-	FormDataBodyPart stream = formParams.getField("file");
-	InputStream input = stream.getValueAs(InputStream.class);
+    public Response extrudeThisFile(@FormDataParam("file") InputStream input){
 
 	Upload upload = new Upload();
 	File tmpfile = upload.writeTmpFile(input);

diff --git a/src/main/java/info/aaronland/extruder/TikaResource.java b/src/main/java/info/aaronland/extruder/TikaResource.java
@@ -13,7 +13,6 @@
 import java.io.ByteArrayInputStream;
 
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-// import org.glassfish.jersey.media.multipart.FormDataMultiPart;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataParam;