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:29 UTC
[13/50] [abbrv] git commit: Remove ByteArrayPayload
Remove ByteArrayPayload
Callers should use ByteSourcePayload instead.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/ac223836
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/ac223836
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/ac223836
Branch: refs/heads/fix-jclouds-538
Commit: ac2238364840915597b860e395973859b3f447ab
Parents: bd5b685
Author: Andrew Gaul <ga...@apache.org>
Authored: Sat Sep 6 16:36:34 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sun Sep 7 07:43:14 2014 -0700
----------------------------------------------------------------------
core/src/main/java/org/jclouds/io/Payloads.java | 9 ----
.../jclouds/io/payloads/ByteArrayPayload.java | 49 --------------------
2 files changed, 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/ac223836/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 0a65d63..106c037 100644
--- a/core/src/main/java/org/jclouds/io/Payloads.java
+++ b/core/src/main/java/org/jclouds/io/Payloads.java
@@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.io.File;
import java.io.InputStream;
-import org.jclouds.io.payloads.ByteArrayPayload;
import org.jclouds.io.payloads.ByteSourcePayload;
import org.jclouds.io.payloads.FilePayload;
import org.jclouds.io.payloads.InputStreamPayload;
@@ -65,14 +64,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"));
- }
-
public static ByteSourcePayload newByteSourcePayload(ByteSource data) {
return new ByteSourcePayload(checkNotNull(data, "data"));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/ac223836/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
deleted file mode 100644
index 5bcf514..0000000
--- a/core/src/main/java/org/jclouds/io/payloads/ByteArrayPayload.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.io.payloads;
-
-import static com.google.common.base.Preconditions.checkArgument;
-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);
- }
-
- public ByteArrayPayload(byte[] content, byte[] md5) {
- super(content);
- getContentMetadata().setContentLength(Long.valueOf(checkNotNull(content, "content").length));
- getContentMetadata().setContentMD5(md5);
- checkArgument(content.length >= 0, "length cannot me negative");
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public InputStream openStream() {
- return new ByteArrayInputStream(content);
- }
-
-}