Merge pull request #35 from bouncestorage/content-metadata

Get and set content disposition and encoding

Author: kahing

src/main/java/com/bouncestorage/swiftproxy/v1/ObjectResource.java

@@ -710,6 +710,12 @@ public Response putObject(@NotNull @PathParam("container") String container,
             BlobBuilder.PayloadBlobBuilder builder = blobStore.blobBuilder(objectName)
                     .userMetadata(metadata)
                     .payload(is);
+            if (contentDisposition != null) {
+                builder.contentDisposition(contentDisposition);
+            }
+            if (contentEncoding != null) {
+                builder.contentEncoding(contentEncoding);
+            }
             if (contentType != null) {
                 builder.contentType(contentType(contentType.toString()));
             }
@@ -821,6 +827,8 @@ private Response.ResponseBuilder addObjectHeaders(Response.ResponseBuilder respo
         }
 
         Map<String, Supplier<Object>> defaultHeaders = ImmutableMap.<String, Supplier<Object>>builder()
+                .put(HttpHeaders.CONTENT_DISPOSITION, () -> metaData.getContentMetadata().getContentDisposition())
+                .put(HttpHeaders.CONTENT_ENCODING, () -> metaData.getContentMetadata().getContentEncoding())
                 .put(HttpHeaders.CONTENT_LENGTH, metaData::getSize)
                 .put(HttpHeaders.LAST_MODIFIED, metaData::getLastModified)
                 .put(HttpHeaders.ETAG, metaData::getETag)