public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2026-01-01 19:09:27 +00:00
Code Issues Releases Wiki Activity

Pass file stream directly to GET /file/:id/data

Browse Source
This commit is contained in:
jendib
2013-07-28 01:55:32 +02:00
parent 3a2ffec497
commit c9fdb6def5
2 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docs-web/src/main/java/com/sismics/docs/rest/resource/FileResource.java
View File

@@ -1,11 +1,8 @@
package com.sismics.docs.rest.resource;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.text.MessageFormat;
@@ -23,12 +20,10 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import com.google.common.io.ByteStreams;
import com.sismics.docs.core.dao.jpa.DocumentDao;
import com.sismics.docs.core.dao.jpa.FileDao;
import com.sismics.docs.core.model.jpa.Document;
@@ -57,9 +52,10 @@ public class FileResource extends BaseResource {
* @throws JSONException
*/
@GET
@Path("{id: [a-z0-9\\-]+}")
@Produces(MediaType.APPLICATION_JSON)
public Response get(
@QueryParam("id") String id) throws JSONException {
@PathParam("id") String id) throws JSONException {
if (!authenticate()) {
throw new ForbiddenClientException();
}
@@ -241,15 +237,7 @@ public class FileResource extends BaseResource {
});
final java.io.File storageFile = matchingFiles[0];
// Stream the file to the response
StreamingOutput stream = new StreamingOutput() {
@Override
public void write(OutputStream os) throws IOException {
ByteStreams.copy(new FileInputStream(storageFile), os);
}
};
return Response.ok(stream)
.header("Content-Disposition", MessageFormat.format("attachment; filename=\"{0}\"", storageFile.getName()))
return Response.ok(storageFile)
.build();
}
}