add a media type hint to serializers so they can provide the correct …

…content type header to http endpoints
fcrepo · Jun 13, 2013 · 1578d77 · 1578d77
1 parent 4be6008
commit 1578d77
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraExport.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraExport.java
@@ -15,6 +15,7 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.core.Response;
 import javax.ws.rs.core.StreamingOutput;
 
 import org.fcrepo.AbstractResource;
@@ -40,7 +41,7 @@ public class FedoraExport extends AbstractResource {
     private final Logger logger = getLogger(this.getClass());
 
     @GET
-    public StreamingOutput exportObject(@PathParam("path")
+    public Response exportObject(@PathParam("path")
     final List<PathSegment> pathList, @QueryParam("format")
     @DefaultValue("jcr/xml")
     final String format) {
@@ -49,16 +50,18 @@ public StreamingOutput exportObject(@PathParam("path")
         logger.debug("Requested object serialization for: " + path +
                 " using serialization format " + format);
 
-        return new StreamingOutput() {
+
+        final FedoraObjectSerializer serializer =
+                serializers.getSerializer(format);
+
+        return Response.ok().type(serializer.getMediaType()).entity(new StreamingOutput() {
 
             @Override
             public void write(final OutputStream out) throws IOException {
 
                 try {
                     logger.debug("Selecting from serializer map: " +
                             serializers);
-                    final FedoraObjectSerializer serializer =
-                            serializers.getSerializer(format);
                     logger.debug("Retrieved serializer for format: " + format);
                     serializer.serialize(
                             objectService.getObject(session, path), out);
@@ -69,7 +72,7 @@ public void write(final OutputStream out) throws IOException {
                     session.logout();
                 }
             }
-        };
+        }).build();
 
     }
 

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraExportIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraExportIT.java
@@ -28,6 +28,7 @@ public void shouldRoundTripOneObject() throws IOException {
 		final HttpGet getObjMethod =
 				new HttpGet(serverAddress + "objects/JcrXmlSerializerIT1" + "/fcr:export");
 		HttpResponse response = client.execute(getObjMethod);
+        assertEquals("application/xml", response.getEntity().getContentType().getValue());
 		assertEquals(200, response.getStatusLine().getStatusCode());
 		logger.debug("Successfully exported: " + objName);
 		final String content = EntityUtils.toString(response.getEntity());

diff --git a/fcrepo-serialization/src/main/java/org/fcrepo/serialization/FedoraObjectSerializer.java b/fcrepo-serialization/src/main/java/org/fcrepo/serialization/FedoraObjectSerializer.java
@@ -17,6 +17,8 @@ public interface FedoraObjectSerializer {
 
     String getKey();
 
+    String getMediaType();
+
     void serialize(final FedoraObject obj, final OutputStream out)
             throws RepositoryException, IOException;
 

diff --git a/fcrepo-serialization/src/main/java/org/fcrepo/serialization/JcrXmlSerializer.java b/fcrepo-serialization/src/main/java/org/fcrepo/serialization/JcrXmlSerializer.java
@@ -22,6 +22,11 @@ public String getKey() {
         return "jcr/xml";
     }
 
+    @Override
+    public String getMediaType() {
+        return "application/xml";
+    }
+
     @Override
     public void serialize(final FedoraObject obj, final OutputStream out)
             throws RepositoryException, IOException {