Repository: jclouds-labs Updated Branches: refs/heads/master 9c0ce5863 -> 0b6c67e17
Migrate InputSupplier callers to ByteSource A future version of Guava will remove InputSupplier. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/0b6c67e1 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/0b6c67e1 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/0b6c67e1 Branch: refs/heads/master Commit: 0b6c67e17bde58fb4961315f01df5129249ee30b Parents: 9c0ce58 Author: Andrew Gaul <[email protected]> Authored: Sat May 17 00:34:55 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sat May 17 00:34:55 2014 -0700 ---------------------------------------------------------------------- .../org/jclouds/azure/management/suppliers/KeyStoreSupplier.java | 3 ++- .../jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0b6c67e1/azure-management/src/main/java/org/jclouds/azure/management/suppliers/KeyStoreSupplier.java ---------------------------------------------------------------------- diff --git a/azure-management/src/main/java/org/jclouds/azure/management/suppliers/KeyStoreSupplier.java b/azure-management/src/main/java/org/jclouds/azure/management/suppliers/KeyStoreSupplier.java index a6bb6ba..c72257b 100644 --- a/azure-management/src/main/java/org/jclouds/azure/management/suppliers/KeyStoreSupplier.java +++ b/azure-management/src/main/java/org/jclouds/azure/management/suppliers/KeyStoreSupplier.java @@ -46,6 +46,7 @@ import org.jclouds.location.Provider; import com.google.common.base.Charsets; import com.google.common.base.Supplier; +import com.google.common.io.ByteSource; /** * TODO this code needs to be completely refactored. It needs to stop using KeyStore of at all possible and definitely @@ -101,7 +102,7 @@ public class KeyStoreSupplier implements Supplier<KeyStore> { } while (certsBeginIdx != -1); // parse private key - KeySpec keySpec = Pems.privateKeySpec(InputSuppliers.of(pemPrivateKey)); + KeySpec keySpec = Pems.privateKeySpec(ByteSource.wrap(pemPrivateKey.getBytes(Charsets.UTF_8))); PrivateKey privateKey = crypto.rsaKeyFactory().generatePrivate(keySpec); // populate keystore with private key and certs http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/0b6c67e1/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java ---------------------------------------------------------------------- diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java index edcfc46..b276da2 100644 --- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java +++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/suppliers/FGCPCredentialsSupplier.java @@ -43,6 +43,7 @@ import com.google.common.base.Throwables; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import com.google.common.io.ByteSource; import com.google.common.io.CharStreams; import com.google.common.io.LineProcessor; import com.google.common.util.concurrent.UncheckedExecutionException; @@ -79,7 +80,7 @@ public class FGCPCredentialsSupplier implements Supplier<FGCPCredentials> { // extract private key KeyFactory keyFactory = KeyFactory.getInstance("RSA"); - PrivateKey privateKey = keyFactory.generatePrivate(Pems.privateKeySpec(Payloads.newStringPayload(pem))); + PrivateKey privateKey = keyFactory.generatePrivate(Pems.privateKeySpec(ByteSource.wrap(pem.getBytes(Charsets.UTF_8)))); // extract certificate(s) Collection<X509Certificate> certs = x509Certificates(pem);
