You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/07/23 01:47:30 UTC
git commit: Prefer ByteStreams2 over ByteSources.asByteSource
Repository: jclouds-labs-openstack
Updated Branches:
refs/heads/master 35ab587da -> a05f207d5
Prefer ByteStreams2 over ByteSources.asByteSource
The latter breaks the contract of ByteSource which specifies that
openStream can produce multiple independent streams.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/a05f207d
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/a05f207d
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/a05f207d
Branch: refs/heads/master
Commit: a05f207d50eb5f4e887fb485bdb391400cf3e843
Parents: 35ab587
Author: Andrew Gaul <ga...@apache.org>
Authored: Tue Jul 22 16:46:49 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Jul 22 16:46:49 2014 -0700
----------------------------------------------------------------------
.../org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java | 4 ++--
.../org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/a05f207d/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java
index 22191c4..bf313d7 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiLiveTest.java
@@ -27,7 +27,7 @@ import org.jboss.shrinkwrap.api.GenericArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.exporter.TarGzExporter;
-import org.jclouds.io.ByteSources;
+import org.jclouds.io.ByteStreams2;
import org.jclouds.io.Payload;
import org.jclouds.io.payloads.ByteSourcePayload;
import org.jclouds.openstack.swift.v1.SwiftApi;
@@ -107,7 +107,7 @@ public class BulkApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
}
try {
- tarGz = ByteSources.asByteSource(files.as(TarGzExporter.class).exportAsInputStream()).read();
+ tarGz = ByteStreams2.toByteArrayAndClose(files.as(TarGzExporter.class).exportAsInputStream());
} catch (IOException e) {
throw Throwables.propagate(e);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/a05f207d/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java
index 73ba82b..5b7a520 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java
@@ -23,7 +23,7 @@ import org.jboss.shrinkwrap.api.GenericArchive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.exporter.TarGzExporter;
-import org.jclouds.io.ByteSources;
+import org.jclouds.io.ByteStreams2;
import org.jclouds.io.Payload;
import org.jclouds.io.Payloads;
import org.jclouds.openstack.swift.v1.SwiftApi;
@@ -46,7 +46,7 @@ public class BulkApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
files.add(content, "/file" + i);
}
- byte[] tarGz = ByteSources.asByteSource(files.as(TarGzExporter.class).exportAsInputStream()).read();
+ byte[] tarGz = ByteStreams2.toByteArrayAndClose(files.as(TarGzExporter.class).exportAsInputStream());
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));