Repository: jclouds-examples Updated Branches: refs/heads/master 5f644baa6 -> a280fcf73
Prefer Guava IO helpers Project: http://git-wip-us.apache.org/repos/asf/jclouds-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-examples/commit/a280fcf7 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-examples/tree/a280fcf7 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-examples/diff/a280fcf7 Branch: refs/heads/master Commit: a280fcf73344c09f91cac97fb46d94e822692b87 Parents: 5f644ba Author: Andrew Gaul <[email protected]> Authored: Mon Apr 7 22:42:08 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Apr 7 22:43:16 2014 -0700 ---------------------------------------------------------------------- .../java/org/jclouds/examples/compute/basics/MainApp.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/a280fcf7/compute-basics/src/main/java/org/jclouds/examples/compute/basics/MainApp.java ---------------------------------------------------------------------- diff --git a/compute-basics/src/main/java/org/jclouds/examples/compute/basics/MainApp.java b/compute-basics/src/main/java/org/jclouds/examples/compute/basics/MainApp.java index 1481567..f0927cf 100644 --- a/compute-basics/src/main/java/org/jclouds/examples/compute/basics/MainApp.java +++ b/compute-basics/src/main/java/org/jclouds/examples/compute/basics/MainApp.java @@ -35,7 +35,7 @@ import static org.jclouds.compute.predicates.NodePredicates.inGroup; import static org.jclouds.scriptbuilder.domain.Statements.exec; import java.io.File; -import java.io.FileInputStream; +import java.io.IOException; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; @@ -72,7 +72,6 @@ import com.google.inject.Module; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.ComputeMetadata; import org.jclouds.compute.domain.OsFamily; -import org.jclouds.util.Strings2; /** * Demonstrates the use of {@link ComputeService}. @@ -249,8 +248,8 @@ public class MainApp { private static String getPrivateKeyFromFile(String filename) { try { - return Strings2.toStringAndClose(new FileInputStream(filename)); - } catch (java.io.IOException e) { + return Files.toString(new File(filename), Charsets.UTF_8); + } catch (IOException e) { System.err.println("Exception reading private key from '%s': " + filename); e.printStackTrace(); System.exit(1);
