Repository: jclouds-chef Updated Branches: refs/heads/fix-build [created] 1336a569e
Fixing compilation errors caused by Payload no longer being an InputSupplier Project: http://git-wip-us.apache.org/repos/asf/jclouds-chef/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-chef/commit/1336a569 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-chef/tree/1336a569 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-chef/diff/1336a569 Branch: refs/heads/fix-build Commit: 1336a569e489d19940f050be50ebea627d8d58f5 Parents: 037664e Author: Andrew Phillips <[email protected]> Authored: Mon Aug 11 08:13:40 2014 -0400 Committer: Andrew Phillips <[email protected]> Committed: Mon Aug 11 08:13:40 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java | 2 +- .../src/main/java/org/jclouds/chef/internal/BaseChefService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-chef/blob/1336a569/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 cabe579..547e393 100644 --- a/core/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java +++ b/core/src/main/java/org/jclouds/chef/filters/SignedHeaderAuth.java @@ -190,7 +190,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 = toByteArray(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/1336a569/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 d390555..a2e16d5 100644 --- a/core/src/main/java/org/jclouds/chef/internal/BaseChefService.java +++ b/core/src/main/java/org/jclouds/chef/internal/BaseChefService.java @@ -141,13 +141,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 - .get())); + .get()).openStream()); } @Override public byte[] decrypt(InputSupplier<? extends InputStream> supplier) throws IOException { return ByteStreams.toByteArray(new RSADecryptingPayload(crypto, Payloads.newPayload(supplier.getInput()), privateKey - .get())); + .get()).openStream()); } @VisibleForTesting
