Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-07 18:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate InputSupplier callers to ByteSource

Browse Source 
A future version of Guava will remove InputSupplier.
This commit is contained in:
Andrew Gaul 2014-05-17 00:39:09 -07:00
parent 1e48a1daea
commit a85b91904f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java
View File

@ -17,10 +17,12 @@
package org.jclouds.oauth.v2.functions; package org.jclouds.oauth.v2.functions;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Charsets;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import com.google.common.io.ByteSource;
import com.google.common.util.concurrent.UncheckedExecutionException; import com.google.common.util.concurrent.UncheckedExecutionException;
import org.jclouds.domain.Credentials; import org.jclouds.domain.Credentials;
import org.jclouds.location.Provider; 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 com.google.common.base.Throwables.propagate;
import static java.lang.String.format; import static java.lang.String.format;
import static org.jclouds.crypto.Pems.privateKeySpec; 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.NO_ALGORITHM;
import static org.jclouds.oauth.v2.OAuthConstants.OAUTH_ALGORITHM_NAMES_TO_KEYFACTORY_ALGORITHM_NAMES; 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; 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(); return new OAuthCredentials.Builder().identity(identity).credential(privateKeyInPemFormat).build();
} }
KeyFactory keyFactory = KeyFactory.getInstance(keyFactoryAlgorithm); 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) return new OAuthCredentials.Builder().identity(identity).credential(privateKeyInPemFormat)
.privateKey(privateKey).build(); .privateKey(privateKey).build();
} catch (IOException e) { } catch (IOException e) {