Repository: jclouds-labs-google Updated Branches: refs/heads/master 738009aef -> 0a5719814
Migrate InputSupplier callers to ByteSource A future version of Guava will remove InputSupplier. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/0a571981 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/0a571981 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/0a571981 Branch: refs/heads/master Commit: 0a5719814a1537c2beb735276b19f95be66f0d74 Parents: 738009a Author: Andrew Gaul <[email protected]> Authored: Sat May 17 00:39:09 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sat May 17 00:39:09 2014 -0700 ---------------------------------------------------------------------- .../internal/BaseGoogleComputeEngineExpectTest.java | 8 ++++---- .../jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/0a571981/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java index 1c360f2..6c7098e 100644 --- a/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java +++ b/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java @@ -27,7 +27,6 @@ import static org.jclouds.crypto.Pems.privateKeySpec; import static org.jclouds.crypto.Pems.publicKeySpec; import static org.jclouds.crypto.PemsTest.PRIVATE_KEY; import static org.jclouds.crypto.PemsTest.PUBLIC_KEY; -import static org.jclouds.io.Payloads.newStringPayload; import java.io.IOException; import java.net.URI; @@ -61,6 +60,7 @@ import org.jclouds.util.Strings2; import com.google.common.base.Joiner; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; +import com.google.common.io.ByteSource; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.TypeLiteral; @@ -106,9 +106,9 @@ public class BaseGoogleComputeEngineExpectTest<T> extends BaseRestApiExpectTest< binder.bind(new TypeLiteral<Supplier<Long>>() {}).toInstance(Suppliers.ofInstance(0L)); try { KeyFactory keyfactory = KeyFactory.getInstance("RSA"); - PrivateKey privateKey = keyfactory.generatePrivate(privateKeySpec(newStringPayload - (PRIVATE_KEY))); - PublicKey publicKey = keyfactory.generatePublic(publicKeySpec(newStringPayload(PUBLIC_KEY))); + PrivateKey privateKey = keyfactory.generatePrivate(privateKeySpec(ByteSource.wrap( + PRIVATE_KEY.getBytes(UTF_8)))); + PublicKey publicKey = keyfactory.generatePublic(publicKeySpec(ByteSource.wrap(PUBLIC_KEY.getBytes(UTF_8)))); KeyPair keyPair = new KeyPair(publicKey, privateKey); openSshKey = SshKeys.encodeAsOpenSSH(RSAPublicKey.class.cast(publicKey)); final Crypto crypto = createMock(Crypto.class); http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/0a571981/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java ---------------------------------------------------------------------- diff --git a/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java b/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java index e204e8f..4d57d15 100644 --- a/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java +++ b/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) {
