You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2015/04/15 21:41:21 UTC
[16/39] jclouds git commit: Migrate InputSupplier callers to
ByteSource
Migrate InputSupplier callers to ByteSource
A future version of Guava will remove InputSupplier.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a85b9190
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a85b9190
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a85b9190
Branch: refs/heads/master
Commit: a85b91904f8eda1506cf4ea95a73fa05ca3bc2d5
Parents: 1e48a1d
Author: Andrew Gaul <ga...@apache.org>
Authored: Sat May 17 00:39:09 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat May 17 00:39:09 2014 -0700
----------------------------------------------------------------------
.../jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a85b9190/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java
index e204e8f..4d57d15 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java
@@ -17,10 +17,12 @@
package org.jclouds.oauth.v2.functions;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Charsets;
import com.google.common.base.Supplier;
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.util.concurrent.UncheckedExecutionException;
import org.jclouds.domain.Credentials;
import org.jclouds.location.Provider;
@@ -40,7 +42,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Throwables.propagate;
import static java.lang.String.format;
import static org.jclouds.crypto.Pems.privateKeySpec;
-import static org.jclouds.io.Payloads.newStringPayload;
import static org.jclouds.oauth.v2.OAuthConstants.NO_ALGORITHM;
import static org.jclouds.oauth.v2.OAuthConstants.OAUTH_ALGORITHM_NAMES_TO_KEYFACTORY_ALGORITHM_NAMES;
import static org.jclouds.oauth.v2.config.OAuthProperties.SIGNATURE_OR_MAC_ALGORITHM;
@@ -92,7 +93,8 @@ public class OAuthCredentialsSupplier implements Supplier<OAuthCredentials> {
return new OAuthCredentials.Builder().identity(identity).credential(privateKeyInPemFormat).build();
}
KeyFactory keyFactory = KeyFactory.getInstance(keyFactoryAlgorithm);
- PrivateKey privateKey = keyFactory.generatePrivate(privateKeySpec(newStringPayload(privateKeyInPemFormat)));
+ PrivateKey privateKey = keyFactory.generatePrivate(privateKeySpec(ByteSource.wrap(
+ privateKeyInPemFormat.getBytes(Charsets.UTF_8))));
return new OAuthCredentials.Builder().identity(identity).credential(privateKeyInPemFormat)
.privateKey(privateKey).build();
} catch (IOException e) {