Revert "Remove ByteArrayPayload"

This reverts commit ac22383648.
This commit is contained in:
Adrian Cole 2014-10-28 15:47:01 -07:00 committed by Adrian Cole
parent 1702bddffa
commit 035d9d1ed7
2 changed files with 58 additions and 0 deletions

View File

@ -21,6 +21,7 @@ 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;
@ -61,6 +62,14 @@ 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"));
}

View File

@ -0,0 +1,49 @@
/*
* 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);
}
}