organize imports

antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java

@@ -44,9 +44,9 @@ import org.apache.tools.ant.taskdefs.optional.ssh.SSHUserInfo;
 import org.apache.tools.ant.taskdefs.optional.ssh.Scp;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.Environment.Variable;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.Environment.Variable;
 import org.jclouds.scriptbuilder.InitScript;
 import org.jclouds.scriptbuilder.domain.OsFamily;
 import org.jclouds.scriptbuilder.domain.ShellToken;

antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java

@@ -30,8 +30,8 @@ import java.util.Map.Entry;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Java;
 import org.apache.tools.ant.types.Environment;
-import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Environment.Variable;
+import org.apache.tools.ant.types.Path;
 import org.jclouds.scriptbuilder.domain.OsFamily;
 import org.jclouds.tools.ant.TestClass;
 import org.testng.annotations.Test;

apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java

@@ -19,8 +19,8 @@
 package org.jclouds.atmos.blobstore.functions;
 
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

apis/atmos/src/main/java/org/jclouds/atmos/domain/AtmosObject.java

@@ -18,10 +18,9 @@
  */
 package org.jclouds.atmos.domain;
 
-import org.jclouds.javax.annotation.Nullable;
-
 import org.jclouds.atmos.domain.internal.AtmosObjectImpl.AtmosObjectFactory;
 import org.jclouds.io.PayloadEnclosing;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.collect.Multimap;
 import com.google.inject.ImplementedBy;

apis/atmos/src/main/java/org/jclouds/atmos/domain/BoundedSet.java

@@ -20,9 +20,8 @@ package org.jclouds.atmos.domain;
 
 import java.util.Set;
 
-import org.jclouds.javax.annotation.Nullable;
-
 import org.jclouds.atmos.domain.internal.BoundedLinkedHashSet;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.inject.ImplementedBy;
 

apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/BoundedLinkedHashSet.java

@@ -22,9 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.LinkedHashSet;
 
-import org.jclouds.javax.annotation.Nullable;
-
 import org.jclouds.atmos.domain.BoundedSet;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.collect.Iterables;
 

apis/atmos/src/main/java/org/jclouds/atmos/functions/ReturnEndpointIfAlreadyExists.java

@@ -23,10 +23,9 @@ import static org.jclouds.util.Throwables2.propagateOrNull;
 
 import java.net.URI;
 
-import org.jclouds.javax.annotation.Nullable;
-
 import org.jclouds.blobstore.KeyAlreadyExistsException;
 import org.jclouds.http.HttpRequest;
+import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.rest.InvocationContext;
 
 import com.google.common.annotations.VisibleForTesting;

apis/atmos/src/test/java/org/jclouds/atmos/blobstore/config/AtmosBlobStoreModuleTest.java

@@ -25,8 +25,8 @@ import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.blobstore.internal.BlobStoreContextImpl;
 import org.jclouds.blobstore.strategy.ContainsValueInListStrategy;
 import org.jclouds.logging.config.NullLoggingModule;
-import org.jclouds.rest.RestContextFactory;
 import org.jclouds.rest.BaseRestClientTest.MockModule;
+import org.jclouds.rest.RestContextFactory;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;

apis/byon/src/main/java/org/jclouds/byon/config/CacheNodeStoreModule.java

@@ -28,9 +28,9 @@ import com.google.common.annotations.Beta;
 import com.google.common.base.Functions;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
-import com.google.common.cache.LoadingCache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.inject.AbstractModule;
 import com.google.inject.TypeLiteral;
 

apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java

@@ -38,9 +38,9 @@ import com.google.common.annotations.Beta;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Supplier;
-import com.google.common.cache.LoadingCache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.common.io.InputSupplier;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;

apis/byon/src/test/java/org/jclouds/byon/config/CacheNodeStoreModuleTest.java

@@ -32,9 +32,9 @@ import org.testng.annotations.Test;
 import com.google.common.base.Functions;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
-import com.google.common.cache.LoadingCache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import com.google.inject.AbstractModule;

apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseCdnUriFromHeaders.java

@@ -22,9 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.net.URI;
 
+import org.jclouds.cloudfiles.reference.CloudFilesHeaders;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.openstack.swift.domain.AccountMetadata;
-import org.jclouds.cloudfiles.reference.CloudFilesHeaders;
 
 import com.google.common.base.Function;
 

apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java

@@ -22,10 +22,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.net.URI;
 
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
 import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
 import org.jclouds.cloudfiles.reference.CloudFilesHeaders;
+import org.jclouds.http.HttpRequest;
+import org.jclouds.http.HttpResponse;
 import org.jclouds.openstack.swift.domain.AccountMetadata;
 import org.jclouds.rest.InvocationContext;
 

apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/LB.java

@@ -22,9 +22,9 @@ import java.util.Date;
 import java.util.Map;
 import java.util.Set;
 
+import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
 import org.jclouds.cloudloadbalancers.domain.Node;
 import org.jclouds.cloudloadbalancers.domain.VirtualIP;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
 import org.jclouds.cloudloadbalancers.domain.internal.BaseLoadBalancer;
 
 import com.google.common.collect.Maps;

apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/NodeClientLiveTest.java

@@ -26,16 +26,16 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
 import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest;
 import org.jclouds.cloudloadbalancers.domain.Node;
 import org.jclouds.cloudloadbalancers.domain.NodeAttributes;
 import org.jclouds.cloudloadbalancers.domain.NodeRequest;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
 import org.jclouds.cloudloadbalancers.domain.VirtualIP.Type;
 import org.jclouds.cloudloadbalancers.internal.BaseCloudLoadBalancersClientLiveTest;
 import org.testng.annotations.AfterGroups;

apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java

@@ -19,9 +19,9 @@
 package org.jclouds.cloudloadbalancers.functions;
 
 import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
 import org.jclouds.cloudloadbalancers.domain.Node;
 import org.jclouds.cloudloadbalancers.domain.VirtualIP;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
 import org.jclouds.cloudloadbalancers.domain.VirtualIP.IPVersion;
 import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.HttpResponse;

apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java

@@ -21,8 +21,8 @@ package org.jclouds.cloudloadbalancers.functions;
 import java.util.Set;
 
 import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.VirtualIP;
 import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
+import org.jclouds.cloudloadbalancers.domain.VirtualIP;
 import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.json.BaseSetParserTest;

apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/options/ListOptionsTest.java

@@ -22,7 +22,6 @@ import static org.jclouds.cloudloadbalancers.options.ListOptions.Builder.limit;
 import static org.jclouds.cloudloadbalancers.options.ListOptions.Builder.marker;
 import static org.testng.Assert.assertEquals;
 
-import org.jclouds.cloudloadbalancers.options.ListOptions;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableList;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersContextBuilder.java

@@ -21,11 +21,11 @@ package org.jclouds.cloudservers;
 import java.util.List;
 import java.util.Properties;
 
+import org.jclouds.cloudservers.compute.config.CloudServersComputeServiceContextModule;
+import org.jclouds.cloudservers.config.CloudServersRestClientModule;
 import org.jclouds.compute.ComputeServiceContextBuilder;
 import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule;
 import org.jclouds.logging.jdk.config.JDKLoggingModule;
-import org.jclouds.cloudservers.compute.config.CloudServersComputeServiceContextModule;
-import org.jclouds.cloudservers.config.CloudServersRestClientModule;
 
 import com.google.inject.Injector;
 import com.google.inject.Module;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindBackupScheduleToJsonPayload.java

@@ -25,9 +25,9 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import org.jclouds.cloudservers.domain.BackupSchedule;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.json.Json;
-import org.jclouds.cloudservers.domain.BackupSchedule;
 import org.jclouds.rest.binders.BindToJsonPayload;
 
 import com.google.common.collect.ImmutableMap;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/FlavorToHardware.java

@@ -20,12 +20,12 @@ package org.jclouds.cloudservers.compute.functions;
 
 import javax.inject.Singleton;
 
+import org.jclouds.cloudservers.domain.Flavor;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.HardwareBuilder;
 import org.jclouds.compute.domain.Processor;
 import org.jclouds.compute.domain.Volume;
 import org.jclouds.compute.domain.internal.VolumeImpl;
-import org.jclouds.cloudservers.domain.Flavor;
 
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptions.java

@@ -23,10 +23,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Map;
 
-import org.jclouds.javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import org.jclouds.http.HttpRequest;
+import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.rest.MapBinder;
 import org.jclouds.rest.binders.BindToJsonPayload;
 

apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerActive.java

@@ -23,10 +23,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.logging.Logger;
 import org.jclouds.cloudservers.CloudServersClient;
 import org.jclouds.cloudservers.domain.Server;
 import org.jclouds.cloudservers.domain.ServerStatus;
+import org.jclouds.logging.Logger;
 
 import com.google.common.base.Predicate;
 import com.google.inject.Inject;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerDeleted.java

@@ -23,10 +23,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.logging.Logger;
 import org.jclouds.cloudservers.CloudServersClient;
 import org.jclouds.cloudservers.domain.Server;
 import org.jclouds.cloudservers.domain.ServerStatus;
+import org.jclouds.logging.Logger;
 
 import com.google.common.base.Predicate;
 import com.google.inject.Inject;

apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaTemplateBuilderImpl.java

@@ -18,7 +18,12 @@
  */
 package org.jclouds.cloudsigma.compute;
 
-import com.google.common.base.Supplier;
+import java.util.Set;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Provider;
+
 import org.jclouds.collect.Memoized;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;
@@ -27,10 +32,7 @@ import org.jclouds.compute.domain.internal.TemplateBuilderImpl;
 import org.jclouds.compute.options.TemplateOptions;
 import org.jclouds.domain.Location;
 
-import javax.inject.Inject;
+import com.google.common.base.Supplier;
-import javax.inject.Named;
-import javax.inject.Provider;
-import java.util.Set;
 
 /**
  * @author Andrei Savu

apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextStringTest.java

@@ -18,10 +18,10 @@
  */
 package org.jclouds.cloudsigma.binders;
 
+import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.createMock;
+import static org.easymock.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
-import static org.easymock.classextension.EasyMock.verify;
 
 import java.io.IOException;
 import java.util.List;

apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandlerTest.java

@@ -18,11 +18,11 @@
  */
 package org.jclouds.cloudsigma.handlers;
 
+import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.reportMatcher;
-import static org.easymock.classextension.EasyMock.createMock;
+import static org.easymock.EasyMock.verify;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.verify;
 
 import java.net.URI;
 

apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/options/CloneDriveOptionsTest.java

@@ -18,9 +18,9 @@
  */
 package org.jclouds.cloudsigma.options;
 
+import static org.jclouds.cloudsigma.options.CloneDriveOptions.Builder.affinity;
 import static org.jclouds.cloudsigma.options.CloneDriveOptions.Builder.size;
 import static org.jclouds.cloudsigma.options.CloneDriveOptions.Builder.tags;
-import static org.jclouds.cloudsigma.options.CloneDriveOptions.Builder.affinity;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 

apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackClient.java

@@ -18,6 +18,8 @@
  */
 package org.jclouds.cloudstack;
 
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.features.AccountClient;
 import org.jclouds.cloudstack.features.AddressClient;
 import org.jclouds.cloudstack.features.AsyncJobClient;
@@ -34,18 +36,16 @@ import org.jclouds.cloudstack.features.NetworkClient;
 import org.jclouds.cloudstack.features.OfferingClient;
 import org.jclouds.cloudstack.features.SSHKeyPairClient;
 import org.jclouds.cloudstack.features.SecurityGroupClient;
+import org.jclouds.cloudstack.features.SessionClient;
 import org.jclouds.cloudstack.features.SnapshotClient;
 import org.jclouds.cloudstack.features.TemplateClient;
 import org.jclouds.cloudstack.features.VMGroupClient;
 import org.jclouds.cloudstack.features.VirtualMachineClient;
 import org.jclouds.cloudstack.features.VolumeClient;
-import org.jclouds.cloudstack.features.SessionClient;
 import org.jclouds.cloudstack.features.ZoneClient;
 import org.jclouds.concurrent.Timeout;
 import org.jclouds.rest.annotations.Delegate;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack.
  * <p/>

apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackGlobalAsyncClient.java

@@ -22,7 +22,6 @@ import org.jclouds.cloudstack.features.GlobalAccountAsyncClient;
 import org.jclouds.cloudstack.features.GlobalAlertAsyncClient;
 import org.jclouds.cloudstack.features.GlobalCapacityAsyncClient;
 import org.jclouds.cloudstack.features.GlobalConfigurationAsyncClient;
-import org.jclouds.cloudstack.features.GlobalConfigurationClient;
 import org.jclouds.cloudstack.features.GlobalDomainAsyncClient;
 import org.jclouds.cloudstack.features.GlobalHostAsyncClient;
 import org.jclouds.cloudstack.features.GlobalOfferingAsyncClient;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackPropertiesBuilder.java

@@ -18,12 +18,12 @@
  */
 package org.jclouds.cloudstack;
 
-import org.jclouds.PropertiesBuilder;
+import static org.jclouds.Constants.PROPERTY_API_VERSION;
+import static org.jclouds.Constants.PROPERTY_ENDPOINT;
 
 import java.util.Properties;
 
-import static org.jclouds.Constants.PROPERTY_API_VERSION;
+import org.jclouds.PropertiesBuilder;
-import static org.jclouds.Constants.PROPERTY_ENDPOINT;
 
 /**
  * Builds properties used in cloudstack Clients

apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java

@@ -18,19 +18,20 @@
  */
 package org.jclouds.cloudstack.binders;
 
-import com.google.common.base.Joiner;
+import static com.google.common.base.Preconditions.checkArgument;
-import com.google.common.collect.Iterables;
+import static com.google.common.base.Preconditions.checkNotNull;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.utils.ModifyRequest;
-import org.jclouds.rest.Binder;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 import javax.ws.rs.core.UriBuilder;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import org.jclouds.http.HttpRequest;
-import static com.google.common.base.Preconditions.checkNotNull;
+import org.jclouds.http.utils.ModifyRequest;
+import org.jclouds.rest.Binder;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.Iterables;
 
 /**
  * @author Richard Downer

apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java

@@ -18,18 +18,18 @@
  */
 package org.jclouds.cloudstack.binders;
 
-import org.jclouds.cloudstack.domain.SnapshotPolicySchedule;
+import static com.google.common.base.Preconditions.checkArgument;
-import org.jclouds.http.HttpRequest;
+import static com.google.common.base.Preconditions.checkNotNull;
-import org.jclouds.http.utils.ModifyRequest;
-import org.jclouds.rest.Binder;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 import javax.ws.rs.core.UriBuilder;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import org.jclouds.cloudstack.domain.SnapshotPolicySchedule;
-import static com.google.common.base.Preconditions.checkNotNull;
+import org.jclouds.http.HttpRequest;
+import org.jclouds.http.utils.ModifyRequest;
+import org.jclouds.rest.Binder;
 
 /**
  * 

apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java

@@ -18,17 +18,17 @@
  */
 package org.jclouds.cloudstack.binders;
 
-import org.jclouds.cloudstack.domain.TemplateMetadata;
+import static com.google.common.base.Preconditions.checkArgument;
-import org.jclouds.http.HttpRequest;
+import static com.google.common.base.Preconditions.checkNotNull;
-import org.jclouds.http.utils.ModifyRequest;
-import org.jclouds.rest.Binder;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.ws.rs.core.UriBuilder;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import org.jclouds.cloudstack.domain.TemplateMetadata;
-import static com.google.common.base.Preconditions.checkNotNull;
+import org.jclouds.http.HttpRequest;
+import org.jclouds.http.utils.ModifyRequest;
+import org.jclouds.rest.Binder;
 
 /**
  * @author Richard Downer

apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java

@@ -18,17 +18,20 @@
  */
 package org.jclouds.cloudstack.compute.functions;
 
-import com.google.common.base.Function;
+import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.common.base.Predicate;
+import static com.google.common.collect.Iterables.filter;
-import com.google.common.base.Supplier;
+import static com.google.common.collect.Iterables.transform;
-import com.google.common.base.Throwables;
+import static com.google.common.collect.Sets.newHashSet;
-import com.google.common.cache.LoadingCache;
+import static org.jclouds.compute.util.ComputeServiceUtils.parseGroupFromName;
-import com.google.common.collect.ImmutableList;
+import static org.jclouds.util.InetAddresses2.isPrivateIPAddress;
-import com.google.common.collect.ImmutableMap;
+
-import com.google.common.collect.ImmutableSet;
+import java.util.Map;
-import com.google.common.collect.Iterables;
+import java.util.Set;
-import com.google.common.collect.Sets;
+
-import com.google.common.util.concurrent.UncheckedExecutionException;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import org.jclouds.cloudstack.domain.IPForwardingRule;
 import org.jclouds.cloudstack.domain.NIC;
 import org.jclouds.cloudstack.domain.VirtualMachine;
@@ -43,21 +46,17 @@ import org.jclouds.compute.domain.NodeState;
 import org.jclouds.compute.domain.Processor;
 import org.jclouds.domain.Location;
 import org.jclouds.rest.ResourceNotFoundException;
-import org.jclouds.util.InetAddresses2;
 import org.jclouds.util.Throwables2;
 
-import javax.annotation.Nullable;
+import com.google.common.base.Function;
-import javax.inject.Inject;
+import com.google.common.base.Predicate;
-import javax.inject.Singleton;
+import com.google.common.base.Supplier;
-import java.util.Map;
+import com.google.common.base.Throwables;
-import java.util.Set;
+import com.google.common.cache.LoadingCache;
-
+import com.google.common.collect.ImmutableList;
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.collect.ImmutableMap;
-import static com.google.common.collect.Iterables.filter;
+import com.google.common.collect.Iterables;
-import static com.google.common.collect.Iterables.transform;
+import com.google.common.util.concurrent.UncheckedExecutionException;
-import static com.google.common.collect.Sets.newHashSet;
-import static org.jclouds.compute.util.ComputeServiceUtils.parseGroupFromName;
-import static org.jclouds.util.InetAddresses2.isPrivateIPAddress;
 
 /**
  * @author Adrian Cole, Andrei Savu

apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java

@@ -18,19 +18,20 @@
  */
 package org.jclouds.cloudstack.compute.strategy;
 
-import com.google.common.collect.Iterables;
-import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
-
-import java.util.Map;
-
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Predicates.and;
 import static com.google.common.collect.Iterables.filter;
 import static org.jclouds.cloudstack.predicates.NetworkPredicates.defaultNetworkInZone;
 import static org.jclouds.cloudstack.predicates.NetworkPredicates.supportsStaticNAT;
 
+import java.util.Map;
+
+import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
+import org.jclouds.cloudstack.domain.Network;
+import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
+
+import com.google.common.collect.Iterables;
+
 /**
  * Convert template options into DeployVirtualMachineOptions, when the target zone has advanced networking.
  *

apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/BasicNetworkOptionsConverter.java

@@ -18,12 +18,12 @@
  */
 package org.jclouds.cloudstack.compute.strategy;
 
+import java.util.Map;
+
 import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
 import org.jclouds.cloudstack.domain.Network;
 import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
 
-import java.util.Map;
-
 /**
  * Convert template options into DeployVirtualMachineOptions, when the target zone has basic networking.
  *

apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java

@@ -18,14 +18,22 @@
  */
 package org.jclouds.cloudstack.compute.strategy;
 
-import com.google.common.base.Predicate;
+import static com.google.common.base.Preconditions.checkArgument;
-import com.google.common.base.Supplier;
+import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.common.base.Throwables;
+import static com.google.common.base.Preconditions.checkState;
-import com.google.common.cache.LoadingCache;
+import static com.google.common.collect.Iterables.filter;
-import com.google.common.collect.ImmutableSet;
+import static org.jclouds.cloudstack.predicates.TemplatePredicates.isReady;
-import com.google.common.collect.ImmutableSet.Builder;
+
-import com.google.common.collect.Sets;
+import java.util.List;
-import com.google.common.primitives.Ints;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+
+import javax.annotation.Resource;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.jclouds.cloudstack.CloudStackClient;
 import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
 import org.jclouds.cloudstack.domain.AsyncCreateResponse;
@@ -50,20 +58,14 @@ import org.jclouds.domain.Credentials;
 import org.jclouds.domain.LoginCredentials;
 import org.jclouds.logging.Logger;
 
-import javax.annotation.Resource;
+import com.google.common.base.Predicate;
-import javax.inject.Inject;
+import com.google.common.base.Supplier;
-import javax.inject.Named;
+import com.google.common.base.Throwables;
-import javax.inject.Singleton;
+import com.google.common.cache.LoadingCache;
-import java.util.List;
+import com.google.common.collect.ImmutableSet;
-import java.util.Map;
+import com.google.common.collect.ImmutableSet.Builder;
-import java.util.Set;
+import com.google.common.collect.Sets;
-import java.util.concurrent.ExecutionException;
+import com.google.common.primitives.Ints;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.filter;
-import static org.jclouds.cloudstack.predicates.TemplatePredicates.isReady;
 
 /**
  * defines the connection between the {@link CloudStackClient} implementation

apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/OptionsConverter.java

@@ -18,19 +18,12 @@
  */
 package org.jclouds.cloudstack.compute.strategy;
 
-import com.google.common.collect.Iterables;
+import java.util.Map;
+
 import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
 import org.jclouds.cloudstack.domain.Network;
 import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
 
-import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Predicates.and;
-import static com.google.common.collect.Iterables.filter;
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.defaultNetworkInZone;
-import static org.jclouds.cloudstack.predicates.NetworkPredicates.supportsStaticNAT;
-
 /**
  * Convert template options into DeployVirtualMachineOptions. Expressed as an interface, because in
  * CloudStack different zone network types have different requirements when it comes to networks and

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java

@@ -20,10 +20,11 @@ package org.jclouds.cloudstack.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Function;
 import com.google.common.collect.ForwardingSet;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java

@@ -18,15 +18,15 @@
  */
 package org.jclouds.cloudstack.domain;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Map;
+
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.gson.annotations.SerializedName;
 
-import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Information about a dimension of the capacity
  *

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java

@@ -18,11 +18,11 @@
  */
 package org.jclouds.cloudstack.domain;
 
-import com.google.gson.annotations.SerializedName;
-
 import static com.google.common.base.CaseFormat.UPPER_CAMEL;
 import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
 
+import com.google.gson.annotations.SerializedName;
+
 /**
  * Represents a CloudStack Cluster.
  *

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java

@@ -18,12 +18,11 @@
  */
 package org.jclouds.cloudstack.domain;
 
+import java.util.Set;
+
 import com.google.common.base.CaseFormat;
 import com.google.common.collect.ImmutableSet;
 import com.google.gson.annotations.SerializedName;
-import org.omg.PortableInterceptor.ACTIVE;
-
-import java.util.Set;
 
 /**
  * @author Andrei Savu

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java

@@ -20,12 +20,13 @@ package org.jclouds.cloudstack.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
 import java.net.URI;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
 
+import javax.annotation.Nullable;
+
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableList;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOfferingAvailabilityType.java

@@ -18,10 +18,10 @@
  */
 package org.jclouds.cloudstack.domain;
 
-import com.google.common.base.CaseFormat;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.common.base.CaseFormat;
+
 /**
  * 
  * @author Andrei Savu

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java

@@ -20,9 +20,10 @@ package org.jclouds.cloudstack.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
 import java.util.Date;
 
+import javax.annotation.Nullable;
+
 import com.google.common.base.CaseFormat;
 import com.google.gson.annotations.SerializedName;
 

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java

@@ -18,11 +18,13 @@
  */
 package org.jclouds.cloudstack.domain;
 
-import javax.annotation.Nullable;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Set;
 import java.util.SortedSet;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
+
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.gson.annotations.SerializedName;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java

@@ -18,10 +18,11 @@
  */
 package org.jclouds.cloudstack.domain;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Date;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableSet;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java

@@ -18,12 +18,12 @@
  */
 package org.jclouds.cloudstack.domain;
 
-import com.google.common.base.CaseFormat;
+import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.gson.annotations.SerializedName;
 
 import java.util.Date;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.CaseFormat;
+import com.google.gson.annotations.SerializedName;
 
 /**
  * Represents a storage pool in CloudStack

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SystemVmType.java

@@ -18,10 +18,10 @@
  */
 package org.jclouds.cloudstack.domain;
 
-import com.google.common.base.CaseFormat;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.common.base.CaseFormat;
+
 /**
  * @author Andrei Savu
  */

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java

@@ -18,10 +18,12 @@
  */
 package org.jclouds.cloudstack.domain;
 
-import javax.annotation.Nullable;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Date;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
+
 import com.google.gson.annotations.SerializedName;
 
 /**

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java

@@ -18,11 +18,11 @@
  */
 package org.jclouds.cloudstack.domain;
 
+import java.util.Date;
+
 import com.google.common.base.Objects;
 import com.google.gson.annotations.SerializedName;
 
-import java.util.Date;
-
 /**
  * @author Richard Downer
  */

apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java

@@ -20,9 +20,10 @@ package org.jclouds.cloudstack.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 import com.google.common.collect.ImmutableList;
 import com.google.gson.annotations.SerializedName;
 

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountAsyncClient.java

@@ -18,7 +18,11 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.Account;
 import org.jclouds.cloudstack.domain.AsyncCreateResponse;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
@@ -29,10 +33,7 @@ import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.annotations.Unwrap;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
 
 /**
  * Provides asynchronous access to CloudStack Account features available to Domain

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncClient.java

@@ -18,7 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.Domain;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
 import org.jclouds.cloudstack.options.ListDomainChildrenOptions;
@@ -31,11 +37,7 @@ import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to CloudStack Domain features available to Domain

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainClient.java

@@ -18,14 +18,14 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.Domain;
 import org.jclouds.cloudstack.options.ListDomainChildrenOptions;
 import org.jclouds.cloudstack.options.ListDomainsOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack Domain features available to Domain
  * Admin users.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncClient.java

@@ -18,7 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.AsyncCreateResponse;
 import org.jclouds.cloudstack.domain.User;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
@@ -31,11 +37,7 @@ import org.jclouds.rest.annotations.Unwrap;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to CloudStack User features available to Domain

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserClient.java

@@ -18,14 +18,14 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.AsyncCreateResponse;
 import org.jclouds.cloudstack.domain.User;
 import org.jclouds.cloudstack.options.ListUsersOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack User features available to Domain
  * Admin users.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java

@@ -18,12 +18,12 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import org.jclouds.cloudstack.domain.Event;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
 import org.jclouds.cloudstack.functions.ParseEventTypesFromHttpResponse;
@@ -35,6 +35,8 @@ import org.jclouds.rest.annotations.ResponseParser;
 import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 
+import com.google.common.util.concurrent.ListenableFuture;
+
 /**
  * Provides asynchronous access to cloudstack via their REST API.
  * <p/>

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClient.java

@@ -18,7 +18,12 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.Alert;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
 import org.jclouds.cloudstack.options.ListAlertsOptions;
@@ -28,10 +33,7 @@ import org.jclouds.rest.annotations.RequestFilters;
 import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to CloudStack Account features available to Global

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertClient.java

@@ -18,13 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.Alert;
 import org.jclouds.cloudstack.options.ListAlertsOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack Alerts features available to Global
  * Admin users.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClient.java

@@ -18,7 +18,12 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.Capacity;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
 import org.jclouds.cloudstack.options.ListCapacityOptions;
@@ -28,10 +33,7 @@ import org.jclouds.rest.annotations.RequestFilters;
 import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to CloudStack Account features available to Global

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityClient.java

@@ -18,13 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.Capacity;
 import org.jclouds.cloudstack.options.ListCapacityOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack Capacities features available to Global
  * Admin users.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncClient.java

@@ -18,23 +18,24 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.ConfigurationEntry;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
 import org.jclouds.cloudstack.options.ListConfigurationEntriesOptions;
 import org.jclouds.rest.annotations.ExceptionParser;
-import org.jclouds.rest.annotations.OnlyElement;
 import org.jclouds.rest.annotations.QueryParams;
 import org.jclouds.rest.annotations.RequestFilters;
 import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to CloudStack Configuration features available to Global

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationClient.java

@@ -18,13 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.ConfigurationEntry;
 import org.jclouds.cloudstack.options.ListConfigurationEntriesOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack Configuration features available to Global
  * Admin users.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncClient.java

@@ -18,7 +18,11 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.Domain;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
 import org.jclouds.cloudstack.options.CreateDomainOptions;
@@ -30,10 +34,7 @@ import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
 
 /**
  * Provides asynchronous access to CloudStack Domain features available to Global

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainClient.java

@@ -18,13 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.Domain;
 import org.jclouds.cloudstack.options.CreateDomainOptions;
 import org.jclouds.cloudstack.options.UpdateDomainOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack Domain features available to Global
  * Admin users.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncClient.java

@@ -18,7 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.Cluster;
 import org.jclouds.cloudstack.domain.Host;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
@@ -36,11 +42,7 @@ import org.jclouds.rest.annotations.RequestFilters;
 import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to cloudstack via their REST API.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostClient.java

@@ -18,6 +18,9 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.Cluster;
 import org.jclouds.cloudstack.domain.Host;
 import org.jclouds.cloudstack.options.AddClusterOptions;
@@ -30,9 +33,6 @@ import org.jclouds.cloudstack.options.UpdateClusterOptions;
 import org.jclouds.cloudstack.options.UpdateHostOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack host features.
  * <p/>

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingClient.java

@@ -18,6 +18,8 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.DiskOffering;
 import org.jclouds.cloudstack.domain.NetworkOffering;
 import org.jclouds.cloudstack.domain.ServiceOffering;
@@ -28,8 +30,6 @@ import org.jclouds.cloudstack.options.UpdateNetworkOfferingOptions;
 import org.jclouds.cloudstack.options.UpdateServiceOfferingOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack zone features.
  * <p/>

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncClient.java

@@ -18,7 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.Pod;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
 import org.jclouds.cloudstack.options.CreatePodOptions;
@@ -33,11 +39,7 @@ import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to CloudStack Pod features available to Global

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodClient.java

@@ -18,15 +18,15 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.Pod;
 import org.jclouds.cloudstack.options.CreatePodOptions;
 import org.jclouds.cloudstack.options.ListPodsOptions;
 import org.jclouds.cloudstack.options.UpdatePodOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack Pod features available to Global
  * Admin users.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClient.java

@@ -18,7 +18,12 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.StoragePool;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
 import org.jclouds.cloudstack.options.ListStoragePoolsOptions;
@@ -27,10 +32,7 @@ import org.jclouds.rest.annotations.RequestFilters;
 import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.annotations.SkipEncoding;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to CloudStack storage pool features.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolClient.java

@@ -18,13 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.StoragePool;
 import org.jclouds.cloudstack.options.ListStoragePoolsOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack storage pool features.
  * <p/>

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncClient.java

@@ -18,7 +18,14 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Date;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.JobResult;
 import org.jclouds.cloudstack.domain.UsageRecord;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
@@ -30,12 +37,7 @@ import org.jclouds.rest.annotations.QueryParams;
 import org.jclouds.rest.annotations.RequestFilters;
 import org.jclouds.rest.annotations.SelectJson;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.util.Date;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to CloudStack usage features.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageClient.java

@@ -18,16 +18,16 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Date;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.JobResult;
 import org.jclouds.cloudstack.domain.UsageRecord;
 import org.jclouds.cloudstack.options.GenerateUsageRecordsOptions;
 import org.jclouds.cloudstack.options.ListUsageRecordsOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Date;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack usage features.
  * <p/>

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncClient.java

@@ -18,7 +18,11 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.ApiKeyPair;
 import org.jclouds.cloudstack.domain.User;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
@@ -30,10 +34,7 @@ import org.jclouds.rest.annotations.RequestFilters;
 import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
 
 /**
  * Provides asynchronous access to CloudStack User features available to Global

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncClient.java

@@ -18,7 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.VlanIPRange;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
 import org.jclouds.cloudstack.options.CreateVlanIPRangeOptions;
@@ -32,11 +38,7 @@ import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to cloudstack via their REST API.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanClient.java

@@ -18,14 +18,14 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.VlanIPRange;
 import org.jclouds.cloudstack.options.CreateVlanIPRangeOptions;
 import org.jclouds.cloudstack.options.ListVlanIPRangesOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack VLAN features.
  * <p/>

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncClient.java

@@ -18,7 +18,11 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.NetworkType;
 import org.jclouds.cloudstack.domain.Zone;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
@@ -31,10 +35,7 @@ import org.jclouds.rest.annotations.SelectJson;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
 
 /**
  * Provides asynchronous access to CloudStack Account features available to Global

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneClient.java

@@ -18,14 +18,14 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.NetworkType;
 import org.jclouds.cloudstack.domain.Zone;
 import org.jclouds.cloudstack.options.CreateZoneOptions;
 import org.jclouds.cloudstack.options.UpdateZoneOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack Zone features available to Global
  * Admin users.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java

@@ -18,7 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.SshKeyPair;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
 import org.jclouds.cloudstack.filters.ReEncodeQueryWithDefaultURLEncoder;
@@ -32,11 +38,7 @@ import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to CloudStack SSHKeyPair features.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java

@@ -18,7 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.binders.BindIdListToCommaDelimitedQueryParam;
 import org.jclouds.cloudstack.binders.BindSnapshotPolicyScheduleToQueryParam;
 import org.jclouds.cloudstack.domain.AsyncCreateResponse;
@@ -40,11 +46,7 @@ import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides synchronous access to CloudStack Snapshot features.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java

@@ -18,22 +18,28 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
-import org.jclouds.cloudstack.domain.VMGroup;
-import org.jclouds.cloudstack.filters.AuthenticationFilter;
-import org.jclouds.cloudstack.options.CreateVMGroupOptions;
-import org.jclouds.cloudstack.options.ListVMGroupsOptions;
-import org.jclouds.cloudstack.options.UpdateVMGroupOptions;
-import org.jclouds.rest.annotations.*;
-import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
-import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
-import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import java.util.Set;
+
+import org.jclouds.cloudstack.domain.VMGroup;
+import org.jclouds.cloudstack.filters.AuthenticationFilter;
+import org.jclouds.cloudstack.options.CreateVMGroupOptions;
+import org.jclouds.cloudstack.options.ListVMGroupsOptions;
+import org.jclouds.cloudstack.options.UpdateVMGroupOptions;
+import org.jclouds.rest.annotations.ExceptionParser;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
+import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
+import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
+
+import com.google.common.util.concurrent.ListenableFuture;
 
 /**
  * Provides asynchronous access to CloudStack VM group features.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java

@@ -18,15 +18,15 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.VMGroup;
 import org.jclouds.cloudstack.options.CreateVMGroupOptions;
 import org.jclouds.cloudstack.options.ListVMGroupsOptions;
 import org.jclouds.cloudstack.options.UpdateVMGroupOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack VM group features.
  * <p/>

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java

@@ -18,7 +18,13 @@
  */
 package org.jclouds.cloudstack.features;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Set;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
 import org.jclouds.cloudstack.domain.AsyncCreateResponse;
 import org.jclouds.cloudstack.domain.VirtualMachine;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
@@ -33,11 +39,7 @@ import org.jclouds.rest.annotations.Unwrap;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 
-import javax.ws.rs.Consumes;
+import com.google.common.util.concurrent.ListenableFuture;
-import javax.ws.rs.GET;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
 /**
  * Provides asynchronous access to cloudstack via their REST API.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java

@@ -18,15 +18,15 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 import org.jclouds.cloudstack.domain.AsyncCreateResponse;
 import org.jclouds.cloudstack.domain.VirtualMachine;
 import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
 import org.jclouds.cloudstack.options.ListVirtualMachinesOptions;
 import org.jclouds.concurrent.Timeout;
 
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Provides synchronous access to CloudStack VirtualMachine features.
  * <p/>

apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncClient.java

@@ -18,22 +18,29 @@
  */
 package org.jclouds.cloudstack.features;
 
+import java.util.Set;
+
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import java.util.Set;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import org.jclouds.cloudstack.domain.AsyncCreateResponse;
 import org.jclouds.cloudstack.domain.Volume;
 import org.jclouds.cloudstack.filters.AuthenticationFilter;
 import org.jclouds.cloudstack.options.ListVolumesOptions;
-import org.jclouds.rest.annotations.*;
+import org.jclouds.rest.annotations.ExceptionParser;
+import org.jclouds.rest.annotations.OnlyElement;
+import org.jclouds.rest.annotations.QueryParams;
+import org.jclouds.rest.annotations.RequestFilters;
+import org.jclouds.rest.annotations.SelectJson;
+import org.jclouds.rest.annotations.Unwrap;
 import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404;
 import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404;
 
+import com.google.common.util.concurrent.ListenableFuture;
+
 /**
  * Provides asynchronous access to cloudstack via their REST API.
  * <p/>

apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java

@@ -18,11 +18,17 @@
  */
 package org.jclouds.cloudstack.filters;
 
-import com.google.common.annotations.VisibleForTesting;
+import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.common.base.Joiner;
+
-import com.google.common.collect.ImmutableList;
+import java.util.Map.Entry;
-import com.google.common.collect.ImmutableSortedSet;
+
-import com.google.common.collect.Multimap;
+import javax.annotation.Resource;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+import javax.ws.rs.core.UriBuilder;
+
 import org.jclouds.Constants;
 import org.jclouds.crypto.Crypto;
 import org.jclouds.crypto.CryptoStreams;
@@ -36,15 +42,11 @@ import org.jclouds.logging.Logger;
 import org.jclouds.rest.RequestSigner;
 import org.jclouds.util.Strings2;
 
-import javax.annotation.Resource;
+import com.google.common.annotations.VisibleForTesting;
-import javax.inject.Inject;
+import com.google.common.base.Joiner;
-import javax.inject.Named;
+import com.google.common.collect.ImmutableList;
-import javax.inject.Provider;
+import com.google.common.collect.ImmutableSortedSet;
-import javax.inject.Singleton;
+import com.google.common.collect.Multimap;
-import javax.ws.rs.core.UriBuilder;
-import java.util.Map.Entry;
-
-import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * 

apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/ReEncodeQueryWithDefaultURLEncoder.java

@@ -18,17 +18,18 @@
  */
 package org.jclouds.cloudstack.filters;
 
-import com.google.common.collect.Multimap;
+import static com.google.common.collect.Iterables.getOnlyElement;
-import com.google.inject.Inject;
+
-import com.google.inject.Provider;
+import javax.ws.rs.core.UriBuilder;
+
 import org.jclouds.http.HttpException;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.HttpRequestFilter;
 import org.jclouds.http.utils.ModifyRequest;
 
-import javax.ws.rs.core.UriBuilder;
+import com.google.common.collect.Multimap;
-
+import com.google.inject.Inject;
-import static com.google.common.collect.Iterables.getOnlyElement;
+import com.google.inject.Provider;
 
 /**
  * By default, jclouds controls encoding based on rules which are different

apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/DateToYyyyMmDd.java

@@ -18,13 +18,13 @@
  */
 package org.jclouds.cloudstack.functions;
 
-import com.google.common.base.Function;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import com.google.common.base.Function;
-import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Convert a Date object into a "yyyy-MM-dd" String

apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/LoginWithPasswordCredentials.java

@@ -18,15 +18,17 @@
  */
 package org.jclouds.cloudstack.functions;
 
-import com.google.common.base.Function;
+import java.io.File;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import org.jclouds.cloudstack.domain.LoginResponse;
 import org.jclouds.cloudstack.features.SessionClient;
 import org.jclouds.crypto.CryptoStreams;
 import org.jclouds.domain.Credentials;
 
-import javax.inject.Inject;
+import com.google.common.base.Function;
-import javax.inject.Singleton;
-import java.io.File;
 
 @Singleton
 public class LoginWithPasswordCredentials implements Function<Credentials, LoginResponse> {

apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java

@@ -20,17 +20,19 @@ package org.jclouds.cloudstack.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.inject.Singleton;
 import java.util.Set;
 
+import javax.inject.Singleton;
+
+import org.jclouds.http.HttpResponse;
+import org.jclouds.http.functions.ParseFirstJsonValueNamed;
+import org.jclouds.json.internal.GsonWrapper;
+
 import com.google.common.base.Function;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet.Builder;
 import com.google.inject.Inject;
 import com.google.inject.TypeLiteral;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.json.internal.GsonWrapper;
 
 /**
  * @author Vijay Kiran

apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java

@@ -1,17 +1,18 @@
 package org.jclouds.cloudstack.functions;
 
-import com.google.common.base.Function;
+import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.common.base.Splitter;
+import static com.google.common.collect.Iterables.get;
-import com.google.inject.Inject;
+import static com.google.common.collect.Iterables.getOnlyElement;
-import com.google.inject.TypeLiteral;
+
 import org.jclouds.cloudstack.domain.LoginResponse;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseFirstJsonValueNamed;
 import org.jclouds.json.internal.GsonWrapper;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.Function;
-import static com.google.common.collect.Iterables.get;
+import com.google.common.base.Splitter;
-import static com.google.common.collect.Iterables.getOnlyElement;
+import com.google.inject.Inject;
+import com.google.inject.TypeLiteral;
 
 /**
  * @author Andrei Savu

apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java

@@ -19,7 +19,6 @@
 package org.jclouds.cloudstack.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.jclouds.cloudstack.domain.AsyncJobError.ErrorCode;
 
 import java.util.Map;
 import java.util.Map.Entry;
@@ -28,11 +27,11 @@ import javax.annotation.Resource;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import com.google.common.base.Strings;
 import org.jclouds.cloudstack.domain.Account;
 import org.jclouds.cloudstack.domain.AsyncJob;
 import org.jclouds.cloudstack.domain.AsyncJob.Builder;
 import org.jclouds.cloudstack.domain.AsyncJobError;
+import org.jclouds.cloudstack.domain.AsyncJobError.ErrorCode;
 import org.jclouds.cloudstack.domain.FirewallRule;
 import org.jclouds.cloudstack.domain.IPForwardingRule;
 import org.jclouds.cloudstack.domain.LoadBalancerRule;
@@ -52,6 +51,7 @@ import org.jclouds.logging.Logger;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.inject.Inject;

apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedData.java

@@ -1,9 +1,12 @@
 package org.jclouds.cloudstack.functions;
 
-import com.google.common.base.Function;
+import java.nio.charset.Charset;
-import com.google.common.base.Throwables;
+import java.security.KeyFactory;
-import com.google.inject.Inject;
+import java.security.PrivateKey;
-import com.google.inject.Singleton;
+import java.security.spec.KeySpec;
+
+import javax.crypto.Cipher;
+
 import org.jclouds.cloudstack.domain.EncryptedPasswordAndPrivateKey;
 import org.jclouds.crypto.Crypto;
 import org.jclouds.crypto.Pems;
@@ -11,11 +14,10 @@ import org.jclouds.domain.LoginCredentials;
 import org.jclouds.encryption.internal.Base64;
 import org.jclouds.javax.annotation.Nullable;
 
-import javax.crypto.Cipher;
+import com.google.common.base.Function;
-import java.nio.charset.Charset;
+import com.google.common.base.Throwables;
-import java.security.KeyFactory;
+import com.google.inject.Inject;
-import java.security.PrivateKey;
+import com.google.inject.Singleton;
-import java.security.spec.KeySpec;
 
 /**
  * Given an encrypted Windows Administrator password and the decryption key, return a LoginCredentials instance.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ZoneIdToZone.java

@@ -18,13 +18,14 @@
  */
 package org.jclouds.cloudstack.functions;
 
-import com.google.common.cache.CacheLoader;
+import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.inject.Inject;
+
 import org.jclouds.cloudstack.CloudStackClient;
 import org.jclouds.cloudstack.domain.Zone;
 import org.jclouds.cloudstack.features.ZoneClient;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.cache.CacheLoader;
+import com.google.inject.Inject;
 
 /**
  * Defines a cache that allows a zone to be looked up by its ID.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java

@@ -18,8 +18,11 @@
  */
 package org.jclouds.cloudstack.handlers;
 
-import com.google.common.base.Throwables;
+import java.io.IOException;
-import com.google.common.io.Closeables;
+
+import javax.annotation.Resource;
+import javax.inject.Singleton;
+
 import org.jclouds.http.HttpCommand;
 import org.jclouds.http.HttpErrorHandler;
 import org.jclouds.http.HttpResponse;
@@ -29,9 +32,8 @@ import org.jclouds.rest.AuthorizationException;
 import org.jclouds.rest.ResourceNotFoundException;
 import org.jclouds.util.Strings2;
 
-import javax.annotation.Resource;
+import com.google.common.base.Throwables;
-import javax.inject.Singleton;
+import com.google.common.io.Closeables;
-import java.io.IOException;
 
 /**
  * 

apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java

@@ -18,9 +18,11 @@
  */
 package org.jclouds.cloudstack.handlers;
 
-import com.google.common.cache.LoadingCache;
+import static org.jclouds.http.HttpUtils.releasePayload;
-import com.google.inject.Inject;
+
-import com.google.inject.Singleton;
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
+
 import org.jclouds.cloudstack.domain.LoginResponse;
 import org.jclouds.cloudstack.features.SessionClient;
 import org.jclouds.domain.Credentials;
@@ -29,10 +31,9 @@ import org.jclouds.http.HttpResponse;
 import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
 import org.jclouds.logging.Logger;
 
-import javax.annotation.PreDestroy;
+import com.google.common.cache.LoadingCache;
-import javax.annotation.Resource;
+import com.google.inject.Inject;
-
+import com.google.inject.Singleton;
-import static org.jclouds.http.HttpUtils.releasePayload;
 
 /**
  * This will parse and set an appropriate exception on the command object.

apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddClusterOptions.java

@@ -18,10 +18,11 @@
  */
 package org.jclouds.cloudstack.options;
 
-import com.google.common.collect.ImmutableSet;
 import org.jclouds.cloudstack.domain.AllocationState;
 import org.jclouds.http.options.BaseHttpRequestOptions;
 
+import com.google.common.collect.ImmutableSet;
+
 /**
  * Options to the GlobalHostClient.addHost() API call
  *