CSPACE-5386: Dealing with more MIME type issues related to JAX-RS as well as with...

diff --git a/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java b/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java
index 7ed7b396acde29f19a2e153e152caf40a4be2bec..19e43f1ed1b8c64e71a013354cccb9fea989c34a 100644 (file)
--- a/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java
+++ b/services/blob/service/src/main/java/org/collectionspace/services/blob/BlobResource.java
@@ -259,7 +259,7 @@ public class BlobResource extends ResourceBase {
        Response result = null;
        
        StringBuffer mimeType = new StringBuffer();
-       InputStream contentStream = getBlobContent(csid, derivativeTerm, mimeType);         
+       InputStream contentStream = getBlobContent(csid, derivativeTerm, mimeType);
            Response.ResponseBuilder responseBuilder = Response.ok(contentStream, mimeType.toString());
            
        result = responseBuilder.build();
@@ -292,12 +292,11 @@ public class BlobResource extends ResourceBase {
         
     @GET
     @Path("{csid}/derivatives")
-    public CommonList getDerivatives(
-               @PathParam("csid") String csid) {
+    public CommonList getDerivatives(@PathParam("csid") String csid) {
        CommonList result = null;
 
        ensureCSID(csid, READ);
-        try {
+       try {
                ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = createServiceContext();
             result = this.getDerivativeList(ctx, csid);
             if (result == null) {

diff --git a/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java b/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java
index f2156b0c8f2bc26cf4b8fdad681bdea6811a20c8..aa4bf816cf67ebb69e08b59e0f206fb4b1de31b9 100644 (file)
--- a/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java
+++ b/services/blob/service/src/main/java/org/collectionspace/services/blob/nuxeo/BlobDocumentModelHandler.java
@@ -177,6 +177,7 @@ extends DocHandlerBase<BlobsCommon> {
                        String mimeType = mimeTypeBuffer.toString();
                        if (mimeType != null && !mimeType.isEmpty()) { // MIME type for derivatives might be different from original
                                blobInput.setMimeType(mimeType);
+                               blobsCommon.setMimeType(mimeType);
                        } else {
                                blobInput.setMimeType(blobsCommon.getMimeType());
                        }

diff --git a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java
index 641b500b4b32e4fdb566cd1cc8ccd6c71dff54c0..0b1b86f838e108d2f333813ab9e17fb74b1d3b23 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoImageUtils.java
@@ -852,7 +852,7 @@ public class NuxeoImageUtils {
                                        InputStream remoteStream = docBlob.getStream();\r
                                        BufferedInputStream bufferedInputStream = new BufferedInputStream(\r
                                                        remoteStream);  // FIXME: REM - To improve performance, try\r
-                                                                                       // BufferedInputStream(InputStream in, int size)\r
+                                                                                       // BufferedInputStream(InputStream in, int size)?\r
                                        result.setBlobInputStream(bufferedInputStream);\r
                                }\r
 \r