Repository: jclouds Updated Branches: refs/heads/master 7869d92b2 -> a4bc36daf
Add PayloadEnclosing.setPayload(ByteSource) Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a4bc36da Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a4bc36da Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a4bc36da Branch: refs/heads/master Commit: a4bc36dafaf75805904a082c43ea4e89b47329a3 Parents: 7869d92 Author: Andrew Gaul <[email protected]> Authored: Sat Sep 6 22:27:22 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sat Sep 6 22:27:22 2014 -0700 ---------------------------------------------------------------------- .../org/jclouds/http/internal/PayloadEnclosingImpl.java | 10 ++++++++++ core/src/main/java/org/jclouds/io/PayloadEnclosing.java | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/a4bc36da/core/src/main/java/org/jclouds/http/internal/PayloadEnclosingImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/http/internal/PayloadEnclosingImpl.java b/core/src/main/java/org/jclouds/http/internal/PayloadEnclosingImpl.java index 62380d4..a8b5196 100644 --- a/core/src/main/java/org/jclouds/http/internal/PayloadEnclosingImpl.java +++ b/core/src/main/java/org/jclouds/http/internal/PayloadEnclosingImpl.java @@ -26,6 +26,8 @@ import org.jclouds.io.Payload; import org.jclouds.io.PayloadEnclosing; import org.jclouds.javax.annotation.Nullable; +import com.google.common.io.ByteSource; + public class PayloadEnclosingImpl implements PayloadEnclosing { protected Payload payload; @@ -87,6 +89,14 @@ public class PayloadEnclosingImpl implements PayloadEnclosing { setPayload(newPayload(checkNotNull(data, "data"))); } + /** + * {@inheritDoc} + */ + @Override + public void setPayload(ByteSource data) { + setPayload(newPayload(checkNotNull(data, "data"))); + } + @Override public int hashCode() { final int prime = 31; http://git-wip-us.apache.org/repos/asf/jclouds/blob/a4bc36da/core/src/main/java/org/jclouds/io/PayloadEnclosing.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/io/PayloadEnclosing.java b/core/src/main/java/org/jclouds/io/PayloadEnclosing.java index 55f6858..3ed2983 100644 --- a/core/src/main/java/org/jclouds/io/PayloadEnclosing.java +++ b/core/src/main/java/org/jclouds/io/PayloadEnclosing.java @@ -21,6 +21,8 @@ import java.io.InputStream; import org.jclouds.javax.annotation.Nullable; +import com.google.common.io.ByteSource; + public interface PayloadEnclosing { /** @@ -28,8 +30,8 @@ public interface PayloadEnclosing { * attempt to discover it. * * @param data - * typically InputStream for downloads, or File, byte [], String, or InputStream for - * uploads. + * typically InputStream for downloads, or File, byte[], String, InputStream, + * of ByteSource for uploads. */ void setPayload(Payload data); @@ -41,6 +43,8 @@ public interface PayloadEnclosing { void setPayload(String data); + void setPayload(ByteSource data); + @Nullable Payload getPayload();
