You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/10/03 16:27:19 UTC
[03/50] [abbrv] git commit: Remove ByteStreams2.asByteSource
Remove ByteStreams2.asByteSource
This method is dangerous since all ByteSource should provide a new
InputStream on every call to openStream while the method returns the
same InputStream for non-repeatable Payloads.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/86139678
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/86139678
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/86139678
Branch: refs/heads/fix-jclouds-538
Commit: 8613967820b3918a8b930f41179205675925f5d6
Parents: 1b39589
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed Sep 3 21:54:03 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Thu Sep 4 16:55:55 2014 -0700
----------------------------------------------------------------------
core/src/main/java/org/jclouds/io/ByteStreams2.java | 11 -----------
.../java/org/jclouds/io/internal/BasePayloadSlicer.java | 3 +--
2 files changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/86139678/core/src/main/java/org/jclouds/io/ByteStreams2.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/io/ByteStreams2.java b/core/src/main/java/org/jclouds/io/ByteStreams2.java
index 3012c91..73c7bb1 100644
--- a/core/src/main/java/org/jclouds/io/ByteStreams2.java
+++ b/core/src/main/java/org/jclouds/io/ByteStreams2.java
@@ -51,15 +51,4 @@ public class ByteStreams2 {
Closeables.closeQuietly(input);
}
}
-
- @Deprecated
- public static ByteSource asByteSource(final Payload payload) {
- checkNotNull(payload, "payload");
- return new ByteSource() {
- @Override
- public InputStream openStream() throws IOException {
- return payload.openStream();
- }
- };
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/86139678/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java b/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java
index 198a252..d3a41f3 100644
--- a/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java
+++ b/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java
@@ -31,7 +31,6 @@ import java.util.NoSuchElementException;
import javax.inject.Singleton;
-import org.jclouds.io.ByteStreams2;
import org.jclouds.io.ContentMetadata;
import org.jclouds.io.Payload;
import org.jclouds.io.PayloadSlicer;
@@ -156,7 +155,7 @@ public class BasePayloadSlicer implements PayloadSlicer {
}
protected Payload doSlice(Payload content, long offset, long length) {
- return doSlice(ByteStreams2.asByteSource(content), offset, length);
+ return doSlice(content.getInput(), offset, length);
}
protected Payload doSlice(String content, long offset, long length) {