You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/29 18:54:47 UTC
[1/2] git commit: Do not require Guava ByteSource in order to create
a payload.
Repository: jclouds
Updated Branches:
refs/heads/1.8.x 5229ec223 -> 5511bad76
Do not require Guava ByteSource in order to create a payload.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/9105ae55
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/9105ae55
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/9105ae55
Branch: refs/heads/1.8.x
Commit: 9105ae55fade904fc864119fb68ded4d53ca0345
Parents: 5229ec2
Author: Adrian Cole <ac...@twitter.com>
Authored: Tue Oct 28 16:02:12 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Wed Oct 29 10:21:53 2014 -0700
----------------------------------------------------------------------
.../org/jclouds/blobstore/domain/BlobBuilder.java | 6 ------
.../src/main/java/org/jclouds/http/HttpMessage.java | 6 ------
core/src/main/java/org/jclouds/http/HttpUtils.java | 3 +--
core/src/main/java/org/jclouds/io/Payloads.java | 16 ----------------
.../org/jclouds/io/payloads/ByteArrayPayload.java | 4 ----
.../java/org/jclouds/io/payloads/FilePayload.java | 4 ----
.../java/org/jclouds/io/payloads/StringPayload.java | 2 --
7 files changed, 1 insertion(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9105ae55/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 67f6971..e2d4c62 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobBuilder.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobBuilder.java
@@ -77,9 +77,7 @@ public interface BlobBuilder {
*
* @param payload
* payload you wish to construct the {@link Blob} with.
- * @deprecated see payload(ByteSource.wrap(byte[])
*/
- @Deprecated
PayloadBlobBuilder payload(byte[] payload);
/**
@@ -91,18 +89,14 @@ public interface BlobBuilder {
*
* @param payload
* payload you wish to construct the {@link Blob} with.
- * @deprecated see payload(ByteSource.wrap(String.getBytes()))
*/
- @Deprecated
PayloadBlobBuilder payload(String payload);
/**
*
* @param payload
* payload you wish to construct the {@link Blob} with.
- * @deprecated see payload(Files.asByteSource(File))
*/
- @Deprecated
PayloadBlobBuilder payload(File payload);
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9105ae55/core/src/main/java/org/jclouds/http/HttpMessage.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/HttpMessage.java b/core/src/main/java/org/jclouds/http/HttpMessage.java
index df3f578..fc12fca 100644
--- a/core/src/main/java/org/jclouds/http/HttpMessage.java
+++ b/core/src/main/java/org/jclouds/http/HttpMessage.java
@@ -64,9 +64,7 @@ public class HttpMessage extends PayloadEnclosingImpl {
/**
* @see HttpMessage#getPayload()
- * @deprecated see payload(ByteSource.wrap(byte[]))
*/
- @Deprecated
public T payload(byte [] payload) {
this.payload = Payloads.newByteArrayPayload(checkNotNull(payload, "payload"));
return self();
@@ -82,9 +80,7 @@ public class HttpMessage extends PayloadEnclosingImpl {
/**
* @see HttpMessage#getPayload()
- * @deprecated see payload(Files.asByteSource(File))
*/
- @Deprecated
public T payload(File payload) {
this.payload = Payloads.newFilePayload(checkNotNull(payload, "payload"));
return self();
@@ -100,9 +96,7 @@ public class HttpMessage extends PayloadEnclosingImpl {
/**
* @see HttpMessage#getPayload()
- * @deprecated see payload(ByteSource.wrap(String.getBytes()))
*/
- @Deprecated
public T payload(String payload) {
this.payload = Payloads.newStringPayload(checkNotNull(payload, "payload"));
return self();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9105ae55/core/src/main/java/org/jclouds/http/HttpUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/HttpUtils.java b/core/src/main/java/org/jclouds/http/HttpUtils.java
index f775607..5c026de 100644
--- a/core/src/main/java/org/jclouds/http/HttpUtils.java
+++ b/core/src/main/java/org/jclouds/http/HttpUtils.java
@@ -64,7 +64,6 @@ import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Multimap;
import com.google.common.collect.ImmutableSet.Builder;
-import com.google.common.io.ByteSource;
import com.google.common.reflect.Invokable;
import com.google.inject.Inject;
@@ -159,7 +158,7 @@ public class HttpUtils {
public static byte[] closeClientButKeepContentStream(PayloadEnclosing response) {
byte[] returnVal = toByteArrayOrNull(response);
if (returnVal != null && !response.getPayload().isRepeatable()) {
- Payload newPayload = Payloads.newByteSourcePayload(ByteSource.wrap(returnVal));
+ Payload newPayload = Payloads.newByteArrayPayload(returnVal);
MutableContentMetadata fromMd = response.getPayload().getContentMetadata();
MutableContentMetadata toMd = newPayload.getContentMetadata();
copy(fromMd, toMd);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9105ae55/core/src/main/java/org/jclouds/io/Payloads.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/io/Payloads.java b/core/src/main/java/org/jclouds/io/Payloads.java
index 1ccacf7..542e8a2 100644
--- a/core/src/main/java/org/jclouds/io/Payloads.java
+++ b/core/src/main/java/org/jclouds/io/Payloads.java
@@ -35,10 +35,6 @@ public class Payloads {
private Payloads() {
}
- /**
- * @deprecated see newPayload(ByteSource) or newPayload(InputStream)
- */
- @Deprecated
public static Payload newPayload(Object data) {
checkNotNull(data, "data");
if (data instanceof Payload) {
@@ -62,10 +58,6 @@ public class Payloads {
return new InputStreamPayload(checkNotNull(data, "data"));
}
- /**
- * @deprecated see newPayload(ByteSource)
- */
- @Deprecated
public static ByteArrayPayload newByteArrayPayload(byte[] data) {
return new ByteArrayPayload(checkNotNull(data, "data"));
}
@@ -74,18 +66,10 @@ public class Payloads {
return new ByteSourcePayload(checkNotNull(data, "data"));
}
- /**
- * @deprecated see newPayload(ByteSource)
- */
- @Deprecated
public static StringPayload newStringPayload(String data) {
return new StringPayload(checkNotNull(data, "data"));
}
- /**
- * @deprecated see newPayload(ByteSource)
- */
- @Deprecated
public static FilePayload newFilePayload(File data) {
return new FilePayload(checkNotNull(data, "data"));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9105ae55/core/src/main/java/org/jclouds/io/payloads/ByteArrayPayload.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/io/payloads/ByteArrayPayload.java b/core/src/main/java/org/jclouds/io/payloads/ByteArrayPayload.java
index 5bcf514..109fe71 100644
--- a/core/src/main/java/org/jclouds/io/payloads/ByteArrayPayload.java
+++ b/core/src/main/java/org/jclouds/io/payloads/ByteArrayPayload.java
@@ -22,10 +22,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-/**
- * @deprecated see ByteSourcePayload
- */
-@Deprecated
public class ByteArrayPayload extends BasePayload<byte[]> {
public ByteArrayPayload(byte[] content) {
this(content, null);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9105ae55/core/src/main/java/org/jclouds/io/payloads/FilePayload.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/io/payloads/FilePayload.java b/core/src/main/java/org/jclouds/io/payloads/FilePayload.java
index ee5756c..493694f 100644
--- a/core/src/main/java/org/jclouds/io/payloads/FilePayload.java
+++ b/core/src/main/java/org/jclouds/io/payloads/FilePayload.java
@@ -24,10 +24,6 @@ import java.io.InputStream;
import java.io.IOException;
-/**
- * @deprecated see ByteSourcePayload
- */
-@Deprecated
public class FilePayload extends BasePayload<File> {
public FilePayload(File content) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9105ae55/core/src/main/java/org/jclouds/io/payloads/StringPayload.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/io/payloads/StringPayload.java b/core/src/main/java/org/jclouds/io/payloads/StringPayload.java
index 3865062..c92ccd6 100644
--- a/core/src/main/java/org/jclouds/io/payloads/StringPayload.java
+++ b/core/src/main/java/org/jclouds/io/payloads/StringPayload.java
@@ -25,9 +25,7 @@ import com.google.common.base.Charsets;
* This implementation converts the String to a byte array using UTF-8 encoding. If you wish to use
* a different encoding, please use {@link ByteArrayPayload}.
*
- * @deprecated see ByteSourcePayload
*/
-@Deprecated
public class StringPayload extends BasePayload<String> {
private final byte[] bytes;
[2/2] git commit: JCLOUDS-410 note that ByteArrayPayload needs to
handle offsets.
Posted by ad...@apache.org.
JCLOUDS-410 note that ByteArrayPayload needs to handle offsets.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5511bad7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5511bad7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5511bad7
Branch: refs/heads/1.8.x
Commit: 5511bad765b719f286bc011135afcbf19771baa3
Parents: 9105ae5
Author: Adrian Cole <ac...@twitter.com>
Authored: Wed Oct 29 09:03:43 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Wed Oct 29 10:22:01 2014 -0700
----------------------------------------------------------------------
.../org/jclouds/io/internal/BasePayloadSlicer.java | 15 ++++++---------
.../jclouds/azureblob/AzureBlobClientLiveTest.java | 8 ++++----
2 files changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5511bad7/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..ec26b8b 100644
--- a/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java
+++ b/core/src/main/java/org/jclouds/io/internal/BasePayloadSlicer.java
@@ -34,11 +34,9 @@ import javax.inject.Singleton;
import org.jclouds.io.ByteStreams2;
import org.jclouds.io.ContentMetadata;
import org.jclouds.io.Payload;
+import org.jclouds.io.Payloads;
import org.jclouds.io.PayloadSlicer;
import org.jclouds.io.payloads.BaseMutableContentMetadata;
-import org.jclouds.io.payloads.ByteArrayPayload;
-import org.jclouds.io.payloads.ByteSourcePayload;
-import org.jclouds.io.payloads.InputStreamPayload;
import com.google.common.base.Charsets;
import com.google.common.base.Throwables;
@@ -120,7 +118,7 @@ public class BasePayloadSlicer implements PayloadSlicer {
Payload payload = null;
if (content.length > 0) {
- payload = new ByteArrayPayload(content);
+ payload = Payloads.newByteArrayPayload(content);
ContentMetadata cm = metaData.toBuilder().contentLength((long)content.length).contentMD5((HashCode) null).build();
payload.setContentMetadata(BaseMutableContentMetadata.fromContentMetadata(cm));
}
@@ -173,19 +171,18 @@ public class BasePayloadSlicer implements PayloadSlicer {
} catch (IOException ioe) {
throw Throwables.propagate(ioe);
}
- return new InputStreamPayload(ByteStreams.limit(content, length));
+ return Payloads.newInputStreamPayload(ByteStreams.limit(content, length));
}
protected Payload doSlice(ByteSource content, long offset, long length) {
- return new ByteSourcePayload(content.slice(offset, length));
+ return Payloads.newByteSourcePayload(content.slice(offset, length));
}
protected Payload doSlice(byte[] content, long offset, long length) {
- Payload returnVal;
checkArgument(offset <= Integer.MAX_VALUE, "offset is too big for an array");
checkArgument(length <= Integer.MAX_VALUE, "length is too big for an array");
- returnVal = new ByteSourcePayload(ByteSource.wrap(content).slice(offset, length));
- return returnVal;
+ // TODO(adriancole): Make ByteArrayPayload carry offset, length as opposed to wrapping here.
+ return Payloads.newByteSourcePayload(ByteSource.wrap(content).slice(offset, length));
}
protected Payload copyMetadataAndSetLength(Payload input, Payload returnVal, long length) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5511bad7/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java
index 831eceb..1930116 100644
--- a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java
+++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java
@@ -44,7 +44,7 @@ import org.jclouds.blobstore.ContainerNotFoundException;
import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
import org.jclouds.http.HttpResponseException;
import org.jclouds.http.options.GetOptions;
-import org.jclouds.io.payloads.ByteArrayPayload;
+import org.jclouds.io.Payloads;
import org.jclouds.util.Strings2;
import org.jclouds.util.Throwables2;
import org.testng.annotations.Test;
@@ -358,9 +358,9 @@ public class AzureBlobClientLiveTest extends BaseBlobStoreIntegrationTest {
String blockIdB = BaseEncoding.base64().encode((blockBlob + "-" + B).getBytes());
String blockIdC = BaseEncoding.base64().encode((blockBlob + "-" + C).getBytes());
getApi().createContainer(blockContainer);
- getApi().putBlock(blockContainer, blockBlob, blockIdA, new ByteArrayPayload(A.getBytes()));
- getApi().putBlock(blockContainer, blockBlob, blockIdB, new ByteArrayPayload(B.getBytes()));
- getApi().putBlock(blockContainer, blockBlob, blockIdC, new ByteArrayPayload(C.getBytes()));
+ getApi().putBlock(blockContainer, blockBlob, blockIdA, Payloads.newByteArrayPayload(A.getBytes()));
+ getApi().putBlock(blockContainer, blockBlob, blockIdB, Payloads.newByteArrayPayload(B.getBytes()));
+ getApi().putBlock(blockContainer, blockBlob, blockIdC, Payloads.newByteArrayPayload(C.getBytes()));
getApi().putBlockList(blockContainer, blockBlob, Arrays.asList(blockIdA, blockIdB, blockIdC));
ListBlobBlocksResponse blocks = getApi().getBlockList(blockContainer, blockBlob);
assertEquals(3, blocks.getBlocks().size());