Fixing compilation errors caused by Payload no longer being an InputSupplier
See 80a0256c in jclouds Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/4ef699a3 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4ef699a3 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4ef699a3 Branch: refs/heads/master Commit: 4ef699a35cbddee69c9385c55ebb7ca6f837de39 Parents: 55e403d Author: Andrew Phillips <[email protected]> Authored: Mon Aug 11 08:13:40 2014 -0400 Committer: Andrew Phillips <[email protected]> Committed: Mon Aug 11 15:41:34 2014 -0400 ---------------------------------------------------------------------- .../java/org/jclouds/chef/filters/SignedHeaderAuth.java | 3 +-- .../java/org/jclouds/chef/internal/BaseChefService.java | 10 +++++----- .../jclouds/chef/functions/ParseClientFromJsonTest.java | 8 ++++---- 3 files changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/4ef699a3/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java ---------------------------------------------------------------------- diff --git a/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java b/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java index cabe579..50d26a1 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java +++ b/apis/chef/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java @@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.hash.Hashing.sha1; import static com.google.common.io.BaseEncoding.base64; -import static com.google.common.io.ByteStreams.toByteArray; import java.io.IOException; import java.security.PrivateKey; @@ -190,7 +189,7 @@ public class SignedHeaderAuth implements HttpRequestFilter { public String sign(String toSign) { try { - byte[] encrypted = toByteArray(new RSAEncryptingPayload(crypto, Payloads.newStringPayload(toSign), supplyKey.get())); + byte[] encrypted = ByteStreams2.toByteArrayAndClose(new RSAEncryptingPayload(crypto, Payloads.newStringPayload(toSign), supplyKey.get()).openStream()); return base64().encode(encrypted); } catch (IOException e) { throw new HttpException("error signing request", e); http://git-wip-us.apache.org/repos/asf/jclouds/blob/4ef699a3/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java ---------------------------------------------------------------------- diff --git a/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java b/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java index d390555..40a44a9 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java +++ b/apis/chef/src/main/java/org/jclouds/chef/internal/BaseChefService.java @@ -57,6 +57,7 @@ import org.jclouds.chef.strategy.ListNodesInEnvironment; import org.jclouds.chef.strategy.UpdateAutomaticAttributesOnNode; import org.jclouds.crypto.Crypto; import org.jclouds.domain.JsonBall; +import org.jclouds.io.ByteStreams2; import org.jclouds.io.Payloads; import org.jclouds.io.payloads.RSADecryptingPayload; import org.jclouds.io.payloads.RSAEncryptingPayload; @@ -67,7 +68,6 @@ import org.jclouds.scriptbuilder.domain.Statement; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Supplier; import com.google.common.collect.Maps; -import com.google.common.io.ByteStreams; import com.google.common.io.InputSupplier; @Singleton @@ -140,14 +140,14 @@ public class BaseChefService implements ChefService { @Override public byte[] encrypt(InputSupplier<? extends InputStream> supplier) throws IOException { - return ByteStreams.toByteArray(new RSAEncryptingPayload(crypto, Payloads.newPayload(supplier.getInput()), privateKey - .get())); + return ByteStreams2.toByteArrayAndClose(new RSAEncryptingPayload(crypto, Payloads.newPayload(supplier.getInput()), privateKey + .get()).openStream()); } @Override public byte[] decrypt(InputSupplier<? extends InputStream> supplier) throws IOException { - return ByteStreams.toByteArray(new RSADecryptingPayload(crypto, Payloads.newPayload(supplier.getInput()), privateKey - .get())); + return ByteStreams2.toByteArrayAndClose(new RSADecryptingPayload(crypto, Payloads.newPayload(supplier.getInput()), privateKey + .get()).openStream()); } @VisibleForTesting http://git-wip-us.apache.org/repos/asf/jclouds/blob/4ef699a3/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java ---------------------------------------------------------------------- diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java index e8bebcb..1382a6c 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java @@ -33,6 +33,7 @@ import org.jclouds.crypto.Pems; import org.jclouds.encryption.internal.JCECrypto; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; +import org.jclouds.io.ByteStreams2; import org.jclouds.io.Payloads; import org.jclouds.io.payloads.RSADecryptingPayload; import org.jclouds.io.payloads.RSAEncryptingPayload; @@ -43,7 +44,6 @@ import org.testng.annotations.Test; import com.google.common.base.Charsets; import com.google.common.io.ByteSource; -import com.google.common.io.ByteStreams; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; @@ -84,11 +84,11 @@ public class ParseClientFromJsonTest { Client user = Client.builder().certificate(certificate).orgname("jclouds").clientname("adriancole-jcloudstest") .name("adriancole-jcloudstest").isValidator(false).privateKey(privateKey).build(); - byte[] encrypted = ByteStreams.toByteArray(new RSAEncryptingPayload(new JCECrypto(), Payloads.newPayload("fooya"), user - .getCertificate().getPublicKey())); + byte[] encrypted = ByteStreams2.toByteArrayAndClose(new RSAEncryptingPayload(new JCECrypto(), Payloads.newPayload("fooya"), user + .getCertificate().getPublicKey()).openStream()); assertEquals( - ByteStreams.toByteArray(new RSADecryptingPayload(new JCECrypto(), Payloads.newPayload(encrypted), user.getPrivateKey())), + ByteStreams2.toByteArrayAndClose(new RSADecryptingPayload(new JCECrypto(), Payloads.newPayload(encrypted), user.getPrivateKey()).openStream()), "fooya".getBytes()); assertEquals(
