Updated Branches: refs/heads/master e59ff818d -> b58d334b0
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/b58d334b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/ListLoadBalancers.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/ListLoadBalancers.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/ListLoadBalancers.java index 8c7e755..2972962 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/ListLoadBalancers.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/ListLoadBalancers.java @@ -18,12 +18,14 @@ */ package org.jclouds.examples.rackspace.cloudloadbalancers; +import com.google.common.io.Closeables; import org.jclouds.ContextBuilder; import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi; import java.io.Closeable; +import java.io.IOException; import static org.jclouds.examples.rackspace.cloudloadbalancers.Constants.PROVIDER; @@ -41,7 +43,7 @@ public class ListLoadBalancers implements Closeable { * The first argument (args[0]) must be your username * The second argument (args[1]) must be your API key */ - public static void main(String[] args) { + public static void main(String[] args) throws IOException { ListLoadBalancers listLoadBalancers = new ListLoadBalancers(args[0], args[1]); try { @@ -80,16 +82,8 @@ public class ListLoadBalancers implements Closeable { * * Note that closing quietly like this is not necessary in Java 7. * You would use try-with-resources in the main method instead. - * When jclouds switches to Java 7 the try/catch block below can be removed. */ - public void close() { - if (clbApi != null) { - try { - clbApi.close(); - } - catch (Exception e) { - e.printStackTrace(); - } - } + public void close() throws IOException { + Closeables.close(clbApi, true); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/b58d334b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/RemoveNodes.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/RemoveNodes.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/RemoveNodes.java index 7200eb2..bf809d6 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/RemoveNodes.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/RemoveNodes.java @@ -21,6 +21,7 @@ package org.jclouds.examples.rackspace.cloudloadbalancers; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import com.google.common.io.Closeables; import org.jclouds.ContextBuilder; import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; @@ -30,6 +31,7 @@ import org.jclouds.rackspace.cloudloadbalancers.v1.features.NodeApi; import org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates; import java.io.Closeable; +import java.io.IOException; import java.util.Set; import java.util.concurrent.TimeoutException; @@ -50,7 +52,7 @@ public class RemoveNodes implements Closeable { * The first argument (args[0]) must be your username * The second argument (args[1]) must be your API key */ - public static void main(String[] args) { + public static void main(String[] args) throws IOException { RemoveNodes removeNodes = new RemoveNodes(args[0], args[1]); try { @@ -126,16 +128,8 @@ public class RemoveNodes implements Closeable { * * Note that closing quietly like this is not necessary in Java 7. * You would use try-with-resources in the main method instead. - * When jclouds switches to Java 7 the try/catch block below can be removed. */ - public void close() { - if (clbApi != null) { - try { - clbApi.close(); - } - catch (Exception e) { - e.printStackTrace(); - } - } + public void close() throws IOException { + Closeables.close(clbApi, true); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/b58d334b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateLoadBalancers.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateLoadBalancers.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateLoadBalancers.java index b095d68..34f67ff 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateLoadBalancers.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateLoadBalancers.java @@ -18,6 +18,7 @@ */ package org.jclouds.examples.rackspace.cloudloadbalancers; +import com.google.common.io.Closeables; import org.jclouds.ContextBuilder; import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; @@ -26,6 +27,7 @@ import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi; import org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates; import java.io.Closeable; +import java.io.IOException; import java.util.concurrent.TimeoutException; import static org.jclouds.examples.rackspace.cloudloadbalancers.Constants.*; @@ -46,7 +48,7 @@ public class UpdateLoadBalancers implements Closeable { * The first argument (args[0]) must be your username * The second argument (args[1]) must be your API key */ - public static void main(String[] args) { + public static void main(String[] args) throws IOException { UpdateLoadBalancers updateLoadBalancers = new UpdateLoadBalancers(args[0], args[1]); try { @@ -105,16 +107,8 @@ public class UpdateLoadBalancers implements Closeable { * * Note that closing quietly like this is not necessary in Java 7. * You would use try-with-resources in the main method instead. - * When jclouds switches to Java 7 the try/catch block below can be removed. */ - public void close() { - if (clbApi != null) { - try { - clbApi.close(); - } - catch (Exception e) { - e.printStackTrace(); - } - } + public void close() throws IOException { + Closeables.close(clbApi, true); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/b58d334b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateNodes.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateNodes.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateNodes.java index 1d77a4c..94d1a25 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateNodes.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateNodes.java @@ -19,6 +19,7 @@ package org.jclouds.examples.rackspace.cloudloadbalancers; import com.google.common.collect.Sets; +import com.google.common.io.Closeables; import org.jclouds.ContextBuilder; import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi; import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer; @@ -29,6 +30,7 @@ import org.jclouds.rackspace.cloudloadbalancers.v1.features.NodeApi; import org.jclouds.rackspace.cloudloadbalancers.v1.predicates.LoadBalancerPredicates; import java.io.Closeable; +import java.io.IOException; import java.util.Set; import java.util.concurrent.TimeoutException; @@ -51,7 +53,7 @@ public class UpdateNodes implements Closeable { * The first argument (args[0]) must be your username * The second argument (args[1]) must be your API key */ - public static void main(String[] args) { + public static void main(String[] args) throws IOException { UpdateNodes updateNodes = new UpdateNodes(args[0], args[1]); try { @@ -124,16 +126,8 @@ public class UpdateNodes implements Closeable { * * Note that closing quietly like this is not necessary in Java 7. * You would use try-with-resources in the main method instead. - * When jclouds switches to Java 7 the try/catch block below can be removed. */ - public void close() { - if (clbApi != null) { - try { - clbApi.close(); - } - catch (Exception e) { - e.printStackTrace(); - } - } + public void close() throws IOException { + Closeables.close(clbApi, true); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/b58d334b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java index 3e9247a..8c7ae34 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java @@ -20,6 +20,7 @@ package org.jclouds.examples.rackspace.cloudservers; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; +import com.google.common.io.Closeables; import com.google.common.net.HostAndPort; import com.google.inject.Module; import org.jclouds.ContextBuilder; @@ -35,6 +36,7 @@ import org.jclouds.scriptbuilder.domain.OsFamily; import org.jclouds.sshj.config.SshjSshClientModule; import java.io.Closeable; +import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.Properties; @@ -63,11 +65,11 @@ public class CloudServersPublish implements Closeable { * The second argument (args[1]) must be your API key * The optional third argument (args[2]) is the number of Cloud Servers to start */ - public static void main(String[] args) { + public static void main(String[] args) throws IOException { getPublishedCloudServers(Arrays.asList(args)); } - public static Set<? extends NodeMetadata> getPublishedCloudServers(List<String> args) { + public static Set<? extends NodeMetadata> getPublishedCloudServers(List<String> args) throws IOException { CloudServersPublish cloudServersPublish = new CloudServersPublish(args); Set<? extends NodeMetadata> nodes = null; @@ -168,9 +170,7 @@ public class CloudServersPublish implements Closeable { /** * Always close your service when you're done with it. */ - public void close() { - if (computeService != null) { - computeService.getContext().close(); - } + public void close() throws IOException { + Closeables.close(computeService.getContext(), true); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/b58d334b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java index 63bc6cb..5b92190 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java @@ -18,6 +18,7 @@ */ package org.jclouds.examples.rackspace.cloudservers; +import com.google.common.io.Closeables; import org.jclouds.ContextBuilder; import org.jclouds.compute.ComputeService; import org.jclouds.compute.ComputeServiceContext; @@ -29,6 +30,7 @@ import org.jclouds.compute.domain.Template; import org.jclouds.domain.Location; import java.io.Closeable; +import java.io.IOException; import java.util.Properties; import java.util.Set; import java.util.concurrent.TimeoutException; @@ -51,7 +53,7 @@ public class CreateServer implements Closeable { * The first argument (args[0]) must be your username * The second argument (args[1]) must be your API key */ - public static void main(String[] args) { + public static void main(String[] args) throws IOException { CreateServer createServer = new CreateServer(args[0], args[1]); try { @@ -184,9 +186,7 @@ public class CreateServer implements Closeable { /** * Always close your service when you're done with it. */ - public void close() { - if (computeService != null) { - computeService.getContext().close(); - } + public void close() throws IOException { + Closeables.close(computeService.getContext(), true); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/b58d334b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/DeleteServer.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/DeleteServer.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/DeleteServer.java index 671cec8..03a8718 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/DeleteServer.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/DeleteServer.java @@ -18,12 +18,14 @@ */ package org.jclouds.examples.rackspace.cloudservers; +import com.google.common.io.Closeables; import org.jclouds.ContextBuilder; import org.jclouds.compute.ComputeService; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.domain.NodeMetadata; import java.io.Closeable; +import java.io.IOException; import java.util.Properties; import java.util.Set; @@ -46,7 +48,7 @@ public class DeleteServer implements Closeable { * The first argument (args[0]) must be your username * The second argument (args[1]) must be your API key */ - public static void main(String[] args) { + public static void main(String[] args) throws IOException { DeleteServer deleteServer = new DeleteServer(args[0], args[1]); try { @@ -92,9 +94,7 @@ public class DeleteServer implements Closeable { /** * Always close your service when you're done with it. */ - public void close() { - if (computeService != null) { - computeService.getContext().close(); - } + public void close() throws IOException { + Closeables.close(computeService.getContext(), true); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/b58d334b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ListServersWithFiltering.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ListServersWithFiltering.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ListServersWithFiltering.java index d6633f2..783f8a8 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ListServersWithFiltering.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ListServersWithFiltering.java @@ -20,6 +20,7 @@ package org.jclouds.examples.rackspace.cloudservers; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; +import com.google.common.io.Closeables; import org.jclouds.ContextBuilder; import org.jclouds.compute.ComputeService; import org.jclouds.compute.ComputeServiceContext; @@ -28,6 +29,7 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.predicates.NodePredicates; import java.io.Closeable; +import java.io.IOException; import java.util.Set; import static org.jclouds.examples.rackspace.cloudservers.Constants.PROVIDER; @@ -48,7 +50,7 @@ public class ListServersWithFiltering implements Closeable { * The first argument (args[0]) must be your username * The second argument (args[1]) must be your API key */ - public static void main(String[] args) { + public static void main(String[] args) throws IOException { ListServersWithFiltering listServersWithFiltering = new ListServersWithFiltering(args[0], args[1]); try { @@ -95,10 +97,8 @@ public class ListServersWithFiltering implements Closeable { /** * Always close your service when you're done with it. */ - public void close() { - if (computeService != null) { - computeService.getContext().close(); - } + public void close() throws IOException { + Closeables.close(computeService.getContext(), true); } public static Predicate<ComputeMetadata> nameStartsWith(final String prefix) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/b58d334b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java index 208a3af..8e6da23 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java @@ -20,6 +20,7 @@ package org.jclouds.examples.rackspace.cloudservers; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; +import com.google.common.io.Closeables; import org.jclouds.ContextBuilder; import org.jclouds.compute.ComputeService; import org.jclouds.compute.ComputeServiceContext; @@ -30,6 +31,7 @@ import org.jclouds.openstack.nova.v2_0.features.ServerApi; import org.jclouds.rest.RestContext; import java.io.Closeable; +import java.io.IOException; import java.util.Map; import static org.jclouds.examples.rackspace.cloudservers.Constants.NAME; @@ -52,7 +54,7 @@ public class ServerMetadata implements Closeable { * The first argument (args[0]) must be your username * The second argument (args[1]) must be your API key */ - public static void main(String[] args) { + public static void main(String[] args) throws IOException { ServerMetadata serverMetadata = new ServerMetadata(args[0], args[1]); try { @@ -132,9 +134,7 @@ public class ServerMetadata implements Closeable { /** * Always close your service when you're done with it. */ - public void close() { - if (computeService != null) { - computeService.getContext().close(); - } + public void close() throws IOException { + Closeables.close(computeService.getContext(), true); } }
