Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove WriteTo 

Guava helpers capture this functionality in a more idiomatic way.
This commit is contained in:
Andrew Gaul 2014-02-19 13:21:26 -08:00
parent 9965fbcadb
commit d7e0b3b10c
12 changed files with 9 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftBlobIntegrationLiveTest.java
View File

@ -22,7 +22,6 @@ import static org.testng.Assert.assertTrue;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
@ -148,7 +147,7 @@ public class SwiftBlobIntegrationLiveTest extends BaseBlobIntegrationTest {
blobStore.putBlob(container, write, PutOptions.Builder.multipart());
Blob read = blobStore.getBlob(container, "const.txt");
read.getPayload().writeTo(new FileOutputStream(outFile));
Files.copy(read.getPayload(), outFile);
assertEquals(Files.hash(outFile, Hashing.md5()), Files.hash(inFile, Hashing.md5()));

7
blobstore/src/main/java/org/jclouds/blobstore/TransientStorageStrategy.java
View File

@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.io.BaseEncoding.base16;
import static org.jclouds.http.Uris.uriBuilder;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Date;
import java.util.Map;
@ -48,6 +47,7 @@ import com.google.common.base.Supplier;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Multimaps;
import com.google.common.io.ByteStreams;
public class TransientStorageStrategy implements LocalStorageStrategy {
private final ConcurrentMap<String, ConcurrentMap<String, Blob>> containerToBlobs = new ConcurrentHashMap<String, ConcurrentMap<String, Blob>>();
@ -158,9 +158,8 @@ public class TransientStorageStrategy implements LocalStorageStrategy {
try {
if (payload == null || !(payload instanceof ByteArrayPayload)) {
MutableContentMetadata oldMd = in.getPayload().getContentMetadata();
ByteArrayOutputStream out = new ByteArrayOutputStream();
in.getPayload().writeTo(out);
payload = (ByteArrayPayload) Payloads.calculateMD5(Payloads.newPayload(out.toByteArray()));
byte[] out = ByteStreams.toByteArray(in.getPayload());
payload = (ByteArrayPayload) Payloads.calculateMD5(Payloads.newPayload(out));
HttpUtils.copy(oldMd, payload.getContentMetadata());
} else {
if (payload.getContentMetadata().getContentMD5() == null)

3
core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
View File

@ -60,6 +60,7 @@ import com.google.common.base.Function;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableMultimap.Builder;
import com.google.common.io.ByteStreams;
import com.google.common.io.CountingOutputStream;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.inject.Inject;
@ -304,7 +305,7 @@ public class JavaUrlHttpCommandExecutorService extends BaseHttpCommandExecutorSe
connection.setDoOutput(true);
CountingOutputStream out = new CountingOutputStream(connection.getOutputStream());
try {
payload.writeTo(out);
ByteStreams.copy(payload, out);
} catch (IOException e) {
logger.error(e, "error after writing %d/%s bytes to %s", out.getCount(), lengthDesc, connection.getURL());
throw e;

2
core/src/main/java/org/jclouds/io/Payload.java
View File

@ -25,7 +25,7 @@ import com.google.common.io.InputSupplier;
/**
* @author Adrian Cole
*/
public interface Payload extends InputSupplier<InputStream>, WriteTo, Closeable {
public interface Payload extends InputSupplier<InputStream>, Closeable {
/**
* Creates a new InputStream object of the payload.

34
core/src/main/java/org/jclouds/io/WriteTo.java
View File

@ -1,34 +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;
import java.io.IOException;
import java.io.OutputStream;
/**
* @author Adrian Cole
*/
public interface WriteTo {
/**
* Writes the payload content to the output stream.
*
* @throws IOException
*/
void writeTo(OutputStream outstream) throws IOException;
}

7
core/src/main/java/org/jclouds/io/payloads/BaseCipherPayload.java
View File

@ -19,12 +19,10 @@ package org.jclouds.io.payloads;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.IOException;
import java.io.OutputStream;
import java.security.Key;
import javax.crypto.Cipher;
import javax.crypto.CipherInputStream;
import javax.crypto.CipherOutputStream;
import org.jclouds.io.Payload;
@ -47,9 +45,4 @@ public abstract class BaseCipherPayload extends DelegatingPayload {
public CipherInputStream openStream() throws IOException {
return new CipherInputStream(super.openStream(), initializeCipher(key));
}
@Override
public void writeTo(OutputStream outstream) throws IOException {
super.writeTo(new CipherOutputStream(outstream, initializeCipher(key)));
}
}

20
core/src/main/java/org/jclouds/io/payloads/BasePayload.java
View File

@ -17,13 +17,9 @@
package org.jclouds.io.payloads;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.io.ByteStreams.copy;
import static org.jclouds.util.Closeables2.closeQuietly;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import com.google.common.base.Throwables;
@ -64,22 +60,6 @@ public abstract class BasePayload<V> implements Payload {
return content;
}
/**
* {@inheritDoc}
*/
@Override
public void writeTo(OutputStream outstream) throws IOException {
checkState(!written || isRepeatable(), "can only write to an outputStream once");
written = true;
InputStream in = getInput();
try {
copy(in, outstream);
outstream.flush();
} finally {
closeQuietly(in);
}
}
@Override
public int hashCode() {
final int prime = 31;

9
core/src/main/java/org/jclouds/io/payloads/DelegatingPayload.java
View File

@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import com.google.common.base.Throwables;
@ -75,14 +74,6 @@ public class DelegatingPayload implements Payload {
return delegate.isRepeatable();
}
/**
* {@inheritDoc}
*/
@Override
public void writeTo(OutputStream outstream) throws IOException {
delegate.writeTo(outstream);
}
/**
* {@inheritDoc}
*/

8
core/src/main/java/org/jclouds/io/payloads/PhantomPayload.java
View File

@ -18,9 +18,7 @@ package org.jclouds.io.payloads;
import static com.google.common.base.Preconditions.checkNotNull;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.jclouds.io.ContentMetadata;
import org.jclouds.io.MutableContentMetadata;
@ -49,10 +47,4 @@ public class PhantomPayload extends BasePayload<Object> {
public InputStream openStream() {
throw new UnsupportedOperationException();
}
@Override
public void writeTo(OutputStream outstream) throws IOException {
throw new UnsupportedOperationException();
}
}

7
core/src/test/java/org/jclouds/io/payloads/MultipartFormTest.java
View File

@ -25,7 +25,6 @@ import static org.testng.Assert.assertEquals;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.jclouds.io.Payloads;
import org.jclouds.io.payloads.Part.PartOptions;
@ -82,12 +81,6 @@ public class MultipartFormTest {
public boolean isRepeatable() {
return realPayload.isRepeatable();
}
@Override
public void writeTo(OutputStream outstream) throws IOException {
realPayload.writeTo(outstream);
}
}
private Part newPart(String data) {

7
drivers/apachehc/src/main/java/org/jclouds/http/apachehc/ApacheHCUtils.java
View File

@ -19,7 +19,6 @@ package org.jclouds.http.apachehc;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.Map;
import java.util.Set;
@ -198,12 +197,6 @@ public class ApacheHCUtils {
} catch (IOException e) {
}
}
@Override
public void writeTo(OutputStream outstream) throws IOException {
super.writeTo(outstream);
}
}
}

6
drivers/gae/src/main/java/org/jclouds/gae/ConvertToGaeRequest.java
View File

@ -18,7 +18,6 @@ package org.jclouds.gae;
import static com.google.appengine.api.urlfetch.FetchOptions.Builder.disallowTruncate;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@ -43,6 +42,7 @@ import com.google.appengine.api.urlfetch.HTTPRequest;
import com.google.appengine.repackaged.com.google.common.base.Throwables;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.ByteStreams;
/**
*
@ -98,9 +98,7 @@ public class ConvertToGaeRequest implements Function<HttpRequest, HTTPRequest> {
if (request.getPayload() != null) {
InputStream input = request.getPayload().getInput();
try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
request.getPayload().writeTo(out);
byte[] array = out.toByteArray();
byte[] array = ByteStreams.toByteArray(input);
if (!request.getPayload().isRepeatable()) {
Payload oldPayload = request.getPayload();
request.setPayload(array);