Repository: jclouds-labs Updated Branches: refs/heads/master c5afe3cc4 -> 7f4534d6b
Prefer Guava Files over FileInputStream This ensures proper resource handling. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/7f4534d6 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/7f4534d6 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/7f4534d6 Branch: refs/heads/master Commit: 7f4534d6b6132579584cc6185ed24a417e21c187 Parents: c5afe3c Author: Andrew Gaul <[email protected]> Authored: Thu May 22 00:25:25 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu May 22 00:26:19 2014 -0700 ---------------------------------------------------------------------- .../org/jclouds/fujitsu/fgcp/FGCPCredentialsTest.java | 12 +++++++----- .../virtualbox/functions/admin/FileDownloadFromURI.java | 5 ++--- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7f4534d6/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/FGCPCredentialsTest.java ---------------------------------------------------------------------- diff --git a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/FGCPCredentialsTest.java b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/FGCPCredentialsTest.java index 8d02ae5..bca91f1 100644 --- a/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/FGCPCredentialsTest.java +++ b/fgcp/src/test/java/org/jclouds/fujitsu/fgcp/FGCPCredentialsTest.java @@ -17,11 +17,10 @@ package org.jclouds.fujitsu.fgcp; import static com.google.common.base.Suppliers.ofInstance; -import static org.jclouds.util.Strings2.toStringAndClose; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.io.FileInputStream; +import java.io.File; import java.io.IOException; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; @@ -29,6 +28,9 @@ import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; import java.security.spec.InvalidKeySpecException; +import com.google.common.base.Charsets; +import com.google.common.io.Files; + import org.jclouds.domain.Credentials; import org.jclouds.fujitsu.fgcp.suppliers.FGCPCredentialsSupplier; import org.jclouds.fujitsu.fgcp.suppliers.FGCPCredentialsSupplier.FGCPCredentialsForCredentials; @@ -40,17 +42,17 @@ public class FGCPCredentialsTest { /** * Test loading the credentials by extracting a pk from a PKCS12 keystore. */ - public static FGCPCredentials loadFGCPCredentials(String pathToPem) throws IOException, NoSuchAlgorithmException, + public static FGCPCredentials loadFGCPCredentials(File pathToPem) throws IOException, NoSuchAlgorithmException, CertificateException, InvalidKeySpecException { FGCPCredentialsSupplier loader = new FGCPCredentialsSupplier(ofInstance(new Credentials("foo", - toStringAndClose(new FileInputStream(pathToPem)))), + Files.asCharSource(pathToPem, Charsets.UTF_8).read())), new FGCPCredentialsForCredentials()); return loader.get(); } public void testLoadPKStringFromTestCert() throws IOException, NoSuchAlgorithmException, KeyStoreException, CertificateException, UnrecoverableKeyException, InvalidKeySpecException { - FGCPCredentials creds = loadFGCPCredentials("src/test/resources/certs/jclouds-test-fgcp.pem"); + FGCPCredentials creds = loadFGCPCredentials(new File("src/test/resources/certs/jclouds-test-fgcp.pem")); assertNotNull(creds); assertEquals(creds.identity, "foo"); assertNotNull(creds.privateKey); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/7f4534d6/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/FileDownloadFromURI.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/FileDownloadFromURI.java b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/FileDownloadFromURI.java index 29b37f8..3b7e6ed 100644 --- a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/FileDownloadFromURI.java +++ b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/FileDownloadFromURI.java @@ -17,13 +17,11 @@ package org.jclouds.virtualbox.functions.admin; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.io.ByteStreams.copy; import static org.jclouds.util.Closeables2.closeQuietly; import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_WORKINGDIR; import java.io.File; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -39,6 +37,7 @@ import org.jclouds.rest.HttpAsyncClient; import com.google.common.base.Function; import com.google.common.base.Throwables; +import com.google.common.io.Files; /** * @author Mattias Holmqvist @@ -66,7 +65,7 @@ public class FileDownloadFromURI implements Function<URI, File> { final InputStream inputStream = client.get(input).get(); checkNotNull(inputStream, "%s not found", input); try { - copy(inputStream, new FileOutputStream(file)); + Files.asByteSink(file).writeFrom(inputStream); return file; } catch (FileNotFoundException e) { logger.error(e, "File %s could not be found", file.getPath());
