You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2013/12/12 02:31:34 UTC
[3/3] git commit: Enforce no unused imports via Checkstyle
Enforce no unused imports via Checkstyle
Removed with:
mvn checkstyle:checkstyle --quiet -Dcheckstyle.output.file=/dev/stdout -Dcheckstyle.output.format=plain | tac | while read i; do echo $i | sed -n 's/\([^:]*\):\([^:]*\):.*/sed -i \2d \1/p' | bash; done
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/828d8790
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/828d8790
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/828d8790
Branch: refs/heads/master
Commit: 828d8790c2c1e87e4db3a2dd650a8fd2d7f3a790
Parents: 3321506
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed Dec 11 16:45:22 2013 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Wed Dec 11 17:27:43 2013 -0800
----------------------------------------------------------------------
.../org/jclouds/atmos/AtmosApiMetadata.java | 1 -
.../atmos/blobstore/AtmosBlobRequestSigner.java | 1 -
...ullableURIFromListOrLocationHeaderIf20x.java | 1 -
.../org/jclouds/atmos/AtmosAsyncClientTest.java | 1 -
.../java/org/jclouds/byon/BYONApiMetadata.java | 1 -
.../internal/BYONComputeServiceAdapter.java | 2 -
.../cloudfiles/CloudFilesApiMetadata.java | 1 -
.../cloudfiles/CloudFilesAsyncClient.java | 1 -
.../cloudservers/CloudServersApiMetadata.java | 1 -
.../cloudservers/CloudServersAsyncClient.java | 1 -
...CloudServersComputeServiceContextModule.java | 1 -
.../CloudServersComputeServiceAdapter.java | 1 -
.../CloudServersImageExtensionLiveTest.java | 1 -
.../BaseCloudServersRestClientExpectTest.java | 1 -
.../cloudsigma/CloudSigmaApiMetadata.java | 1 -
.../CloudSigmaComputeServiceAdapter.java | 1 -
.../cloudstack/CloudStackApiMetadata.java | 2 -
.../compute/CloudStackComputeService.java | 3 --
.../CloudStackSecurityGroupToSecurityGroup.java | 6 ---
.../compute/loaders/CreateUniqueKeyPair.java | 4 --
.../loaders/FindSecurityGroupOrCreate.java | 4 --
.../CloudStackComputeServiceAdapter.java | 3 --
.../config/CloudStackHttpApiModule.java | 2 -
.../jclouds/cloudstack/domain/ZoneAndName.java | 3 --
.../domain/ZoneSecurityGroupNamePortsCidrs.java | 1 -
.../functions/CreateSecurityGroupIfNeeded.java | 6 ---
.../PasswordAuthenticationExpectTest.java | 1 -
...CloudStackComputeServiceAdapterLiveTest.java | 53 --------------------
.../CloudStackImageExtensionExpectTest.java | 4 --
.../CloudStackImageExtensionLiveTest.java | 1 -
...udStackSecurityGroupToSecurityGroupTest.java | 5 --
.../features/AccountApiExpectTest.java | 1 -
.../features/FirewallApiExpectTest.java | 1 -
.../features/GlobalAlertApiLiveTest.java | 1 -
.../features/GlobalUserApiLiveTest.java | 1 -
.../features/GlobalVlanApiLiveTest.java | 1 -
.../cloudstack/features/ISOApiExpectTest.java | 1 -
.../features/SSHKeyPairApiExpectTest.java | 1 -
.../features/SessionApiExpectTest.java | 1 -
.../features/VirtualMachineApiExpectTest.java | 2 -
.../features/VolumeApiExpectTest.java | 1 -
.../cloudstack/features/ZoneApiExpectTest.java | 1 -
.../cloudwatch/CloudWatchApiMetadata.java | 2 -
.../config/CloudWatchHttpApiModule.java | 5 --
.../jclouds/ec2/compute/EC2ComputeService.java | 1 -
.../config/EC2ComputeServiceContextModule.java | 2 -
.../extensions/EC2SecurityGroupExtension.java | 9 ----
.../compute/strategy/EC2ListNodesStrategy.java | 3 --
.../ec2/config/BaseEC2HttpApiModule.java | 17 -------
.../jclouds/ec2/config/EC2HttpApiModule.java | 30 -----------
.../ec2/options/RunInstancesOptions.java | 1 -
.../org/jclouds/ec2/reference/EC2Constants.java | 1 -
.../jclouds/ec2/util/SubnetFilterBuilder.java | 1 -
.../org/jclouds/ec2/util/TagFilterBuilder.java | 1 -
.../ec2/compute/EC2ComputeServiceLiveTest.java | 1 -
.../ec2/compute/EC2TemplateBuilderTest.java | 1 -
.../extensions/EC2ImageExtensionLiveTest.java | 1 -
.../EC2SecurityGroupExtensionLiveTest.java | 3 --
.../AvailabilityZoneAndRegionApiLiveTest.java | 1 -
.../ec2/features/SubnetApiExpectTest.java | 1 -
.../jclouds/ec2/features/TagApiExpectTest.java | 1 -
.../elasticstack/ElasticStackApiMetadata.java | 1 -
.../ElasticStackComputeServiceAdapter.java | 1 -
.../FilesystemAsyncBlobStoreTest.java | 1 -
.../FilesystemContainerNameValidatorTest.java | 1 -
.../openstack/cinder/v1/CinderApiMetadata.java | 1 -
.../v2_0/config/ProviderModuleExpectTest.java | 1 -
.../nova/ec2/config/NovaEC2HttpApiModule.java | 15 ------
.../ec2/features/NovaEC2KeyPairApiLiveTest.java | 1 -
.../openstack/nova/v2_0/NovaApiMetadata.java | 1 -
.../v2_0/compute/NovaComputeServiceAdapter.java | 1 -
.../compute/options/NovaTemplateOptions.java | 2 -
.../openstack/nova/v2_0/domain/Server.java | 1 -
.../nova/v2_0/domain/ServerCreated.java | 1 -
.../nova/v2_0/domain/zonescoped/ZoneState.java | 1 -
.../v2_0/extensions/FloatingIPAsyncApi.java | 1 -
.../nova/v2_0/extensions/KeyPairAsyncApi.java | 1 -
.../nova/v2_0/options/CreateServerOptions.java | 3 --
...tKeyAndTenantIdAuthenticationExpectTest.java | 1 -
...antNamePropertyAuthenticationExpectTest.java | 1 -
...KeyAndSecretKeyAuthenticationExpectTest.java | 1 -
.../v2_0/PasswordAuthenticationExpectTest.java | 1 -
...dAuthenticationWithTenantNameExpectTest.java | 1 -
.../extensions/NovaImageExtensionLiveTest.java | 1 -
.../loaders/LoadFloatingIpsForInstanceTest.java | 1 -
.../v2_0/functions/InternalURLLiveTest.java | 2 +-
.../nova/v2_0/parse/ParseCreateFlavorTest.java | 1 -
.../rackspace/clouddns/v1/CloudDNSApi.java | 1 -
.../clouddns/v1/CloudDNSApiMetadata.java | 1 -
.../rackspace/clouddns/v1/domain/Job.java | 1 -
.../clouddns/v1/features/DomainApi.java | 2 -
.../clouddns/v1/features/RecordApi.java | 2 -
.../clouddns/v1/features/ReverseDNSApi.java | 2 -
.../v2_0/CloudIdentityApiMetadata.java | 1 -
.../v1/CloudLoadBalancersApiMetadata.java | 1 -
.../v1/domain/LoadBalancer.java | 1 -
.../v1/domain/UpdateLoadBalancer.java | 1 -
.../v1/domain/UpdateNode.java | 1 -
.../v1/domain/internal/BaseLoadBalancer.java | 1 -
.../v1/domain/internal/BaseNode.java | 1 -
.../org/jclouds/route53/Route53ApiMetadata.java | 1 -
.../jclouds/route53/features/HostedZoneApi.java | 1 -
.../main/java/org/jclouds/s3/S3AsyncClient.java | 1 -
.../src/main/java/org/jclouds/s3/S3Client.java | 2 -
.../config/S3BlobStoreContextModule.java | 1 -
.../java/org/jclouds/s3/S3ClientMockTest.java | 1 -
.../jclouds/s3/internal/StubS3AsyncClient.java | 1 -
.../java/org/jclouds/sqs/SQSApiMetadata.java | 2 -
.../jclouds/sqs/config/SQSHttpApiModule.java | 6 ---
.../jclouds/aws/config/AWSRestClientModule.java | 1 -
.../handlers/AWSServerErrorRetryHandler.java | 1 -
.../src/main/java/org/jclouds/sts/STSApi.java | 1 -
.../java/org/jclouds/sts/STSApiMetadata.java | 1 -
.../AWSServerErrorRetryHandlerTest.java | 1 -
.../openstack/swift/SwiftApiMetadata.java | 1 -
.../swift/SwiftKeystoneApiMetadata.java | 1 -
.../swift/config/SwiftRestClientModule.java | 8 ---
.../KeystoneStorageEndpointModuleTest.java | 1 -
.../swift/internal/StubSwiftAsyncClient.java | 1 -
...tKeyAndTenantIdAuthenticationExpectTest.java | 1 -
...antNamePropertyAuthenticationExpectTest.java | 1 -
...KeyAndSecretKeyAuthenticationExpectTest.java | 1 -
.../PasswordAuthenticationExpectTest.java | 1 -
...dAuthenticationWithTenantNameExpectTest.java | 1 -
.../org/jclouds/vcloud/VCloudApiMetadata.java | 1 -
.../compute/options/VCloudTemplateOptions.java | 1 -
.../org/jclouds/vcloud/features/CatalogApi.java | 1 -
.../org/jclouds/vcloud/features/OrgApi.java | 1 -
.../org/jclouds/vcloud/features/VAppApi.java | 1 -
.../vcloud/features/VAppTemplateApi.java | 1 -
.../org/jclouds/vcloud/features/VDCApi.java | 1 -
.../java/org/jclouds/vcloud/features/VmApi.java | 1 -
.../org/jclouds/blobstore/BlobStoreContext.java | 1 -
.../jclouds/blobstore/LocalAsyncBlobStore.java | 1 -
.../blobstore/internal/BaseAsyncBlobStore.java | 1 -
.../blobstore/internal/BaseBlobStore.java | 1 -
.../internal/BlobStoreContextImpl.java | 2 -
.../strategy/internal/DeleteAllKeysInList.java | 2 -
.../internal/BaseBlobIntegrationTest.java | 1 -
.../internal/DeleteAllKeysInListTest.java | 12 -----
...lInitScriptStatusIsZeroThenReturnOutput.java | 1 -
.../jclouds/compute/domain/NodeMetadata.java | 1 -
.../jclouds/compute/domain/SecurityGroup.java | 3 --
.../compute/domain/SecurityGroupBuilder.java | 4 --
.../jclouds/compute/domain/TemplateBuilder.java | 1 -
.../extensions/SecurityGroupExtension.java | 1 -
.../reference/ComputeServiceConstants.java | 1 -
.../impl/AdaptingComputeServiceStrategies.java | 1 -
...desWithGroupEncodedIntoNameThenAddToSet.java | 1 -
.../stub/config/StubComputeServiceAdapter.java | 3 --
.../src/main/java/org/jclouds/ssh/SshKeys.java | 2 -
...ubSecurityGroupExtensionIntegrationTest.java | 1 -
core/src/main/java/org/jclouds/Constants.java | 2 -
core/src/main/java/org/jclouds/Context.java | 1 -
.../main/java/org/jclouds/ContextBuilder.java | 2 -
.../collect/internal/Arg0ToPagedIterable.java | 1 -
.../main/java/org/jclouds/crypto/ASN1Codec.java | 1 -
core/src/main/java/org/jclouds/crypto/Pems.java | 1 -
.../jclouds/events/config/EventBusModule.java | 1 -
.../http/HttpCommandExecutorService.java | 1 -
.../JavaUrlHttpCommandExecutorService.java | 1 -
.../jclouds/io/internal/BasePayloadSlicer.java | 2 +-
.../org/jclouds/io/payloads/FilePayload.java | 1 -
.../lifecycle/config/LifeCycleModule.java | 1 -
.../jclouds/rest/AnonymousRestApiMetadata.java | 1 -
.../java/org/jclouds/rest/RestApiMetadata.java | 1 -
.../org/jclouds/rest/RetryAfterException.java | 1 -
.../rest/annotations/JAXBResponseParser.java | 1 -
.../rest/annotations/SinceApiVersion.java | 2 -
.../AnnotatedSyncToAsyncHttpApiProvider.java | 1 -
.../org/jclouds/rest/config/BinderUtils.java | 1 -
.../jclouds/rest/config/InvocationConfig.java | 1 -
.../config/SyncToAsyncHttpInvocationModule.java | 3 --
.../functions/ImplicitOptionalConverter.java | 3 --
.../internal/DelegatesToInvocationFunction.java | 1 -
.../jclouds/rest/internal/InvokeHttpMethod.java | 2 -
.../internal/InvokeSyncToAsyncHttpMethod.java | 2 -
.../test/java/org/jclouds/PerformanceTest.java | 1 -
.../http/BackoffLimitedRetryJavaTest.java | 1 -
...tpCommandExecutorServiceIntegrationTest.java | 1 -
.../BouncyCastlePasswordDecryptionTest.java | 1 -
.../gae/AsyncGaeHttpCommandExecutorService.java | 1 -
.../gae/GaeHttpCommandExecutorService.java | 1 -
.../sshj/config/SshjSshClientModule.java | 1 -
.../java/org/jclouds/aws/ec2/AWSEC2Api.java | 1 -
.../PresentSpotRequestsAndInstances.java | 1 -
.../aws/ec2/config/AWSEC2HttpApiModule.java | 16 ------
.../aws/ec2/options/AWSRunInstancesOptions.java | 1 -
.../AWSEC2ImageExtensionLiveTest.java | 1 -
.../AWSEC2SecurityGroupExtensionLiveTest.java | 3 --
.../aws/ec2/features/MonitoringApiLiveTest.java | 1 -
.../DescribeSecurityGroupsResponseTest.java | 7 ---
.../org/jclouds/aws/s3/AWSS3ApiMetadata.java | 1 -
.../aws/s3/blobstore/AWSS3AsyncBlobStore.java | 1 -
.../aws/s3/blobstore/AWSS3BlobStore.java | 2 -
.../internal/MpuPartitioningAlgorithmTest.java | 1 -
.../aws/s3/xml/DeleteResultHandlerTest.java | 2 -
.../jclouds/azureblob/AzureBlobApiMetadata.java | 1 -
.../jclouds/azureblob/AzureBlobAsyncClient.java | 1 -
.../blobstore/AzureBlobRequestSigner.java | 1 -
.../azureblob/blobstore/AzureBlobStore.java | 1 -
.../jclouds/dynect/v3/DynECTApiMetadata.java | 1 -
.../org/jclouds/dynect/v3/features/ZoneApi.java | 1 -
.../org/jclouds/glesys/GleSYSApiMetadata.java | 1 -
.../compute/GleSYSComputeServiceAdapter.java | 1 -
.../compute/options/GleSYSTemplateOptions.java | 1 -
.../org/jclouds/gogrid/GoGridApiMetadata.java | 1 -
.../strategy/GoGridComputeServiceAdapter.java | 1 -
.../extensions/CDNContainerAsyncApi.java | 1 -
.../HPCloudObjectStorageBlobSignerLiveTest.java | 2 -
...lockStorageUKProviderMetadataExpectTest.java | 1 -
.../jclouds/softlayer/SoftLayerApiMetadata.java | 1 -
.../SoftLayerComputeServiceAdapter.java | 1 -
.../ultradns/ws/UltraDNSWSApiMetadata.java | 1 -
.../ws/features/DirectionalGroupApi.java | 1 -
.../ws/features/DirectionalPoolApi.java | 2 -
.../ultradns/ws/features/RoundRobinPoolApi.java | 1 -
resources/checkstyle.xml | 1 +
.../scriptbuilder/statements/chef/ChefSolo.java | 2 -
.../statements/chef/InstallChefGems.java | 2 -
.../chef/InstallChefUsingOmnibus.java | 1 -
.../ServerManagerComputeServiceAdapter.java | 1 -
222 files changed, 3 insertions(+), 462 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
index e05c138..51706b1 100644
--- a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
+++ b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
@@ -22,7 +22,6 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
-import org.jclouds.apis.ApiMetadata;
import org.jclouds.atmos.blobstore.config.AtmosBlobStoreContextModule;
import org.jclouds.atmos.config.AtmosRestClientModule;
import org.jclouds.blobstore.BlobStoreContext;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java
----------------------------------------------------------------------
diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java
index 37b526c..508126e 100644
--- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java
+++ b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSigner.java
@@ -33,7 +33,6 @@ import org.jclouds.blobstore.functions.BlobToHttpGetOptions;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.options.GetOptions;
import org.jclouds.reflect.Invocation;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseNullableURIFromListOrLocationHeaderIf20x.java
----------------------------------------------------------------------
diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseNullableURIFromListOrLocationHeaderIf20x.java b/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseNullableURIFromListOrLocationHeaderIf20x.java
index 633be0c..2375426 100644
--- a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseNullableURIFromListOrLocationHeaderIf20x.java
+++ b/apis/atmos/src/main/java/org/jclouds/atmos/functions/ParseNullableURIFromListOrLocationHeaderIf20x.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.atmos.functions;
-import static com.google.common.net.HttpHeaders.CONTENT_LENGTH;
import static org.jclouds.http.HttpUtils.releasePayload;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/atmos/src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java
----------------------------------------------------------------------
diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java
index 83f2985..ce5c43d 100644
--- a/apis/atmos/src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java
+++ b/apis/atmos/src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java
@@ -30,7 +30,6 @@ import org.jclouds.apis.ApiMetadata;
import org.jclouds.atmos.blobstore.functions.BlobToObject;
import org.jclouds.atmos.config.AtmosRestClientModule;
import org.jclouds.atmos.domain.AtmosObject;
-import org.jclouds.atmos.fallbacks.EndpointIfAlreadyExists;
import org.jclouds.atmos.filters.SignRequest;
import org.jclouds.atmos.functions.ParseDirectoryListFromContentAndHeaders;
import org.jclouds.atmos.functions.ParseNullableURIFromListOrLocationHeaderIf20x;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java b/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
index cc28095..1474334 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
@@ -19,7 +19,6 @@ package org.jclouds.byon;
import java.net.URI;
import org.jclouds.JcloudsVersion;
-import org.jclouds.apis.ApiMetadata;
import org.jclouds.apis.internal.BaseApiMetadata;
import org.jclouds.byon.config.BYONComputeServiceContextModule;
import org.jclouds.byon.config.YamlNodeStoreModule;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java b/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java
index 005c219..e5b5b5a 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/internal/BYONComputeServiceAdapter.java
@@ -45,9 +45,7 @@ import com.google.common.base.Predicates;
import com.google.common.base.Supplier;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
import com.google.common.collect.ImmutableSet.Builder;
-import com.google.common.collect.Maps;
import com.google.common.util.concurrent.UncheckedExecutionException;
/**
*
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
index 41d9885..a24d40d 100644
--- a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
+++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
@@ -19,7 +19,6 @@ package org.jclouds.cloudfiles;
import java.net.URI;
import java.util.Properties;
-import org.jclouds.apis.ApiMetadata;
import org.jclouds.blobstore.BlobRequestSigner;
import org.jclouds.cloudfiles.blobstore.config.CloudFilesBlobStoreContextModule;
import org.jclouds.cloudfiles.config.CloudFilesRestClientModule;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java
index 528a59a..ecf4274 100644
--- a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java
+++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesAsyncClient.java
@@ -18,7 +18,6 @@ package org.jclouds.cloudfiles;
import java.net.URI;
import java.util.Set;
-import java.util.concurrent.ExecutionException;
import javax.inject.Named;
import javax.ws.rs.Consumes;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersApiMetadata.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersApiMetadata.java
index 8d57d6e..5edfac0 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersApiMetadata.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersApiMetadata.java
@@ -21,7 +21,6 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
-import org.jclouds.apis.ApiMetadata;
import org.jclouds.cloudservers.compute.config.CloudServersComputeServiceContextModule;
import org.jclouds.cloudservers.config.CloudServersRestClientModule;
import org.jclouds.compute.ComputeServiceContext;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersAsyncClient.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersAsyncClient.java
index 58f1d19..f298485 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersAsyncClient.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersAsyncClient.java
@@ -18,7 +18,6 @@ package org.jclouds.cloudservers;
import java.io.Closeable;
import java.util.Set;
-import java.util.concurrent.ExecutionException;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModule.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModule.java
index 94f4a8f..bd5b053 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModule.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModule.java
@@ -37,7 +37,6 @@ import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.OperatingSystem;
import org.jclouds.compute.extensions.ImageExtension;
-import org.jclouds.compute.internal.BaseComputeService;
import org.jclouds.domain.Location;
import org.jclouds.functions.IdentityFunction;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersComputeServiceAdapter.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersComputeServiceAdapter.java
index 2b70a71..fb7a6bc 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersComputeServiceAdapter.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/strategy/CloudServersComputeServiceAdapter.java
@@ -40,7 +40,6 @@ import org.jclouds.domain.LoginCredentials;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
/**
* defines the connection between the {@link CloudServersClient} implementation and the jclouds
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/extensions/CloudServersImageExtensionLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/extensions/CloudServersImageExtensionLiveTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/extensions/CloudServersImageExtensionLiveTest.java
index f39fee0..f3bbfb3 100644
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/extensions/CloudServersImageExtensionLiveTest.java
+++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/compute/extensions/CloudServersImageExtensionLiveTest.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.cloudservers.compute.extensions;
-import org.jclouds.compute.extensions.ImageExtension;
import org.jclouds.compute.extensions.internal.BaseImageExtensionLiveTest;
import org.jclouds.sshj.config.SshjSshClientModule;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersRestClientExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersRestClientExpectTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersRestClientExpectTest.java
index c031d93..4f7e891 100644
--- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersRestClientExpectTest.java
+++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/internal/BaseCloudServersRestClientExpectTest.java
@@ -26,7 +26,6 @@ import org.jclouds.cloudservers.CloudServersApiMetadata;
import org.jclouds.cloudservers.CloudServersClient;
import org.jclouds.cloudservers.config.CloudServersRestClientModule;
import org.jclouds.date.internal.SimpleDateFormatDateService;
-import org.jclouds.openstack.filters.AddTimestampQuery;
import org.jclouds.openstack.keystone.v1_1.internal.BaseKeystoneRestClientExpectTest;
import org.jclouds.rest.ConfiguresRestClient;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApiMetadata.java b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApiMetadata.java
index 22fb6cf..f5d31a6 100644
--- a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApiMetadata.java
+++ b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApiMetadata.java
@@ -22,7 +22,6 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
-import org.jclouds.apis.ApiMetadata;
import org.jclouds.cloudsigma.compute.config.CloudSigmaComputeServiceContextModule;
import org.jclouds.cloudsigma.config.CloudSigmaRestClientModule;
import org.jclouds.compute.ComputeServiceContext;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java
index 51240ff..cfcffc1 100644
--- a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java
+++ b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaComputeServiceAdapter.java
@@ -39,7 +39,6 @@ import org.jclouds.cloudsigma.domain.ServerInfo;
import org.jclouds.cloudsigma.options.CloneDriveOptions;
import org.jclouds.cloudsigma.reference.CloudSigmaConstants;
import org.jclouds.cloudsigma.util.Servers;
-import org.jclouds.compute.ComputeService;
import org.jclouds.compute.ComputeServiceAdapter;
import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.HardwareBuilder;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
index 65346f3..5cef4d4 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
@@ -21,14 +21,12 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
-import org.jclouds.apis.ApiMetadata;
import org.jclouds.cloudstack.compute.config.CloudStackComputeServiceContextModule;
import org.jclouds.cloudstack.config.CloudStackParserModule;
import org.jclouds.cloudstack.config.CloudStackHttpApiModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
import com.google.common.collect.ImmutableSet;
-import com.google.common.reflect.TypeToken;
import com.google.inject.Module;
/**
* Implementation of {@link ApiMetadata} for Citrix/Apache CloudStack api.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
index 9eb69d6..571e69c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/CloudStackComputeService.java
@@ -26,7 +26,6 @@ import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsSecurityG
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Inject;
@@ -66,7 +65,6 @@ import org.jclouds.cloudstack.domain.SecurityGroup;
import org.jclouds.cloudstack.domain.SshKeyPair;
import org.jclouds.cloudstack.domain.Zone;
import org.jclouds.cloudstack.domain.ZoneAndName;
-import org.jclouds.cloudstack.domain.ZoneSecurityGroupNamePortsCidrs;
import org.jclouds.cloudstack.predicates.SecurityGroupPredicates;
import org.jclouds.scriptbuilder.functions.InitAdminAccess;
@@ -74,7 +72,6 @@ import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
index cc08e36..1fff41a 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroup.java
@@ -16,11 +16,8 @@
*/
package org.jclouds.cloudstack.compute.functions;
-import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.transform;
-import java.util.NoSuchElementException;
-import java.util.Set;
import javax.annotation.Resource;
import javax.inject.Named;
@@ -34,9 +31,6 @@ import org.jclouds.net.domain.IpPermission;
import org.jclouds.cloudstack.domain.IngressRule;
import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.collect.Iterables;
import com.google.inject.Inject;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java
index 46cf4d7..678adba 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/CreateUniqueKeyPair.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.cloudstack.compute.loaders;
-import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.annotation.Resource;
@@ -26,11 +25,8 @@ import javax.inject.Singleton;
import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.logging.Logger;
import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.SshKeyPair;
-import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult;
-import com.google.common.base.Optional;
import com.google.common.base.Throwables;
import com.google.common.cache.CacheLoader;
import com.google.inject.Inject;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java
index f98e494..4051280 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/loaders/FindSecurityGroupOrCreate.java
@@ -18,7 +18,6 @@ package org.jclouds.cloudstack.compute.loaders;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Resource;
import javax.inject.Inject;
@@ -28,14 +27,11 @@ import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.logging.Logger;
import org.jclouds.cloudstack.CloudStackApi;
import org.jclouds.cloudstack.domain.SecurityGroup;
-import org.jclouds.cloudstack.domain.Zone;
import org.jclouds.cloudstack.domain.ZoneAndName;
import org.jclouds.cloudstack.domain.ZoneSecurityGroupNamePortsCidrs;
import com.google.common.base.Function;
-import com.google.common.base.Predicate;
import com.google.common.cache.CacheLoader;
-import com.google.common.util.concurrent.Atomics;
/**
*
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
index 6961ab7..9b9ef1d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/CloudStackComputeServiceAdapter.java
@@ -19,11 +19,9 @@ package org.jclouds.cloudstack.compute.strategy;
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.concat;
import static com.google.common.collect.Iterables.contains;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.get;
-import static com.google.common.collect.Iterables.transform;
import static org.jclouds.cloudstack.options.DeployVirtualMachineOptions.Builder.displayName;
import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.id;
import static org.jclouds.cloudstack.predicates.TemplatePredicates.isReady;
@@ -74,7 +72,6 @@ import org.jclouds.domain.Credentials;
import org.jclouds.domain.LoginCredentials;
import org.jclouds.logging.Logger;
-import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.cache.LoadingCache;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java
index 967e4b1..977c7af 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/config/CloudStackHttpApiModule.java
@@ -18,7 +18,6 @@ package org.jclouds.cloudstack.config;
import static org.jclouds.rest.config.BinderUtils.bindHttpApi;
-import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.jclouds.Constants;
@@ -50,7 +49,6 @@ import org.jclouds.rest.internal.ApiContextImpl;
import com.google.common.base.Supplier;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
import com.google.inject.Provides;
import com.google.inject.Scopes;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
index 3426c9a..8a4a752 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
@@ -17,14 +17,11 @@
package org.jclouds.cloudstack.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Function;
import com.google.common.base.Objects;
-import com.google.common.base.Splitter;
import com.google.common.base.Objects.ToStringHelper;
-import com.google.common.collect.Iterables;
/**
* Helpful when looking for resources by zone and name
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
index a1d3aa7..6b14f7a 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
@@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
-import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java
index 656d164..e6c524e 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/CreateSecurityGroupIfNeeded.java
@@ -20,13 +20,10 @@ package org.jclouds.cloudstack.functions;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Iterables.find;
-import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.nameEquals;
import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.portInRangeForCidr;
import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsSecurityGroups;
import java.util.Set;
-import java.util.concurrent.ExecutionException;
import javax.annotation.Resource;
import javax.inject.Inject;
@@ -36,16 +33,13 @@ import javax.inject.Singleton;
import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.logging.Logger;
import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.domain.IngressRule;
import org.jclouds.cloudstack.domain.SecurityGroup;
import org.jclouds.cloudstack.domain.Zone;
import org.jclouds.cloudstack.domain.ZoneSecurityGroupNamePortsCidrs;
import com.google.common.base.Function;
-import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
-import com.google.common.base.Throwables;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
index fbd132f..3ade6cc 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java
@@ -20,7 +20,6 @@ import static org.testng.Assert.assertNotNull;
import java.util.Properties;
-import org.jclouds.cloudstack.config.CloudStackProperties;
import org.jclouds.cloudstack.features.AccountApi;
import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
import org.jclouds.http.HttpRequest;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java
index 8bdd9d8..6f926c1 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackComputeServiceAdapterLiveTest.java
@@ -16,87 +16,34 @@
*/
package org.jclouds.cloudstack.compute;
import static com.google.common.collect.Iterables.getFirst;
-import static com.google.inject.name.Names.bindProperties;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
-import static org.jclouds.util.Predicates2.retry;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import java.util.Map;
import java.util.Random;
-import java.util.Set;
-import javax.inject.Singleton;
-import org.jclouds.cloudstack.CloudStackApi;
-import org.jclouds.cloudstack.compute.config.CloudStackComputeServiceContextModule;
-import org.jclouds.cloudstack.compute.functions.OrphanedGroupsByZoneId;
-import org.jclouds.cloudstack.compute.loaders.CreateUniqueKeyPair;
-import org.jclouds.cloudstack.compute.loaders.FindSecurityGroupOrCreate;
import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
import org.jclouds.cloudstack.compute.strategy.CloudStackComputeServiceAdapter;
-import org.jclouds.cloudstack.compute.strategy.OptionsConverter;
-import org.jclouds.cloudstack.config.CloudStackParserModule;
-import org.jclouds.cloudstack.config.CloudStackHttpApiModule;
-import org.jclouds.cloudstack.domain.FirewallRule;
import org.jclouds.cloudstack.domain.IPForwardingRule;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.NetworkType;
-import org.jclouds.cloudstack.domain.SecurityGroup;
import org.jclouds.cloudstack.domain.ServiceOffering;
-import org.jclouds.cloudstack.domain.SshKeyPair;
-import org.jclouds.cloudstack.domain.User;
import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.domain.ZoneAndName;
-import org.jclouds.cloudstack.domain.ZoneSecurityGroupNamePortsCidrs;
-import org.jclouds.cloudstack.functions.CreateSecurityGroupIfNeeded;
-import org.jclouds.cloudstack.functions.GetFirewallRulesByVirtualMachine;
-import org.jclouds.cloudstack.functions.GetIPForwardingRulesByVirtualMachine;
-import org.jclouds.cloudstack.functions.StaticNATVirtualMachineInNetwork;
-import org.jclouds.cloudstack.functions.ZoneIdToZone;
import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.predicates.JobComplete;
import org.jclouds.cloudstack.predicates.TemplatePredicates;
-import org.jclouds.cloudstack.suppliers.GetCurrentUser;
-import org.jclouds.cloudstack.suppliers.NetworksForCurrentUser;
-import org.jclouds.cloudstack.suppliers.ZoneIdToZoneSupplier;
-import org.jclouds.collect.Memoized;
import org.jclouds.compute.ComputeServiceAdapter.NodeAndInitialCredentials;
-import org.jclouds.compute.config.ComputeServiceAdapterContextModule;
-import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.Template;
import org.jclouds.compute.functions.DefaultCredentialsFromImageOrOverridingCredentials;
import org.jclouds.compute.strategy.PrioritizeCredentialsFromTemplate;
import org.jclouds.domain.Credentials;
-import org.jclouds.location.Provider;
-import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
import org.jclouds.ssh.SshKeys;
import org.testng.annotations.AfterGroups;
import org.testng.annotations.BeforeGroups;
import org.testng.annotations.Test;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
import com.google.common.net.HostAndPort;
import com.google.common.net.InetAddresses;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Module;
-import com.google.inject.Provides;
-import com.google.inject.Scopes;
-import com.google.inject.TypeLiteral;
-import com.google.inject.assistedinject.FactoryModuleBuilder;
-import com.google.inject.name.Names;
@Test(groups = "live", singleThreaded = true, testName = "CloudStackComputeServiceAdapterLiveTest")
public class CloudStackComputeServiceAdapterLiveTest extends BaseCloudStackApiLiveTest {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionExpectTest.java
index c550a59..b5707a3 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionExpectTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionExpectTest.java
@@ -22,10 +22,8 @@ import java.util.Map;
import java.util.Properties;
import org.jclouds.cloudstack.CloudStackContext;
-import org.jclouds.cloudstack.compute.CloudStackComputeService;
import org.jclouds.cloudstack.internal.BaseCloudStackComputeServiceContextExpectTest;
import org.jclouds.compute.ComputeService;
-import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.ImageTemplate;
import org.jclouds.compute.extensions.ImageExtension;
@@ -35,9 +33,7 @@ import org.testng.annotations.Test;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
import com.google.common.util.concurrent.Futures;
-import com.google.inject.Injector;
import com.google.inject.Module;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionLiveTest.java
index 2367489..ccfe76e 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionLiveTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackImageExtensionLiveTest.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.cloudstack.compute.extensions;
-import org.jclouds.compute.extensions.ImageExtension;
import org.jclouds.compute.extensions.internal.BaseImageExtensionLiveTest;
import org.jclouds.sshj.config.SshjSshClientModule;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroupTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroupTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroupTest.java
index 22420de..8280758 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroupTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/CloudStackSecurityGroupToSecurityGroupTest.java
@@ -18,18 +18,13 @@ package org.jclouds.cloudstack.compute.functions;
import static com.google.common.collect.Iterables.transform;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import java.util.Set;
import org.jclouds.compute.domain.SecurityGroup;
-import org.jclouds.compute.reference.ComputeServiceConstants;
-import org.jclouds.net.domain.IpPermission;
import org.jclouds.net.domain.IpProtocol;
import org.jclouds.cloudstack.domain.IngressRule;
import org.testng.annotations.Test;
-import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableSet;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java
index 883b3da..f3baa24 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java
@@ -20,7 +20,6 @@ import static org.testng.Assert.assertEquals;
import java.util.Set;
-import org.jclouds.cloudstack.CloudStackApiMetadata;
import org.jclouds.cloudstack.CloudStackContext;
import org.jclouds.cloudstack.domain.Account;
import org.jclouds.cloudstack.domain.User;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallApiExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallApiExpectTest.java
index ac7e205..61e1c51 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallApiExpectTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallApiExpectTest.java
@@ -22,7 +22,6 @@ import static org.testng.Assert.assertNull;
import java.net.URI;
import java.util.Set;
-import org.jclouds.cloudstack.CloudStackApiMetadata;
import org.jclouds.cloudstack.CloudStackContext;
import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.FirewallRule;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiLiveTest.java
index 4e1ae28..21be8a2 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiLiveTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertApiLiveTest.java
@@ -24,7 +24,6 @@ import java.util.Set;
import org.jclouds.cloudstack.domain.Alert;
import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
-import org.jclouds.cloudstack.options.ListAlertsOptions;
import org.testng.annotations.Test;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiLiveTest.java
index f8117b7..44575e5 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiLiveTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalUserApiLiveTest.java
@@ -28,7 +28,6 @@ import static org.testng.Assert.assertNotNull;
import java.util.Properties;
import java.util.Set;
-import org.jclouds.cloudstack.CloudStackApiMetadata;
import org.jclouds.cloudstack.CloudStackApi;
import org.jclouds.cloudstack.CloudStackContext;
import org.jclouds.cloudstack.CloudStackGlobalApi;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiLiveTest.java
index c7af910..f7a628c 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiLiveTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanApiLiveTest.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.cloudstack.features;
-import static com.google.common.collect.Iterables.find;
import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.zoneId;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ISOApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ISOApiExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ISOApiExpectTest.java
index aaab54a..52ceee5 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ISOApiExpectTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ISOApiExpectTest.java
@@ -20,7 +20,6 @@ import static org.jclouds.cloudstack.options.ListISOsOptions.Builder.accountInDo
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
-import org.jclouds.cloudstack.CloudStackApiMetadata;
import org.jclouds.cloudstack.CloudStackContext;
import org.jclouds.cloudstack.domain.ISO;
import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiExpectTest.java
index 086ab54..fe1c404 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiExpectTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairApiExpectTest.java
@@ -22,7 +22,6 @@ import static org.testng.Assert.assertTrue;
import java.io.UnsupportedEncodingException;
import java.net.URI;
-import org.jclouds.cloudstack.CloudStackApiMetadata;
import org.jclouds.cloudstack.CloudStackContext;
import org.jclouds.cloudstack.domain.SshKeyPair;
import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionApiExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionApiExpectTest.java
index 99907ad..65cea38 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionApiExpectTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionApiExpectTest.java
@@ -24,7 +24,6 @@ import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.net.URI;
-import org.jclouds.cloudstack.CloudStackApiMetadata;
import org.jclouds.cloudstack.CloudStackContext;
import org.jclouds.cloudstack.domain.Account;
import org.jclouds.cloudstack.domain.LoginResponse;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiExpectTest.java
index 7e94682..a43d162 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiExpectTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineApiExpectTest.java
@@ -18,11 +18,9 @@ package org.jclouds.cloudstack.features;
import static org.testng.Assert.assertEquals;
-import java.net.URI;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
-import org.jclouds.cloudstack.CloudStackApiMetadata;
import org.jclouds.cloudstack.CloudStackContext;
import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.EncryptedPasswordAndPrivateKey;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiExpectTest.java
index 288f3d5..f9e0c0d 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiExpectTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiExpectTest.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.cloudstack.features;
-import org.jclouds.cloudstack.CloudStackApiMetadata;
import org.jclouds.cloudstack.CloudStackContext;
import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.internal.BaseCloudStackExpectTest;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneApiExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneApiExpectTest.java
index bd9479d..b7f803c 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneApiExpectTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneApiExpectTest.java
@@ -20,7 +20,6 @@ import static org.testng.Assert.assertEquals;
import java.net.URI;
-import org.jclouds.cloudstack.CloudStackApiMetadata;
import org.jclouds.cloudstack.CloudStackContext;
import org.jclouds.cloudstack.domain.NetworkType;
import org.jclouds.cloudstack.domain.Zone;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
index 14ef3d4..946f421 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
@@ -22,8 +22,6 @@ import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG;
import java.net.URI;
import java.util.Properties;
-import com.google.common.reflect.TypeToken;
-import org.jclouds.apis.ApiMetadata;
import org.jclouds.cloudwatch.config.CloudWatchHttpApiModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchHttpApiModule.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchHttpApiModule.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchHttpApiModule.java
index 500e7e7..4d110b3 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchHttpApiModule.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/config/CloudWatchHttpApiModule.java
@@ -16,20 +16,15 @@
*/
package org.jclouds.cloudwatch.config;
-import com.google.common.collect.ImmutableMap;
import org.jclouds.aws.config.FormSigningHttpApiModule;
import org.jclouds.cloudwatch.CloudWatchApi;
-import org.jclouds.cloudwatch.features.AlarmApi;
-import org.jclouds.cloudwatch.features.MetricApi;
import org.jclouds.cloudwatch.handlers.CloudWatchErrorHandler;
import org.jclouds.http.HttpErrorHandler;
import org.jclouds.http.annotation.ClientError;
import org.jclouds.http.annotation.ServerError;
import org.jclouds.rest.ConfiguresHttpApi;
-import java.util.Map;
-import static org.jclouds.reflect.Reflection2.typeToken;
/**
* Configures the Monitoring connection.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java
index 078270a..9a81a94 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/EC2ComputeService.java
@@ -32,7 +32,6 @@ import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_GENERATE_INSTA
import static org.jclouds.ec2.util.Tags.resourceToTagsAsMap;
import static org.jclouds.util.Predicates2.retry;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java
index a57e527..81c874d 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModule.java
@@ -27,12 +27,10 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Named;
import javax.inject.Singleton;
-import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.config.BaseComputeServiceContextModule;
import org.jclouds.compute.domain.Image;
import org.jclouds.compute.extensions.ImageExtension;
import org.jclouds.compute.extensions.SecurityGroupExtension;
-import org.jclouds.ec2.compute.EC2ComputeService;
import org.jclouds.ec2.compute.domain.RegionAndName;
import org.jclouds.ec2.compute.loaders.RegionAndIdToImage;
import org.jclouds.ec2.compute.suppliers.RegionAndNameToImageSupplier;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtension.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtension.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtension.java
index ca71620..a9e1741 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtension.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtension.java
@@ -17,28 +17,22 @@
package org.jclouds.ec2.compute.extensions;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Predicates.equalTo;
-import static com.google.common.base.Predicates.not;
import static com.google.common.base.Predicates.notNull;
import static com.google.common.collect.Iterables.concat;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.common.collect.Iterables.toArray;
import static com.google.common.collect.Iterables.transform;
import java.util.NoSuchElementException;
import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
import javax.inject.Inject;
import javax.inject.Named;
-import javax.inject.Provider;
import org.jclouds.Constants;
import org.jclouds.aws.util.AWSUtils;
import org.jclouds.collect.Memoized;
import org.jclouds.compute.domain.SecurityGroup;
-import org.jclouds.compute.domain.SecurityGroupBuilder;
import org.jclouds.compute.extensions.SecurityGroupExtension;
import org.jclouds.compute.functions.GroupNamingConvention;
import org.jclouds.compute.functions.GroupNamingConvention.Factory;
@@ -59,10 +53,7 @@ import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.UncheckedTimeoutException;
/**
* An extension to compute service to allow for the manipulation of {@link SecurityGroup}s. Implementation
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java
index d550b1e..21bfef2 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2ListNodesStrategy.java
@@ -27,7 +27,6 @@ import static com.google.common.collect.Iterables.transform;
import static com.google.common.collect.Multimaps.filterKeys;
import static com.google.common.collect.Multimaps.index;
import static com.google.common.collect.Multimaps.transformValues;
-import static org.jclouds.concurrent.FutureIterables.transformParallel;
import java.util.Set;
@@ -52,9 +51,7 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
import com.google.common.collect.Multimap;
-import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.inject.Inject;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/main/java/org/jclouds/ec2/config/BaseEC2HttpApiModule.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/config/BaseEC2HttpApiModule.java b/apis/ec2/src/main/java/org/jclouds/ec2/config/BaseEC2HttpApiModule.java
index d976221..e52ca01 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/config/BaseEC2HttpApiModule.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/config/BaseEC2HttpApiModule.java
@@ -16,25 +16,11 @@
*/
package org.jclouds.ec2.config;
-import static org.jclouds.reflect.Reflection2.typeToken;
-import static org.jclouds.rest.config.BinderUtils.bindHttpApi;
-import java.util.Map;
-import javax.inject.Singleton;
import org.jclouds.aws.config.FormSigningHttpApiModule;
import org.jclouds.ec2.EC2Api;
-import org.jclouds.ec2.features.SubnetApi;
-import org.jclouds.ec2.features.TagApi;
-import org.jclouds.ec2.features.WindowsApi;
-import org.jclouds.ec2.features.AMIApi;
-import org.jclouds.ec2.features.AvailabilityZoneAndRegionApi;
-import org.jclouds.ec2.features.ElasticBlockStoreApi;
-import org.jclouds.ec2.features.ElasticIPAddressApi;
-import org.jclouds.ec2.features.InstanceApi;
-import org.jclouds.ec2.features.KeyPairApi;
-import org.jclouds.ec2.features.SecurityGroupApi;
import org.jclouds.ec2.suppliers.DescribeAvailabilityZonesInRegion;
import org.jclouds.ec2.suppliers.DescribeRegionsForRegionURIs;
import org.jclouds.location.config.LocationModule;
@@ -48,9 +34,6 @@ import org.jclouds.location.suppliers.derived.ZoneIdToURIFromJoinOnRegionIdToURI
import org.jclouds.location.suppliers.derived.ZoneIdsFromRegionIdToZoneIdsValues;
import org.jclouds.rest.ConfiguresHttpApi;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.reflect.TypeToken;
-import com.google.inject.Provides;
import com.google.inject.Scopes;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/main/java/org/jclouds/ec2/config/EC2HttpApiModule.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/config/EC2HttpApiModule.java b/apis/ec2/src/main/java/org/jclouds/ec2/config/EC2HttpApiModule.java
index a7e1d05..ca45843 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/config/EC2HttpApiModule.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/config/EC2HttpApiModule.java
@@ -16,42 +16,12 @@
*/
package org.jclouds.ec2.config;
-import static org.jclouds.reflect.Reflection2.typeToken;
-import static org.jclouds.rest.config.BinderUtils.bindHttpApi;
-import java.util.Map;
-import javax.inject.Singleton;
-import org.jclouds.aws.config.FormSigningHttpApiModule;
import org.jclouds.ec2.EC2Api;
-import org.jclouds.ec2.features.SubnetApi;
-import org.jclouds.ec2.features.TagApi;
-import org.jclouds.ec2.features.WindowsApi;
-import org.jclouds.ec2.features.AMIApi;
-import org.jclouds.ec2.features.AvailabilityZoneAndRegionApi;
-import org.jclouds.ec2.features.ElasticBlockStoreApi;
-import org.jclouds.ec2.features.ElasticIPAddressApi;
-import org.jclouds.ec2.features.InstanceApi;
-import org.jclouds.ec2.features.KeyPairApi;
-import org.jclouds.ec2.features.SecurityGroupApi;
-import org.jclouds.ec2.suppliers.DescribeAvailabilityZonesInRegion;
-import org.jclouds.ec2.suppliers.DescribeRegionsForRegionURIs;
-import org.jclouds.location.config.LocationModule;
-import org.jclouds.location.suppliers.RegionIdToURISupplier;
-import org.jclouds.location.suppliers.RegionIdToZoneIdsSupplier;
-import org.jclouds.location.suppliers.RegionIdsSupplier;
-import org.jclouds.location.suppliers.ZoneIdToURISupplier;
-import org.jclouds.location.suppliers.ZoneIdsSupplier;
-import org.jclouds.location.suppliers.derived.RegionIdsFromRegionIdToURIKeySet;
-import org.jclouds.location.suppliers.derived.ZoneIdToURIFromJoinOnRegionIdToURI;
-import org.jclouds.location.suppliers.derived.ZoneIdsFromRegionIdToZoneIdsValues;
import org.jclouds.rest.ConfiguresHttpApi;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.reflect.TypeToken;
-import com.google.inject.Provides;
-import com.google.inject.Scopes;
/**
* Configures the EC2 connection.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/main/java/org/jclouds/ec2/options/RunInstancesOptions.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/options/RunInstancesOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/options/RunInstancesOptions.java
index 25d4e7b..7ccb209 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/options/RunInstancesOptions.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/options/RunInstancesOptions.java
@@ -23,7 +23,6 @@ import static com.google.common.io.BaseEncoding.base64;
import java.util.Set;
import org.jclouds.ec2.domain.BlockDeviceMapping;
-import org.jclouds.ec2.domain.InstanceType;
import org.jclouds.ec2.options.internal.BaseEC2RequestOptions;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/main/java/org/jclouds/ec2/reference/EC2Constants.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/reference/EC2Constants.java b/apis/ec2/src/main/java/org/jclouds/ec2/reference/EC2Constants.java
index d5bb159..0d45789 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/reference/EC2Constants.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/reference/EC2Constants.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.ec2.reference;
-import org.jclouds.compute.ComputeService;
/**
* Configuration properties and constants used in EC2 connections.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/main/java/org/jclouds/ec2/util/SubnetFilterBuilder.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/util/SubnetFilterBuilder.java b/apis/ec2/src/main/java/org/jclouds/ec2/util/SubnetFilterBuilder.java
index 75df3d8..6944bb3 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/util/SubnetFilterBuilder.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/util/SubnetFilterBuilder.java
@@ -20,7 +20,6 @@ import java.util.Comparator;
import java.util.Map.Entry;
import org.jclouds.ec2.domain.Subnet;
-import org.jclouds.ec2.features.SubnetApi;
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableMultimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/main/java/org/jclouds/ec2/util/TagFilterBuilder.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/util/TagFilterBuilder.java b/apis/ec2/src/main/java/org/jclouds/ec2/util/TagFilterBuilder.java
index 708fe3c..c2ccedd 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/util/TagFilterBuilder.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/util/TagFilterBuilder.java
@@ -20,7 +20,6 @@ import java.util.Comparator;
import java.util.Map.Entry;
import org.jclouds.ec2.domain.Tag;
-import org.jclouds.ec2.features.TagApi;
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableMultimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java
index 4b5170b..e37e881 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java
@@ -21,7 +21,6 @@ import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import java.util.Map;
-import java.util.NoSuchElementException;
import java.util.Properties;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
index 1adffab..e581605 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
@@ -47,7 +47,6 @@ import org.jclouds.compute.domain.OperatingSystem;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilder;
-import org.jclouds.compute.domain.internal.TemplateBuilderImpl;
import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.domain.Location;
import org.jclouds.domain.LocationBuilder;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionLiveTest.java
index 3099803..1f29e66 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionLiveTest.java
@@ -22,7 +22,6 @@ import java.util.Properties;
import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilderSpec;
-import org.jclouds.compute.extensions.ImageExtension;
import org.jclouds.compute.extensions.internal.BaseImageExtensionLiveTest;
import org.jclouds.sshj.config.SshjSshClientModule;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtensionLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtensionLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtensionLiveTest.java
index 128e1a3..4054e06 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtensionLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtensionLiveTest.java
@@ -16,12 +16,9 @@
*/
package org.jclouds.ec2.compute.extensions;
-import org.jclouds.compute.extensions.SecurityGroupExtension;
import org.jclouds.compute.extensions.internal.BaseSecurityGroupExtensionLiveTest;
-import org.jclouds.sshj.config.SshjSshClientModule;
import org.testng.annotations.Test;
-import com.google.inject.Module;
/**
* Live test for ec2 {@link SecurityGroupExtension} implementation
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/test/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApiLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApiLiveTest.java
index 3ba8332..61c1fb0 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApiLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/AvailabilityZoneAndRegionApiLiveTest.java
@@ -29,7 +29,6 @@ import java.util.SortedMap;
import org.jclouds.compute.internal.BaseComputeServiceContextLiveTest;
import org.jclouds.ec2.EC2Api;
-import org.jclouds.ec2.EC2ApiMetadata;
import org.jclouds.ec2.domain.AvailabilityZoneInfo;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/test/java/org/jclouds/ec2/features/SubnetApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/SubnetApiExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/SubnetApiExpectTest.java
index bb1ecdb..50de812 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/features/SubnetApiExpectTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/SubnetApiExpectTest.java
@@ -25,7 +25,6 @@ import org.jclouds.ec2.internal.BaseEC2ApiExpectTest;
import org.jclouds.ec2.parse.DescribeSubnetsResponseTest;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse;
-import org.jclouds.rest.annotations.SinceApiVersion;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMultimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/ec2/src/test/java/org/jclouds/ec2/features/TagApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/TagApiExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/TagApiExpectTest.java
index ec37148..7ffdb8a 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/features/TagApiExpectTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/TagApiExpectTest.java
@@ -26,7 +26,6 @@ import org.jclouds.ec2.parse.DescribeTagsResponseTest;
import org.jclouds.http.HttpRequest;
import org.jclouds.http.HttpResponse;
import org.jclouds.rest.ResourceNotFoundException;
-import org.jclouds.rest.annotations.SinceApiVersion;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
index ed42e7d..9625beb 100644
--- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
+++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
@@ -22,7 +22,6 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
-import org.jclouds.apis.ApiMetadata;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.elasticstack.compute.config.ElasticStackComputeServiceContextModule;
import org.jclouds.elasticstack.config.ElasticStackHttpApiModule;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java
index 96ebaec..a478cf4 100644
--- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java
+++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java
@@ -32,7 +32,6 @@ import javax.inject.Named;
import javax.inject.Singleton;
import org.jclouds.Constants;
-import org.jclouds.compute.ComputeService;
import org.jclouds.compute.ComputeServiceAdapter;
import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.HardwareBuilder;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/828d8790/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java
----------------------------------------------------------------------
diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java
index 1977976..aef2383 100644
--- a/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java
+++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java
@@ -28,7 +28,6 @@ import static org.testng.Assert.fail;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.net.URI;
import java.util.Iterator;
import java.util.Properties;