Updated Branches: refs/heads/pr-44-alternative [created] fe6aeec6d
Allowing Guava MediaType for Content-Type Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/fe6aeec6 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/fe6aeec6 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/fe6aeec6 Branch: refs/heads/pr-44-alternative Commit: fe6aeec6d22f151a4e84d8b1f2fa4022907c7025 Parents: fa5d8fd Author: Andrew Phillips <[email protected]> Authored: Mon Dec 9 19:19:17 2013 -0500 Committer: Andrew Phillips <[email protected]> Committed: Mon Dec 9 19:19:17 2013 -0500 ---------------------------------------------------------------------- .../main/java/org/jclouds/blobstore/domain/BlobBuilder.java | 3 +++ .../org/jclouds/blobstore/domain/internal/BlobBuilderImpl.java | 6 ++++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/fe6aeec6/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobBuilder.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobBuilder.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobBuilder.java index ed42cd8..14cb602 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobBuilder.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobBuilder.java @@ -25,6 +25,7 @@ import java.util.Map; import org.jclouds.blobstore.domain.internal.BlobBuilderImpl; import org.jclouds.io.Payload; +import com.google.common.net.MediaType; import com.google.inject.ImplementedBy; /** @@ -107,6 +108,8 @@ public interface BlobBuilder { PayloadBlobBuilder contentMD5(byte[] md5); + PayloadBlobBuilder contentType(MediaType contentType); + PayloadBlobBuilder contentType(String contentType); PayloadBlobBuilder contentDisposition(String contentDisposition); http://git-wip-us.apache.org/repos/asf/jclouds/blob/fe6aeec6/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobBuilderImpl.java ---------------------------------------------------------------------- diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobBuilderImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobBuilderImpl.java index 2069220..3e4f0b0 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobBuilderImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobBuilderImpl.java @@ -35,6 +35,7 @@ import org.jclouds.io.Payloads; import org.jclouds.io.payloads.PhantomPayload; import com.google.common.collect.Maps; +import com.google.common.net.MediaType; /** * @author Adrian Cole @@ -190,6 +191,11 @@ public class BlobBuilderImpl implements BlobBuilder { } @Override + public PayloadBlobBuilder contentType(MediaType contentType) { + return contentType(checkNotNull(contentType, "contentType").toString()); + } + + @Override public PayloadBlobBuilder contentType(String contentType) { payload.getContentMetadata().setContentType(contentType); return this;
