Repository: jclouds-chef Updated Branches: refs/heads/fix-build de2e24d5b -> a6608cb95
ByteStreams.toByteArray -> ByteStreams2.toByteArrayAndClose Review suggestion by @andrewgaul Project: http://git-wip-us.apache.org/repos/asf/jclouds-chef/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-chef/commit/a6608cb9 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-chef/tree/a6608cb9 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-chef/diff/a6608cb9 Branch: refs/heads/fix-build Commit: a6608cb9598154cce49d8523174262ebf9226dd7 Parents: de2e24d Author: Andrew Phillips <[email protected]> Authored: Mon Aug 11 14:44:15 2014 -0400 Committer: Andrew Phillips <[email protected]> Committed: Mon Aug 11 14:44:15 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/jclouds/chef/filters/SignedHeaderAuth.java | 3 +-- .../main/java/org/jclouds/chef/internal/BaseChefService.java | 6 +++--- .../org/jclouds/chef/functions/ParseClientFromJsonTest.java | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/a6608cb9/core/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java b/core/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java index 547e393..50d26a1 100644 --- a/core/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java +++ b/core/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()).openStream()); + 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-chef/blob/a6608cb9/core/src/main/java/org/jclouds/chef/internal/BaseChefService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/internal/BaseChefService.java b/core/src/main/java/org/jclouds/chef/internal/BaseChefService.java index a2e16d5..40a44a9 100644 --- a/core/src/main/java/org/jclouds/chef/internal/BaseChefService.java +++ b/core/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,13 +140,13 @@ 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 + 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 + return ByteStreams2.toByteArrayAndClose(new RSADecryptingPayload(crypto, Payloads.newPayload(supplier.getInput()), privateKey .get()).openStream()); } http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/a6608cb9/core/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java b/core/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java index 08a40e2..1382a6c 100644 --- a/core/src/test/java/org/jclouds/chef/functions/ParseClientFromJsonTest.java +++ b/core/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 + 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()).openStream()), + ByteStreams2.toByteArrayAndClose(new RSADecryptingPayload(new JCECrypto(), Payloads.newPayload(encrypted), user.getPrivateKey()).openStream()), "fooya".getBytes()); assertEquals(
