From 5c6ce9f081dbce369bb468b076965fe6dfffc280 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Tue, 27 Mar 2012 14:52:40 -0400 Subject: [PATCH] organize imports --- .../tools/ant/taskdefs/sshjava/SSHJava.java | 2 +- .../ant/taskdefs/sshjava/SSHJavaTest.java | 2 +- .../functions/ObjectToBlobMetadata.java | 2 +- .../org/jclouds/atmos/domain/AtmosObject.java | 3 +- .../org/jclouds/atmos/domain/BoundedSet.java | 3 +- .../domain/internal/BoundedLinkedHashSet.java | 3 +- .../ReturnEndpointIfAlreadyExists.java | 3 +- .../config/AtmosBlobStoreModuleTest.java | 2 +- .../byon/config/CacheNodeStoreModule.java | 2 +- .../byon/config/YamlNodeStoreModule.java | 2 +- .../byon/config/CacheNodeStoreModuleTest.java | 2 +- .../functions/ParseCdnUriFromHeaders.java | 2 +- .../ParseContainerCDNMetadataFromHeaders.java | 4 +- .../cloudloadbalancers/functions/LB.java | 2 +- .../features/NodeClientLiveTest.java | 4 +- .../functions/UnwrapLoadBalancerTest.java | 2 +- .../functions/UnwrapLoadBalancersTest.java | 2 +- .../options/ListOptionsTest.java | 1 - .../CloudServersContextBuilder.java | 4 +- .../BindBackupScheduleToJsonPayload.java | 2 +- .../compute/functions/FlavorToHardware.java | 2 +- .../options/CreateSharedIpGroupOptions.java | 2 +- .../cloudservers/predicates/ServerActive.java | 2 +- .../predicates/ServerDeleted.java | 2 +- .../CloudSigmaTemplateBuilderImpl.java | 12 +++-- ...loneDriveOptionsToPlainTextStringTest.java | 6 +-- .../handlers/CloudSigmaErrorHandlerTest.java | 6 +-- .../options/CloneDriveOptionsTest.java | 2 +- .../jclouds/cloudstack/CloudStackClient.java | 6 +-- .../CloudStackGlobalAsyncClient.java | 1 - .../CloudStackPropertiesBuilder.java | 6 +-- .../BindIdListToCommaDelimitedQueryParam.java | 15 +++--- ...indSnapshotPolicyScheduleToQueryParam.java | 12 ++--- .../BindTemplateMetadataToQueryParams.java | 12 ++--- .../VirtualMachineToNodeMetadata.java | 47 +++++++++---------- .../AdvancedNetworkOptionsConverter.java | 15 +++--- .../BasicNetworkOptionsConverter.java | 4 +- .../CloudStackComputeServiceAdapter.java | 46 +++++++++--------- .../compute/strategy/OptionsConverter.java | 11 +---- .../jclouds/cloudstack/domain/Account.java | 3 +- .../jclouds/cloudstack/domain/Capacity.java | 8 ++-- .../jclouds/cloudstack/domain/Cluster.java | 4 +- .../cloudstack/domain/FirewallRule.java | 5 +- .../jclouds/cloudstack/domain/Network.java | 3 +- .../NetworkOfferingAvailabilityType.java | 4 +- .../cloudstack/domain/PublicIPAddress.java | 3 +- .../cloudstack/domain/SecurityGroup.java | 6 ++- .../cloudstack/domain/ServiceOffering.java | 3 +- .../cloudstack/domain/StoragePool.java | 6 +-- .../cloudstack/domain/SystemVmType.java | 4 +- .../jclouds/cloudstack/domain/Template.java | 6 ++- .../cloudstack/domain/TemplateExtraction.java | 4 +- .../org/jclouds/cloudstack/domain/Zone.java | 3 +- .../features/DomainAccountAsyncClient.java | 11 +++-- .../features/DomainDomainAsyncClient.java | 14 +++--- .../features/DomainDomainClient.java | 6 +-- .../features/DomainUserAsyncClient.java | 14 +++--- .../cloudstack/features/DomainUserClient.java | 6 +-- .../cloudstack/features/EventAsyncClient.java | 6 ++- .../features/GlobalAlertAsyncClient.java | 12 +++-- .../features/GlobalAlertClient.java | 6 +-- .../features/GlobalCapacityAsyncClient.java | 12 +++-- .../features/GlobalCapacityClient.java | 6 +-- .../GlobalConfigurationAsyncClient.java | 15 +++--- .../features/GlobalConfigurationClient.java | 6 +-- .../features/GlobalDomainAsyncClient.java | 11 +++-- .../features/GlobalDomainClient.java | 4 +- .../features/GlobalHostAsyncClient.java | 14 +++--- .../cloudstack/features/GlobalHostClient.java | 6 +-- .../features/GlobalOfferingClient.java | 4 +- .../features/GlobalPodAsyncClient.java | 14 +++--- .../cloudstack/features/GlobalPodClient.java | 6 +-- .../GlobalStoragePoolAsyncClient.java | 12 +++-- .../features/GlobalStoragePoolClient.java | 6 +-- .../features/GlobalUsageAsyncClient.java | 16 ++++--- .../features/GlobalUsageClient.java | 8 ++-- .../features/GlobalUserAsyncClient.java | 11 +++-- .../features/GlobalVlanAsyncClient.java | 14 +++--- .../cloudstack/features/GlobalVlanClient.java | 6 +-- .../features/GlobalZoneAsyncClient.java | 11 +++-- .../cloudstack/features/GlobalZoneClient.java | 4 +- .../features/SSHKeyPairAsyncClient.java | 14 +++--- .../features/SnapshotAsyncClient.java | 14 +++--- .../features/VMGroupAsyncClient.java | 28 ++++++----- .../cloudstack/features/VMGroupClient.java | 6 +-- .../features/VirtualMachineAsyncClient.java | 14 +++--- .../features/VirtualMachineClient.java | 6 +-- .../features/VolumeAsyncClient.java | 13 +++-- .../cloudstack/filters/QuerySigner.java | 30 ++++++------ .../ReEncodeQueryWithDefaultURLEncoder.java | 13 ++--- .../cloudstack/functions/DateToYyyyMmDd.java | 6 +-- .../LoginWithPasswordCredentials.java | 10 ++-- .../ParseEventTypesFromHttpResponse.java | 10 ++-- .../ParseLoginResponseFromHttpResponse.java | 15 +++--- .../functions/ParseTypedAsyncJob.java | 4 +- ...dowsLoginCredentialsFromEncryptedData.java | 20 ++++---- .../cloudstack/functions/ZoneIdToZone.java | 7 +-- .../handlers/CloudStackErrorHandler.java | 12 +++-- ...eSessionAndRetryOn401AndLogoutOnClose.java | 15 +++--- .../cloudstack/options/AddClusterOptions.java | 3 +- .../cloudstack/options/AddHostOptions.java | 7 +-- .../options/AddSecondaryStorageOptions.java | 3 +- .../options/CreateAccountOptions.java | 3 +- .../options/CreateDiskOfferingOptions.java | 4 +- .../options/CreateDomainOptions.java | 4 +- .../options/CreateFirewallRuleOptions.java | 7 +-- .../CreateLoadBalancerRuleOptions.java | 4 +- .../cloudstack/options/CreatePodOptions.java | 3 +- .../options/CreateServiceOfferingOptions.java | 5 +- .../options/CreateTemplateOptions.java | 3 +- .../cloudstack/options/CreateUserOptions.java | 3 +- .../options/CreateVMGroupOptions.java | 3 +- .../cloudstack/options/CreateZoneOptions.java | 3 +- .../cloudstack/options/DeleteHostOptions.java | 3 +- .../cloudstack/options/DeleteISOOptions.java | 3 +- .../options/DeleteTemplateOptions.java | 3 +- .../options/DeployVirtualMachineOptions.java | 4 +- .../cloudstack/options/ExtractISOOptions.java | 3 +- .../options/ExtractTemplateOptions.java | 3 +- .../options/GenerateUsageRecordsOptions.java | 3 +- .../cloudstack/options/ListAlertsOptions.java | 3 +- .../options/ListCapacityOptions.java | 3 +- .../options/ListClustersOptions.java | 3 +- .../ListConfigurationEntriesOptions.java | 3 +- .../options/ListDomainChildrenOptions.java | 3 +- .../options/ListDomainsOptions.java | 3 +- .../cloudstack/options/ListEventsOptions.java | 3 +- .../cloudstack/options/ListISOsOptions.java | 4 +- .../cloudstack/options/ListPodsOptions.java | 3 +- .../options/ListResourceLimitsOptions.java | 3 +- .../options/ListSnapshotsOptions.java | 3 +- .../options/ListStoragePoolsOptions.java | 3 +- .../cloudstack/options/ListUsersOptions.java | 3 +- .../options/ListVolumesOptions.java | 3 +- .../options/UpdateAccountOptions.java | 3 +- .../options/UpdateClusterOptions.java | 3 +- .../options/UpdateDomainOptions.java | 3 +- .../cloudstack/options/UpdateHostOptions.java | 7 +-- .../cloudstack/options/UpdateISOOptions.java | 3 +- .../options/UpdateISOPermissionsOptions.java | 5 +- .../UpdateLoadBalancerRuleOptions.java | 4 +- .../options/UpdateNetworkOfferingOptions.java | 3 +- .../cloudstack/options/UpdatePodOptions.java | 3 +- .../options/UpdateTemplateOptions.java | 3 +- .../cloudstack/options/UpdateUserOptions.java | 3 +- .../options/UpdateVMGroupOptions.java | 3 +- .../cloudstack/options/UpdateZoneOptions.java | 9 ++-- .../predicates/NetworkPredicates.java | 4 +- .../suppliers/ZoneIdToZoneSupplier.java | 14 +++--- .../jclouds/cloudstack/util/ApiKeyPairs.java | 17 +++---- .../PasswordAuthenticationExpectTest.java | 1 + .../compute/CloudStackExperimentLiveTest.java | 30 ++++++------ .../VirtualMachineToNodeMetadataTest.java | 21 +++++---- .../CloudStackTemplateOptionsTest.java | 6 +-- .../strategy/OptionsConverterTest.java | 15 +++--- .../cloudstack/domain/VirtualMachineTest.java | 4 +- .../features/AsyncJobClientLiveTest.java | 2 +- .../BaseCloudStackRestClientExpectTest.java | 19 ++++---- .../features/DomainAccountClientLiveTest.java | 10 ++-- .../DomainDomainClientExpectTest.java | 20 ++++---- .../features/DomainDomainClientLiveTest.java | 16 ++++--- .../features/DomainUserAsyncClientTest.java | 3 +- .../features/DomainUserClientLiveTest.java | 16 +++---- .../features/EventAsyncClientTest.java | 3 +- .../features/FirewallClientLiveTest.java | 6 +-- .../GlobalAccountAsyncClientTest.java | 4 +- .../features/GlobalAccountClientLiveTest.java | 6 +-- .../features/GlobalAlertAsyncClientTest.java | 7 +-- .../features/GlobalAlertClientLiveTest.java | 10 ++-- .../GlobalCapacityAsyncClientTest.java | 7 +-- .../GlobalConfigurationClientExpectTest.java | 28 +++++------ .../GlobalConfigurationClientLiveTest.java | 22 +++++---- .../GlobalDomainClientExpectTest.java | 16 +++---- .../features/GlobalDomainClientLiveTest.java | 15 +++--- .../features/GlobalHostClientExpectTest.java | 22 ++++----- .../features/GlobalHostClientLiveTest.java | 3 +- .../GlobalOfferingClientLiveTest.java | 19 ++++---- .../features/GlobalPodClientExpectTest.java | 11 +++-- .../features/GlobalPodClientLiveTest.java | 17 ++++--- .../GlobalStoragePoolAsyncClientTest.java | 5 +- .../GlobalStoragePoolClientLiveTest.java | 11 +++-- .../features/GlobalUserClientLiveTest.java | 21 +++++---- .../features/GlobalVlanClientExpectTest.java | 11 +++-- .../features/GlobalVlanClientLiveTest.java | 25 +++++----- .../features/GlobalZoneClientExpectTest.java | 15 +++--- .../features/GlobalZoneClientLiveTest.java | 9 ++-- .../features/LimitAsyncClientTest.java | 3 +- .../features/LoadBalancerClientLiveTest.java | 5 +- .../features/NetworkClientLiveTest.java | 30 ++++++------ .../features/SSHKeyPairAsyncClientTest.java | 15 +++--- .../features/SSHKeyPairClientExpectTest.java | 15 +++--- .../features/SSHKeyPairClientLiveTest.java | 14 +++--- .../features/SessionClientExpectTest.java | 15 +++--- .../features/SessionClientLiveTest.java | 14 +++--- .../features/TemplateClientLiveTest.java | 39 ++++++++++----- .../features/VMGroupAsyncClientTest.java | 9 ++-- .../features/VMGroupClientLiveTest.java | 11 +++-- .../VirtualMachineClientExpectTest.java | 13 ++--- .../features/VolumeAsyncClientTest.java | 3 +- .../features/ZoneClientExpectTest.java | 11 +++-- .../cloudstack/filters/QuerySignerTest.java | 2 +- ...eEncodeQueryWithJavaNetURLEncoderTest.java | 20 ++++---- ...kUntilJobCompletesAndReturnResultTest.java | 8 ++-- .../ParseAsyncJobFromHttpResponseTest.java | 6 +-- ...euseOrAssociateNewPublicIPAddressTest.java | 6 +-- .../handlers/CloudStackErrorHandlerTest.java | 17 +++---- ...sionAndRetryOn401AndLogoutOnCloseTest.java | 21 +++++---- .../options/AddClusterOptionsTest.java | 11 +++-- .../options/AddHostOptionsTest.java | 13 +++-- .../AddSecondaryStorageOptionsTest.java | 7 +-- .../options/CreateAccountOptionsTest.java | 7 +-- .../CreateDiskOfferingOptionsTest.java | 7 +-- .../options/CreatePodOptionsTest.java | 7 +-- .../CreateServiceOfferingOptionsTest.java | 11 +++-- .../options/CreateUserOptionsTest.java | 7 +-- .../options/CreateVlanIPRangeOptionsTest.java | 15 ++++-- .../options/DeleteHostOptionsTest.java | 10 ++-- .../GenerateUsageRecordsOptionsTest.java | 7 +-- .../options/ListAlertsOptionsTest.java | 7 +-- .../options/ListCapacityOptionsTest.java | 11 +++-- .../options/ListClustersOptionsTest.java | 15 ++++-- .../options/ListHostsOptionsTest.java | 11 +++-- .../options/ListPodsOptionsTest.java | 11 +++-- .../options/ListStoragePoolsOptionsTest.java | 14 ++++-- .../options/ListUsageRecordsOptionsTest.java | 10 ++-- .../options/ListUsersOptionsTest.java | 11 +++-- .../options/ListVlanIPRangesOptionsTest.java | 15 ++++-- .../options/UpdateAccountOptionsTest.java | 7 +-- .../options/UpdateClusterOptionsTest.java | 7 +-- .../UpdateDiskOfferingOptionsTest.java | 7 +-- .../options/UpdateHostOptionsTest.java | 11 +++-- .../options/UpdatePodOptionsTest.java | 12 +++-- .../options/UpdateUserOptionsTest.java | 7 +-- .../parse/ListClustersResponseTest.java | 5 +- .../ListConfigurationEntriesResponseTest.java | 10 ++-- .../parse/ListDomainsResponseTest.java | 9 ++-- .../parse/ListFirewallRulesResponseTest.java | 9 ++-- .../parse/ListHostsResponseTest.java | 9 ++-- .../ListIPForwardingRulesResponseTest.java | 5 +- .../ListLoadBalancerRulesResponseTest.java | 9 ++-- .../parse/ListNetworksResponseTest.java | 11 +++-- .../parse/ListPodsResponseTest.java | 8 ++-- .../ListPortForwardingRulesResponseTest.java | 4 +- .../parse/ListSSHKeyPairsResponseTest.java | 9 ++-- .../parse/ListUsageRecordsResponseTest.java | 15 +++--- .../parse/ListVlanIPRangesResponseTest.java | 5 +- .../predicates/NetworkPredicatesTest.java | 13 +++-- .../predicates/OSCategoryInTest.java | 23 ++++----- .../predicates/TemplatePredicatesTest.java | 6 +-- .../predicates/UserPredicatesTest.java | 10 ++-- .../VirtualMachineDestroyedTest.java | 12 ++--- .../VirtualMachineExpungedTest.java | 12 ++--- .../predicates/VirtualMachineRunningTest.java | 16 +++---- .../predicates/ZonePredicatesTest.java | 8 ++-- .../jclouds/cloudwatch/domain/Statistics.java | 4 +- .../options/GetMetricStatisticsOptions.java | 4 +- .../GetMetricStatisticsOptionsTest.java | 9 ++-- .../deltacloud/DeltacloudAsyncClient.java | 2 +- .../jclouds/deltacloud/DeltacloudClient.java | 2 +- .../jclouds/deltacloud/domain/Instance.java | 3 +- .../xml/HardwarePropertyHandler.java | 5 +- .../deltacloud/xml/InstanceStatesHandler.java | 4 +- .../ReadOnlyDeltacloudClientLiveTest.java | 2 +- .../handlers/DeltacloudErrorHandlerTest.java | 6 +-- ...DeltacloudRedirectionRetryHandlerTest.java | 6 +-- .../deltacloud/xml/ImageHandlerTest.java | 1 - .../deltacloud/xml/ImagesHandlerTest.java | 1 - .../xml/InstanceStatesHandlerTest.java | 4 +- .../org/jclouds/ec2/EC2ContextBuilder.java | 2 +- .../EC2BindComputeStrategiesByClass.java | 16 +++---- .../config/EC2ResolveImagesModule.java | 6 +-- .../functions/CredentialsForInstance.java | 2 +- .../RunningInstanceToNodeMetadata.java | 4 +- ...dowsLoginCredentialsFromEncryptedData.java | 22 +++++---- .../EC2CreateNodesInGroupThenAddToSet.java | 2 +- .../compute/suppliers/EC2ImageSupplier.java | 4 +- .../RegionAndNameToImageSupplier.java | 2 +- .../ec2/config/EC2RestClientModule.java | 1 - .../org/jclouds/ec2/domain/Attachment.java | 4 +- .../ec2/domain/BlockDeviceMapping.java | 1 - .../org/jclouds/ec2/domain/SecurityGroup.java | 4 +- .../java/org/jclouds/ec2/domain/Volume.java | 11 +++-- .../RegisterImageBackedByEbsOptions.java | 3 +- .../ec2/predicates/VolumeDetached.java | 15 +++--- .../jclouds/ec2/services/AMIAsyncClient.java | 4 +- .../org/jclouds/ec2/services/AMIClient.java | 5 +- .../AvailabilityZoneAndRegionAsyncClient.java | 2 +- .../AvailabilityZoneAndRegionClient.java | 5 +- .../ElasticBlockStoreAsyncClient.java | 2 +- .../ec2/services/ElasticBlockStoreClient.java | 5 +- .../services/ElasticIPAddressAsyncClient.java | 2 +- .../ec2/services/ElasticIPAddressClient.java | 3 +- .../ec2/services/InstanceAsyncClient.java | 2 +- .../jclouds/ec2/services/InstanceClient.java | 3 +- .../ec2/services/KeyPairAsyncClient.java | 2 +- .../jclouds/ec2/services/KeyPairClient.java | 5 +- .../services/SecurityGroupAsyncClient.java | 2 +- .../ec2/services/SecurityGroupClient.java | 5 +- .../ec2/services/WindowsAsyncClient.java | 6 +-- .../jclouds/ec2/services/WindowsClient.java | 6 +-- .../DescribeAvailabilityZonesInRegion.java | 2 +- .../ec2/xml/BlockDeviceMappingHandler.java | 4 +- .../ec2/xml/CreateVolumeResponseHandler.java | 2 +- .../xml/DescribeImagesResponseHandler.java | 4 +- .../xml/GetPasswordDataResponseHandler.java | 4 +- ...icationArchitecturesEC2ClientLiveTest.java | 2 +- .../compute/EC2ComputeServiceLiveTest.java | 1 + .../ec2/compute/EC2TemplateBuilderTest.java | 6 +-- .../EC2ComputeServiceContextModuleTest.java | 4 +- .../CreateSecurityGroupIfNeededTest.java | 8 ++-- .../functions/CreateUniqueKeyPairTest.java | 6 +-- .../LoadPublicIpForInstanceOrNullTest.java | 6 +-- .../functions/RegionAndIdToImageTest.java | 8 ++-- .../RunningInstanceToNodeMetadataTest.java | 2 +- ...LoginCredentialsFromEncryptedDataTest.java | 6 +-- ...GroupsAsNeededAndReturnRunOptionsTest.java | 6 +-- .../strategy/EC2DestroyNodeStrategyTest.java | 6 +-- .../ec2/predicates/VolumeDetachedTest.java | 22 ++++----- ...ailabilityZoneAndRegionClientLiveTest.java | 2 +- .../ElasticBlockStoreClientLiveTest.java | 3 -- .../ec2/services/WindowsClientLiveTest.java | 28 ++++++----- ...DescribeAvailabilityZonesInRegionTest.java | 2 - .../ec2/xml/AttachmentHandlerTest.java | 6 +-- .../xml/BlockDeviceMappingHandlerTest.java | 2 +- .../ec2/xml/BundleTaskHandlerTest.java | 6 +-- .../xml/CreateVolumeResponseHandlerTest.java | 4 +- .../DescribeAddressesResponseHandlerTest.java | 4 +- ...escribeBundleTasksResponseHandlerTest.java | 6 +-- .../DescribeImagesResponseHandlerTest.java | 4 +- .../DescribeKeyPairsResponseHandlerTest.java | 4 +- ...ribeSecurityGroupsResponseHandlerTest.java | 4 +- .../DescribeSnapshotsResponseHandlerTest.java | 6 +-- .../DescribeVolumesResponseHandlerTest.java | 4 +- .../xml/InstanceStateChangeHandlerTest.java | 6 +-- .../ec2/xml/KeyPairResponseHandlerTest.java | 4 +- .../xml/RunInstancesResponseHandlerTest.java | 4 +- .../jclouds/ec2/xml/SnapshotHandlerTest.java | 6 +-- ...asticStackComputeServiceContextModule.java | 2 +- .../config/ElasticStackRestClientModule.java | 2 +- .../domain/CreateDriveRequest.java | 1 - .../jclouds/elasticstack/domain/Drive.java | 1 - .../elasticstack/domain/DriveInfo.java | 1 - .../functions/BaseDriveToMap.java | 2 +- .../elasticstack/functions/MapToNICs.java | 4 +- .../functions/MapToServerInfo.java | 21 ++++++--- .../BindServerToPlainTextStringTest.java | 32 ++++++++----- .../functions/BaseDriveToMapTest.java | 2 +- .../functions/SplitNewlinesTest.java | 1 - .../ElasticStackErrorHandlerTest.java | 6 +-- .../filesystem/FilesystemAsyncBlobStore.java | 2 +- .../FilesystemBlobStoreContextBuilder.java | 4 +- .../FilesystemBlobStorePropertiesBuilder.java | 3 +- .../FilesystemBlobKeyValidatorTest.java | 5 +- .../FilesystemContainerNameValidatorTest.java | 11 +++-- .../jclouds/filesystem/utils/TestUtils.java | 12 +++-- .../openstack/nova/NovaAsyncClient.java | 37 ++++++++++++--- .../openstack/nova/NovaPropertiesBuilder.java | 4 +- .../nova/config/NovaRestClientModule.java | 2 - .../openstack/nova/domain/Address.java | 3 +- .../jclouds/openstack/nova/domain/Image.java | 4 +- .../functions/FlavorToHardwareTest.java | 19 +++++--- .../nova/domain/ServerStatusTest.java | 13 ++--- .../openstack/nova/domain/ServerTest.java | 4 +- .../ParseAddressesFromJsonResponseTest.java | 25 +++++----- .../ParseFaultFromJsonResponseTest.java | 17 +++---- .../ParseFlavorFromJsonResponseTest.java | 21 +++++---- .../ParseFlavorListFromJsonResponseTest.java | 21 +++++---- .../ParseImageFromJsonResponseTest.java | 15 ++++-- .../ParseImageListFromJsonResponseTest.java | 19 +++++--- ...seInetAddressListFromJsonResponseTest.java | 21 +++++---- ...rseSecurityGroupsListFromJsonResponse.java | 2 +- .../nova/options/CreateServerOptionsTest.java | 22 +++++---- .../nova/options/ListOptionsTest.java | 12 +++-- .../options/RebuildServerOptionsTest.java | 18 +++---- .../BindSecurityGroupRuleToJsonPayload.java | 2 +- .../compute/loaders/FindKeyPairOrCreate.java | 11 +++-- .../openstack/nova/v1_1/domain/Server.java | 2 +- .../v1_1/domain/zonescoped/ZoneAndName.java | 2 +- .../v1_1/options/CreateServerOptions.java | 4 +- .../v1_1/predicates/KeyPairPredicates.java | 5 +- .../NovaComputeServiceAdapterExpectTest.java | 2 +- .../options/NovaTemplateOptionsTest.java | 8 +++- .../CreateSecurityGroupIfNeededTest.java | 2 +- .../v1_1/parse/ParseCreatedServerTest.java | 2 +- .../nova/v1_1/parse/ParseImageTest.java | 2 +- .../nova/v1_1/parse/ParseServerTest.java | 2 +- .../ParseServerWithInternetAddressesTest.java | 2 +- ...kShouldRerouteToPublicBlockExpectTest.java | 2 +- .../java/org/jclouds/s3/S3AsyncClient.java | 2 +- .../main/java/org/jclouds/s3/S3Client.java | 8 ++-- .../java/org/jclouds/s3/S3ContextBuilder.java | 4 +- .../s3/binders/BindACLToXMLPayload.java | 4 +- .../BindBucketLoggingToXmlPayload.java | 6 +-- .../s3/binders/BindPayerToXmlPayload.java | 2 +- .../s3/blobstore/S3AsyncBlobStore.java | 4 +- .../org/jclouds/s3/blobstore/S3BlobStore.java | 4 +- .../s3/blobstore/functions/BlobToObject.java | 2 +- .../functions/BlobToObjectMetadata.java | 2 - .../functions/BucketToResourceList.java | 2 +- .../functions/BucketToResourceMetadata.java | 2 +- .../ContainerToBucketListOptions.java | 2 +- .../functions/LocationFromBucketLocation.java | 4 +- .../functions/ObjectToBlobMetadata.java | 2 +- .../org/jclouds/s3/config/S3ObjectModule.java | 2 +- .../java/org/jclouds/s3/domain/S3Object.java | 3 +- .../s3/domain/internal/S3ObjectImpl.java | 4 +- .../s3/filters/RequestAuthorizeSignature.java | 2 +- .../ParseObjectFromHeadersAndHttpContent.java | 4 +- .../jclouds/s3/options/PutBucketOptions.java | 2 +- .../jclouds/s3/options/PutObjectOptions.java | 1 - .../s3/xml/AccessControlListHandler.java | 2 +- .../jclouds/s3/xml/BucketLoggingHandler.java | 2 +- .../org/jclouds/s3/xml/CopyObjectHandler.java | 4 +- .../s3/xml/ListAllMyBucketsHandler.java | 4 +- .../java/org/jclouds/s3/xml/PayerHandler.java | 2 +- .../java/org/jclouds/s3/S3ClientLiveTest.java | 10 ++-- .../BindBucketLoggingToXmlPayloadTest.java | 6 +-- .../BucketToContainerListOptions.java | 2 +- .../functions/ResourceToBucketList.java | 8 ++-- .../ParseObjectMetadataFromHeadersTest.java | 2 +- .../ParseS3ErrorFromXmlContentTest.java | 6 +-- .../s3/internal/StubS3AsyncClient.java | 8 ++-- .../s3/xml/AccessControlListHandlerTest.java | 6 +-- .../s3/xml/BucketLoggingHandlerTest.java | 2 +- .../jclouds/s3/xml/CopyObjectHandlerTest.java | 4 +- .../org/jclouds/s3/xml/PayerHandlerTest.java | 2 +- .../openstack/swift/domain/SwiftObject.java | 3 +- .../functions/ReturnTrueOn404FalseOn409.java | 1 - .../functions/ResourceToObjectList.java | 1 - ...rseObjectInfoListFromJsonResponseTest.java | 4 +- .../ParseObjectInfoFromHeadersTest.java | 5 +- .../ParseSwiftErrorFromHttpResponseTest.java | 7 ++- .../binders/BindCatalogItemToXmlPayload.java | 2 +- .../binders/BindParamsToXmlPayload.java | 2 +- ...IntoNameThenCustomizeDeployAndPowerOn.java | 2 +- .../strategy/VCloudComputeServiceAdapter.java | 2 +- .../vcloud/config/VCloudRestClientModule.java | 2 +- .../org/jclouds/vcloud/domain/Catalog.java | 1 - .../vcloud/domain/NetworkConnection.java | 1 - .../java/org/jclouds/vcloud/domain/Org.java | 1 - .../java/org/jclouds/vcloud/domain/Task.java | 1 - .../jclouds/vcloud/domain/VAppTemplate.java | 1 - .../jclouds/vcloud/domain/VCloudError.java | 1 - .../java/org/jclouds/vcloud/domain/VDC.java | 1 - .../java/org/jclouds/vcloud/domain/Vm.java | 1 - .../vcloud/domain/internal/CatalogImpl.java | 1 - .../domain/internal/CatalogItemImpl.java | 1 - .../vcloud/domain/internal/ErrorImpl.java | 1 - .../vcloud/domain/internal/OrgImpl.java | 3 +- .../vcloud/domain/internal/TaskImpl.java | 1 - .../vcloud/domain/internal/VAppImpl.java | 1 - .../domain/internal/VAppTemplateImpl.java | 1 - .../vcloud/domain/internal/VDCImpl.java | 1 - .../vcloud/domain/internal/VmImpl.java | 1 - .../domain/network/FirewallService.java | 1 - .../vcloud/domain/network/NatService.java | 1 - .../vcloud/domain/network/OrgNetwork.java | 1 - .../network/internal/OrgNetworkImpl.java | 1 - .../network/nat/rules/OneToOneVmRule.java | 1 - .../domain/network/nat/rules/VmRule.java | 1 - .../ovf/VCloudOperatingSystemSection.java | 1 - .../vcloud/features/CatalogAsyncClient.java | 2 +- .../vcloud/features/CatalogClient.java | 3 +- .../vcloud/features/NetworkAsyncClient.java | 2 +- .../vcloud/features/NetworkClient.java | 3 +- .../vcloud/features/OrgAsyncClient.java | 2 +- .../jclouds/vcloud/features/OrgClient.java | 3 +- .../vcloud/features/TaskAsyncClient.java | 2 +- .../vcloud/features/VAppAsyncClient.java | 2 +- .../jclouds/vcloud/features/VAppClient.java | 3 +- .../features/VAppTemplateAsyncClient.java | 2 +- .../vcloud/features/VAppTemplateClient.java | 3 +- .../vcloud/features/VDCAsyncClient.java | 2 +- .../OrgNameAndCatalogNameToEndpoint.java | 2 +- .../OrgNameAndVDCNameToEndpoint.java | 2 +- .../location/OrgAndVDCToLocationSupplier.java | 2 +- .../vcloud/options/CaptureVAppOptions.java | 2 +- .../BindCloneVAppParamsToXmlPayloadTest.java | 6 +-- ...oneVAppTemplateParamsToXmlPayloadTest.java | 6 +-- .../filters/SetVCloudTokenCookieTest.java | 1 - .../internal/VCloudLoginAsyncClientTest.java | 1 - ...MatchingConfigurationKeyOrDefaultTest.java | 2 +- ...loudOperatingSystemSectionHandlerTest.java | 1 - ...loudVirtualHardwareSectionHandlerTest.java | 2 +- .../org/jclouds/blobstore/AsyncBlobStore.java | 3 +- .../java/org/jclouds/blobstore/BlobStore.java | 3 +- .../blobstore/BlobStoreContextFactory.java | 1 - .../blobstore/TransientAsyncBlobStore.java | 6 +-- .../TransientBlobStorePropertiesBuilder.java | 2 +- .../org/jclouds/blobstore/domain/Blob.java | 3 +- .../blobstore/domain/BlobMetadata.java | 3 +- .../blobstore/domain/MutableBlobMetadata.java | 3 +- .../domain/internal/BlobMetadataImpl.java | 3 +- .../domain/internal/PageSetImpl.java | 3 +- .../domain/internal/StorageMetadataImpl.java | 3 +- .../internal/DeleteAllKeysInList.java | 2 +- .../strategy/internal/FetchBlobMetadata.java | 2 +- .../MarkersDeleteDirectoryStrategy.java | 2 +- .../internal/PutBlobsStrategyImpl.java | 2 +- ...arseBlobFromHeadersAndHttpContentTest.java | 4 +- .../BaseBlobStoreIntegrationTest.java | 2 +- .../blobstore/options/ListOptionsTest.java | 2 +- .../blobstore/util/BlobStoreUtilsTest.java | 6 +-- .../jclouds/aws/filters/FormSignerTest.java | 2 +- .../AWSClientErrorRetryHandlerTest.java | 6 +-- .../ParseAWSErrorFromXmlContentTest.java | 6 +-- .../org/jclouds/aws/util/AWSUtilsTest.java | 4 +- .../SharedKeyLiteAuthenticationTest.java | 2 +- .../ParseAzureErrorFromXmlContentTest.java | 6 +-- .../filters/AddTimestampQueryTest.java | 1 - .../options/BaseListOptionsTest.java | 1 - .../TerremarkVCloudAsyncClient.java | 2 +- .../vcloud_0_8/TerremarkVCloudClient.java | 3 +- ...antiateVAppTemplateParamsToXmlPayload.java | 2 +- .../BindVAppConfigurationToXmlPayload.java | 2 +- .../compute/TerremarkVCloudComputeClient.java | 2 +- .../ImageForVCloudExpressVAppTemplate.java | 1 - .../TerremarkVCloudRestClientModule.java | 4 +- .../trmk/vcloud_0_8/domain/Catalog.java | 1 - .../jclouds/trmk/vcloud_0_8/domain/Org.java | 1 - .../jclouds/trmk/vcloud_0_8/domain/Task.java | 1 - .../jclouds/trmk/vcloud_0_8/domain/VApp.java | 3 +- .../trmk/vcloud_0_8/domain/VCloudError.java | 1 - .../jclouds/trmk/vcloud_0_8/domain/VDC.java | 1 - .../domain/internal/CatalogImpl.java | 1 - .../vcloud_0_8/domain/internal/ErrorImpl.java | 4 +- .../domain/internal/NetworkImpl.java | 2 +- .../vcloud_0_8/domain/internal/OrgImpl.java | 5 +- .../vcloud_0_8/domain/internal/TaskImpl.java | 4 +- .../domain/internal/VAppTemplateImpl.java | 1 - .../vcloud_0_8/domain/internal/VDCImpl.java | 5 +- .../location/OrgAndVDCToLocationSupplier.java | 2 +- .../vcloud_0_8/options/CloneVAppOptions.java | 3 +- .../InstantiateVAppTemplateOptions.java | 1 - .../vcloud_0_8/xml/IpAddressesHandler.java | 2 +- .../vcloud_0_8/TerremarkClientLiveTest.java | 4 +- ...indAddInternetServiceToXmlPayloadTest.java | 1 - .../BindAddNodeServiceToXmlPayloadTest.java | 1 - .../BindCloneVAppParamsToXmlPayloadTest.java | 6 +-- .../TerremarkVCloudComputeClientTest.java | 6 +-- .../strategy/CleanupOrphanKeysTest.java | 8 ++-- ...yPairUnlessUserSpecifiedOtherwiseTest.java | 6 +-- .../compute/strategy/DeleteKeyPairTest.java | 6 +-- .../filters/SetVCloudTokenCookieTest.java | 1 - .../ParseLoginResponseFromHeadersTest.java | 1 - ...remarkVCloudErrorFromHttpResponseTest.java | 1 - .../AddInternetServiceOptionsTest.java | 1 - .../options/AddNodeOptionsTest.java | 1 - ...MatchingConfigurationKeyOrDefaultTest.java | 3 +- .../xml/CatalogItemHandlerTest.java | 3 +- .../CustomizationParametersHandlerTest.java | 1 - .../vcloud_0_8/xml/DataCenterHandlerTest.java | 1 - .../xml/DataCentersHandlerTest.java | 1 - .../xml/InternetServiceHandlerTest.java | 1 - .../xml/InternetServicesHandlerTest.java | 1 - .../xml/IpAddressesHandlerTest.java | 1 - .../xml/KeyPairByNameHandlerTest.java | 5 +- .../trmk/vcloud_0_8/xml/KeysHandlerTest.java | 1 - .../xml/NetworkExtendedInfoHandlerTest.java | 1 - .../trmk/vcloud_0_8/xml/NodeHandlerTest.java | 1 - .../trmk/vcloud_0_8/xml/NodesHandlerTest.java | 1 - .../vcloud_0_8/xml/OrgListHandlerTest.java | 1 - .../xml/PublicIpAddressHandlerTest.java | 1 - .../xml/PublicIpAddressesHandlerTest.java | 1 - .../xml/SupportedVersionsHandlerTest.java | 1 - .../trmk/vcloud_0_8/xml/VAppHandlerTest.java | 3 +- .../xml/VAppTemplateHandlerTest.java | 1 - .../vcloud_0_8/xml/ovf/VAppHandlerTest.java | 2 +- .../compute/ComputeServiceContextFactory.java | 1 - .../compute/RunScriptOnNodesException.java | 3 +- .../main/java/org/jclouds/compute/Utils.java | 3 +- .../callables/RunScriptOnNodeUsingSsh.java | 2 +- .../config/BindComputeStrategiesByClass.java | 2 +- .../compute/config/ResolvesImages.java | 6 +-- .../compute/domain/CIMOperatingSystem.java | 3 +- .../compute/domain/ComputeMetadata.java | 3 +- .../jclouds/compute/domain/NodeMetadata.java | 1 + .../compute/domain/NodeMetadataBuilder.java | 3 +- .../org/jclouds/compute/domain/Volume.java | 3 +- .../jclouds/compute/domain/VolumeBuilder.java | 3 +- .../compute/domain/internal/HardwareImpl.java | 3 +- .../domain/internal/NodeMetadataImpl.java | 3 +- .../compute/domain/internal/TemplateImpl.java | 2 +- .../compute/domain/internal/VolumeImpl.java | 3 +- .../internal/PersistNodeCredentials.java | 2 +- .../jclouds/compute/internal/UtilsImpl.java | 2 +- .../compute/predicates/ImagePredicates.java | 3 +- .../config/StubComputeServiceAdapter.java | 4 +- .../compute/util/ComputeServiceUtils.java | 2 +- .../jclouds/ovf/OperatingSystemSection.java | 3 +- .../org/jclouds/ovf/xml/EnvelopeHandler.java | 2 +- .../ovf/xml/NetworkSectionHandler.java | 1 - ...ourceAllocationSettingDataHandlerTest.java | 1 - .../VirtualSystemSettingDataHandlerTest.java | 2 +- .../StubComputeServiceIntegrationTest.java | 4 +- .../config/ComputeServicePropertiesTest.java | 1 - ...esAndStoreCredentialsOrReturnNullTest.java | 6 +-- .../config/PersistNodeCredentialsTest.java | 6 +-- ...sFromImageOrOverridingCredentialsTest.java | 6 +-- .../RetryIfSocketNotYetOpenTest.java | 5 +- ...PrioritizeCredentialsFromTemplateTest.java | 6 +-- .../ReturnCredentialsBoundToImageTest.java | 6 +-- .../concurrent/DynamicThreadPoolExecutor.java | 10 +++- .../org/jclouds/concurrent/MoreExecutors.java | 2 +- .../org/jclouds/crypto/CryptoStreams.java | 22 +++++---- .../main/java/org/jclouds/crypto/Pems.java | 3 +- .../java/org/jclouds/crypto/Sha512Crypt.java | 3 +- .../main/java/org/jclouds/crypto/SshKeys.java | 2 +- .../internal/SimpleDateFormatDateService.java | 4 +- .../java/org/jclouds/domain/Credentials.java | 2 +- .../jclouds/domain/internal/LocationImpl.java | 3 +- .../domain/internal/ResourceMetadataImpl.java | 3 +- .../encryption/internal/JCECrypto.java | 3 +- .../ExceptionToValueOrPropagate.java | 1 - .../org/jclouds/functions/JoinOnComma.java | 2 +- .../java/org/jclouds/functions/JoinOnK2.java | 2 +- .../java/org/jclouds/http/HttpMessage.java | 3 +- .../java/org/jclouds/http/HttpResponse.java | 3 +- .../jclouds/http/HttpResponseException.java | 3 +- .../jclouds/http/annotation/ClientError.java | 12 +++-- .../jclouds/http/annotation/Redirection.java | 12 +++-- .../jclouds/http/annotation/ServerError.java | 12 +++-- .../http/functions/ReturnFalseOn404.java | 1 - .../http/functions/ReturnTrueOn404.java | 1 - .../BaseHttpCommandExecutorService.java | 32 +++++++------ .../http/internal/PayloadEnclosingImpl.java | 3 +- .../org/jclouds/http/utils/ModifyRequest.java | 26 +++++----- .../jclouds/io/ContentMetadataBuilder.java | 3 +- .../main/java/org/jclouds/io/Payloads.java | 3 +- .../payloads/BaseMutableContentMetadata.java | 3 +- .../java/org/jclouds/io/payloads/Part.java | 2 +- .../io/payloads/UrlEncodedFormPayload.java | 2 +- .../org/jclouds/json/config/GsonModule.java | 2 +- .../EnumTypeAdapterThatReturnsFromValue.java | 2 +- .../location/functions/ZoneToEndpoint.java | 3 +- .../all/RegionToProviderOrJustProvider.java | 2 +- .../ZoneToRegionToProviderOrJustProvider.java | 2 +- ...tionIdToIso3166CodesFromConfiguration.java | 2 +- .../RegionIdToZoneIdsFromConfiguration.java | 2 +- .../logging/config/ConsoleLoggingModule.java | 2 +- .../org/jclouds/predicates/Validator.java | 4 +- .../jclouds/providers/ProviderPredicates.java | 4 +- .../java/org/jclouds/providers/Providers.java | 4 +- .../main/java/org/jclouds/rest/Providers.java | 3 +- .../src/main/java/org/jclouds/rest/Utils.java | 6 +-- .../jclouds/rest/annotations/QueryParams.java | 3 +- .../jclouds/rest/annotations/VirtualHost.java | 2 +- .../rest/internal/GeneratedHttpRequest.java | 3 +- .../org/jclouds/rest/internal/UtilsImpl.java | 6 +-- .../rest/suppliers/URIFromStringSupplier.java | 2 +- .../org/jclouds/util/ClassLoadingUtils.java | 1 + .../org/jclouds/util/CredentialUtils.java | 3 +- .../java/org/jclouds/util/Multimaps2.java | 2 +- .../main/java/org/jclouds/util/Patterns.java | 2 +- .../org/jclouds/xml/internal/JAXBParser.java | 1 + .../org/jclouds/concurrent/FuturesTest.java | 6 +-- .../RetryOnTimeOutExceptionFunctionTest.java | 6 +-- .../RetryOnTimeOutExceptionSupplierTest.java | 6 +-- .../config/ExecutorServiceModuleTest.java | 6 +-- .../java/org/jclouds/crypto/SshKeysTest.java | 2 +- .../org/jclouds/date/DateServiceTest.java | 1 - .../jclouds/date/internal/DateUtilsTest.java | 4 +- .../SimpleDateFormatDateServiceTest.java | 4 +- .../jclouds/functions/CacheLearningTest.java | 2 +- .../jclouds/functions/JoinOnCommaTest.java | 1 - .../http/BaseHttpErrorHandlerTest.java | 6 +-- .../jclouds/http/functions/ParseSaxTest.java | 6 +-- ...eURIFromListOrLocationHeaderIf20xTest.java | 6 +-- .../http/functions/ReturnStringIf200Test.java | 6 +-- .../handlers/BaseHttpErrorHandlerTest.java | 6 +-- .../handlers/RedirectionRetryHandlerTest.java | 6 +-- .../jclouds/http/utils/ModifyRequestTest.java | 24 +++++----- .../io/payloads/MultipartFormTest.java | 4 +- .../NullHackJsonLiteralAdapterTest.java | 1 - .../lifecycle/config/LifeCycleModuleTest.java | 5 +- ...166CodesByLocationIdViaPropertiesTest.java | 1 - .../implicit/OnlyLocationOrFirstZoneTest.java | 1 - .../org/jclouds/logging/BufferLogger.java | 2 - .../BindLoggersAnnotatedWithResourceTest.java | 2 +- .../jclouds/predicates/RetryablesTest.java | 7 ++- .../JcloudsTestBlobStoreProviderMetadata.java | 4 +- .../JcloudsTestComputeProviderMetadata.java | 4 +- ...TestYetAnotherComputeProviderMetadata.java | 4 +- .../org/jclouds/providers/ProvidersTest.java | 4 +- .../rest/BaseRestClientExpectTest.java | 2 +- .../org/jclouds/rest/BaseRestClientTest.java | 2 +- .../rest/binders/BindToXMLPayloadTest.java | 2 +- .../MapHttp4xxCodesToExceptionsTest.java | 6 +-- .../java/org/jclouds/util/Strings2Test.java | 7 +-- .../gae/ConvertToJcloudsResponseTest.java | 4 +- .../date/joda/JodaDateServiceTest.java | 2 +- .../log4j/config/Log4JLoggingModuleTest.java | 2 +- .../java/org/jclouds/sshj/SshjSshClient.java | 2 +- ...scribeLoadBalancerResponseHandlerTest.java | 4 +- .../org/jclouds/glesys/GleSYSAsyncClient.java | 6 ++- .../java/org/jclouds/glesys/GleSYSClient.java | 12 +++-- .../glesys/GleSYSPropertiesBuilder.java | 4 +- .../glesys/GleSYSProviderMetadata.java | 4 +- .../compute/functions/OSTemplateToImage.java | 2 +- .../domain/ArchiveAllowedArguments.java | 8 ++-- .../java/org/jclouds/glesys/domain/Cost.java | 4 +- .../org/jclouds/glesys/domain/Domain.java | 4 +- .../jclouds/glesys/domain/EmailAccount.java | 4 +- .../jclouds/glesys/domain/EmailOverview.java | 4 +- .../org/jclouds/glesys/domain/IpDetails.java | 7 +-- .../org/jclouds/glesys/domain/Server.java | 4 +- .../glesys/features/ArchiveAsyncClient.java | 14 ++++-- .../glesys/features/ArchiveClient.java | 6 +-- .../glesys/features/DomainAsyncClient.java | 18 +++---- .../jclouds/glesys/features/DomainClient.java | 8 ++-- .../glesys/features/EmailAsyncClient.java | 2 +- .../glesys/features/IpAsyncClient.java | 15 ++++-- .../org/jclouds/glesys/features/IpClient.java | 6 +-- .../glesys/features/ServerAsyncClient.java | 2 +- .../jclouds/glesys/features/ServerClient.java | 2 +- .../functions/internal/GlesysDateAdapter.java | 2 +- .../features/ArchiveClientExpectTest.java | 17 ++++--- .../glesys/features/IpClientExpectTest.java | 21 +++++---- .../features/ServerClientExpectTest.java | 37 +++++++++++---- .../glesys/features/ServerClientLiveTest.java | 4 +- .../glesys/parse/ParseFullIpDetailsTest.java | 9 ++-- .../parse/ParseIpAddressFromResponseTest.java | 18 +++---- .../servers/OpSourceServersAsyncClient.java | 1 + .../servers/OpSourceServersClient.java | 1 + .../OpSourceServersContextBuilder.java | 2 +- .../v1_5/domain/CaptureVAppParams.java | 1 + .../v1_5/domain/InstantiationParams.java | 1 + .../director/v1_5/domain/References.java | 1 + .../director/v1_5/domain/VAppTemplate.java | 1 + .../v1_5/domain/cim/CimAnySimpleType.java | 2 +- .../director/v1_5/domain/cim/CimBoolean.java | 2 +- .../v1_5/domain/cim/CimReference.java | 2 +- .../v1_5/domain/cim/CimUnsignedInt.java | 2 - .../v1_5/domain/cim/CimUnsignedLong.java | 3 +- .../v1_5/domain/cim/package-info.java | 2 +- .../domain/ovf/OperatingSystemSection.java | 1 - .../director/v1_5/domain/ovf/SectionType.java | 8 ---- .../domain/ovf/environment/SectionType.java | 1 - .../domain/ovf/environment/package-info.java | 2 +- .../v1_5/domain/query/package-info.java | 2 +- .../v1_5/features/AdminOrgClient.java | 1 + .../v1_5/features/AdminQueryClient.java | 2 +- .../v1_5/features/QueryAsyncClient.java | 1 + .../director/v1_5/features/QueryClient.java | 4 ++ .../v1_5/predicates/ReferencePredicates.java | 1 + .../v1_5/NonClientOperationsLiveTest.java | 1 - .../features/AbstractVAppClientLiveTest.java | 4 +- .../features/AdminQueryClientExpectTest.java | 1 - .../v1_5/features/CatalogClientLiveTest.java | 19 +++++++- .../v1_5/features/OrgClientLiveTest.java | 2 +- .../v1_5/features/QueryClientExpectTest.java | 1 - .../features/VAppTemplateClientLiveTest.java | 2 +- .../functions/IMachineToNodeMetadata.java | 3 +- .../virtualbox/functions/NodeCreator.java | 1 - .../admin/StartJettyIfNotAlreadyRunning.java | 5 -- .../functions/CreateAndInstallVmLiveTest.java | 1 - .../loadbalancer/LoadBalancerService.java | 3 +- .../LoadBalancerServiceAdapter.java | 3 +- .../LoadBalancerServiceContextFactory.java | 1 - .../internal/BaseLoadBalancerService.java | 2 +- .../aws/ec2/AWSEC2ProviderMetadata.java | 4 +- .../BindTagFiltersToIndexedFormParams.java | 3 +- .../binders/BindTagsToIndexedFormParams.java | 3 +- .../ec2/compute/AWSEC2TemplateOptions.java | 1 - .../AWSEC2ComputeServiceContextModule.java | 2 +- .../suppliers/AWSEC2HardwareSupplier.java | 2 +- .../suppliers/AWSEC2ImageSupplier.java | 2 +- .../ec2/compute/suppliers/CallForImages.java | 2 +- .../aws/ec2/domain/LaunchSpecification.java | 3 +- .../java/org/jclouds/aws/ec2/domain/Tag.java | 2 +- .../aws/ec2/services/AWSAMIAsyncClient.java | 2 +- .../aws/ec2/services/AWSAMIClient.java | 3 +- .../ec2/services/AWSInstanceAsyncClient.java | 2 +- .../aws/ec2/services/AWSInstanceClient.java | 3 +- .../ec2/services/AWSKeyPairAsyncClient.java | 2 +- .../aws/ec2/services/AWSKeyPairClient.java | 3 +- .../services/AWSSecurityGroupAsyncClient.java | 2 +- .../ec2/services/AWSSecurityGroupClient.java | 3 +- .../ec2/services/MonitoringAsyncClient.java | 2 +- .../aws/ec2/services/MonitoringClient.java | 5 +- .../services/PlacementGroupAsyncClient.java | 2 +- .../ec2/services/PlacementGroupClient.java | 3 +- .../ec2/services/SpotInstanceAsyncClient.java | 2 +- .../aws/ec2/services/SpotInstanceClient.java | 3 +- .../aws/ec2/services/TagAsyncClient.java | 3 +- .../jclouds/aws/ec2/xml/TagSetHandler.java | 3 +- .../jclouds/aws/ec2/AWSEC2ProviderTest.java | 1 - ...BindTagFiltersToIndexedFormParamsTest.java | 2 +- .../BindTagsToIndexedFormParamsTest.java | 2 +- .../AWSEC2TemplateBuilderLiveTest.java | 27 ++++++----- ...AWSEC2ComputeServiceContextModuleTest.java | 4 +- .../AWSRunningInstanceToNodeMetadataTest.java | 2 +- .../strategy/AWSEC2ImageParserTest.java | 25 +++++----- .../strategy/AWSEC2ReviseParsedImageTest.java | 11 +++-- .../ImportOrReturnExistingKeypairTest.java | 6 +-- .../aws/ec2/services/AMIClientLiveTest.java | 2 +- .../ec2/services/AWSAMIClientLiveTest.java | 2 +- ...ibePlacementGroupsResponseHandlerTest.java | 5 +- ...dInstancesOfferingResponseHandlerTest.java | 4 +- .../ec2/xml/MonitoringStateHandlerTest.java | 1 - .../aws/ec2/xml/ProductCodesHandlerTest.java | 1 - .../org/jclouds/aws/s3/AWSS3AsyncClient.java | 6 +-- .../java/org/jclouds/aws/s3/AWSS3Client.java | 2 - .../jclouds/aws/s3/AWSS3ProviderMetadata.java | 4 +- .../aws/s3/blobstore/AWSS3AsyncBlobStore.java | 13 +++-- .../aws/s3/blobstore/AWSS3BlobStore.java | 11 ++--- .../config/AWSS3BlobStoreContextModule.java | 1 - .../AsyncMultipartUploadStrategy.java | 2 +- .../strategy/MultipartUploadStrategy.java | 2 +- .../SequentialMultipartUploadStrategy.java | 1 - .../jclouds/aws/s3/AWSS3ClientExpectTest.java | 11 +++-- .../jclouds/aws/s3/AWSS3ClientLiveTest.java | 3 +- ...SequentialMultipartUploadStrategyTest.java | 6 +-- .../internal/BaseAWSS3ClientExpectTest.java | 11 +++-- .../azureblob/AzureBlobProviderMetadata.java | 4 +- .../jclouds/azureblob/domain/AzureBlob.java | 3 +- .../domain/internal/BlobPropertiesImpl.java | 3 +- .../internal/HashSetListBlobsResponse.java | 2 +- .../AccountNameEnumerationResultsHandler.java | 4 +- ...ParseAzureBlobErrorFromXmlContentTest.java | 6 +-- .../config/AzureBlobStoreModuleTest.java | 2 +- .../ContainerNameValidatorTest.java | 1 - ...ountNameEnumerationResultsHandlerTest.java | 4 +- .../BluelockVCloudZone01ContextBuilder.java | 2 +- ...BluelockVCloudZone01PropertiesBuilder.java | 3 +- .../BluelockVCloudZone01ProviderMetadata.java | 4 +- .../CloudFilesUSProviderMetadata.java | 4 +- .../CloudLoadBalancersUKProviderTest.java | 1 - .../CloudLoadBalancersUSProviderTest.java | 1 - .../CloudOneStorageProviderMetadata.java | 4 +- .../CloudServersUSProviderMetadata.java | 4 +- .../CloudSigmaLasVegasProviderMetadata.java | 4 +- .../CloudSigmaZurichProviderMetadata.java | 4 +- ...loudSigmaZurichComputeServiceLiveTest.java | 16 +++---- ...HostsPeer1LosAngelesPropertiesBuilder.java | 6 ++- ...cHostsPeer1LosAngelesProviderMetadata.java | 7 +-- ...eer1LosAngelesTemplateBuilderLiveTest.java | 15 +++--- ...HostsBlueSquareLondonProviderMetadata.java | 4 +- ...asticHostsPeer1LondonProviderMetadata.java | 4 +- ...cHostsPeer1SanAntonioProviderMetadata.java | 4 +- ...ticHostsPeer1TorontoPropertiesBuilder.java | 6 ++- ...sticHostsPeer1TorontoProviderMetadata.java | 7 +-- ...tsPeer1TorontoTemplateBuilderLiveTest.java | 15 +++--- ...lyptusPartnerCloudEC2ProviderMetadata.java | 4 +- ...alyptusPartnerCloudS3ProviderMetadata.java | 4 +- ...Go2CloudJohannesburg1ProviderMetadata.java | 4 +- .../gogrid/GoGridProviderMetadata.java | 4 +- .../gogrid/GoGridResponseException.java | 8 ++-- .../org/jclouds/gogrid/domain/IpState.java | 4 +- .../jclouds/gogrid/domain/JobProperties.java | 4 +- .../gogrid/domain/LoadBalancerState.java | 4 +- .../org/jclouds/gogrid/domain/ObjectType.java | 4 +- .../options/AddLoadBalancerOptions.java | 8 ++-- .../gogrid/GoGridLiveTestDisabled.java | 2 - .../functions/ServerToNodeMetadataTest.java | 6 +-- .../options/GoGridTemplateOptionsTest.java | 2 +- .../ServerLatestJobCompletedTest.java | 4 +- ...ouseDataElementVCloudProviderMetadata.java | 4 +- .../compute/HPCloudComputeServiceAdapter.java | 4 +- .../HPCloudObjectStorageContextBuilder.java | 1 + .../HPCloudObjectStorageProviderMetadata.java | 4 +- ...udObjectStorageBlobStoreContextModule.java | 3 +- .../internal/KeystoneFixture.java | 17 +++---- .../NinefoldComputeProviderMetadata.java | 4 +- .../NinefoldStorageProviderMetadata.java | 4 +- .../OpenHostingEast1ProviderMetadata.java | 4 +- .../miro/RimuHostingProviderMetadata.java | 4 +- .../rimuhosting/miro/data/CreateOptions.java | 3 +- .../rimuhosting/miro/data/NewServerData.java | 6 +-- .../rimuhosting/miro/domain/BillingData.java | 4 +- .../rimuhosting/miro/domain/IpAddresses.java | 4 +- .../miro/domain/NewServerResponse.java | 3 +- .../rimuhosting/miro/domain/PricingPlan.java | 3 +- .../rimuhosting/miro/domain/ResizeResult.java | 4 +- .../rimuhosting/miro/domain/Server.java | 3 +- .../rimuhosting/miro/domain/ServerInfo.java | 3 +- .../miro/domain/ServerParameters.java | 3 +- .../location/RimuHostingLocationSupplier.java | 2 +- .../ServerloveManchesterProviderMetadata.java | 4 +- .../SkaliCloudMalaysiaProviderMetadata.java | 4 +- .../jclouds/slicehost/xml/SliceHandler.java | 3 +- .../softlayer/SoftLayerProviderMetadata.java | 4 +- .../softlayer/binders/ProductOrderToJson.java | 20 ++++---- .../functions/DatacenterToLocation.java | 2 +- .../compute/functions/ProductItems.java | 9 ++-- .../org/jclouds/softlayer/domain/Address.java | 2 +- .../jclouds/softlayer/domain/Datacenter.java | 6 +-- .../softlayer/domain/OperatingSystem.java | 6 +-- .../jclouds/softlayer/domain/ProductItem.java | 9 ++-- .../softlayer/domain/ProductItemPrice.java | 9 ++-- .../softlayer/domain/ProductPackage.java | 6 +-- .../softlayer/domain/VirtualGuest.java | 6 +-- .../features/AccountAsyncClient.java | 14 +++--- .../softlayer/features/AccountClient.java | 6 +-- .../features/ProductPackageAsyncClient.java | 13 ++--- .../features/VirtualGuestClient.java | 6 +-- .../predicates/ProductItemPredicates.java | 9 ++-- .../predicates/ProductPackagePredicates.java | 5 +- .../binders/ProductOrderToJsonTest.java | 11 +++-- .../functions/ProductItemToImageTest.java | 21 ++++++--- .../compute/functions/ProductItemsTest.java | 16 ++++--- .../functions/ProductItemsToHardwareTest.java | 21 +++++---- .../VirtualGuestToNodeMetadataTest.java | 2 +- .../features/AccountAsyncClientTest.java | 7 +-- .../features/AccountClientLiveTest.java | 8 ++-- .../features/VirtualGuestClientLiveTest.java | 2 +- .../handlers/SoftLayerErrorHandlerTest.java | 7 ++- .../parse/ParseVirtualGuestPausedTest.java | 15 ++++-- .../ProductPackagePredicatesTest.java | 5 +- ...tratoGenVCloudMyCloudProviderMetadata.java | 4 +- .../SynapticStorageProviderMetadata.java | 4 +- .../ecloud/TerremarkECloudAsyncClient.java | 2 +- .../trmk/ecloud/TerremarkECloudClient.java | 3 +- .../TerremarkECloudProviderMetadata.java | 4 +- .../DataCenterOperationsAsyncClient.java | 6 ++- .../features/TagOperationsAsyncClient.java | 6 ++- ...rnetServiceAndPublicIpAddressSupplier.java | 2 +- .../ecloud/TerremarkECloudClientLiveTest.java | 2 +- .../ecloud/TerremarkECloudProviderTest.java | 1 - .../DataCenterOperationsAsyncClientTest.java | 1 - .../TagOperationsAsyncClientTest.java | 1 - .../xml/TagNameToUsageCountHandlerTest.java | 1 - .../TerremarkVCloudExpressAsyncClient.java | 2 +- ...erremarkVCloudExpressProviderMetadata.java | 4 +- .../TerremarkVCloudExpressProviderTest.java | 1 - .../nova/TryStackNovaContextBuilder.java | 2 +- .../nova/TryStackNovaServiceAdapter.java | 4 +- .../functions/CredentialsFromAdminAccess.java | 3 +- .../statements/login/Sudoers.java | 2 +- .../statements/login/UserAdd.java | 2 +- .../org/jclouds/scriptbuilder/util/Utils.java | 2 +- .../jclouds/scriptbuilder/EnvBuilderTest.java | 1 - .../domain/CreateRunScriptTest.java | 2 +- .../scriptbuilder/domain/ShellTokenTest.java | 2 - .../domain/StatementListTest.java | 4 +- .../statements/ssh/SshStatementsTest.java | 1 - 936 files changed, 2766 insertions(+), 2488 deletions(-) diff --git a/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java b/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java index 28c450f573..c68bf43b3c 100644 --- a/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java +++ b/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; diff --git a/antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java b/antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java index 17757a37a9..4cbfe86eb8 100644 --- a/antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java index 6338fff02b..5f1f772933 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/functions/ObjectToBlobMetadata.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/domain/AtmosObject.java b/apis/atmos/src/main/java/org/jclouds/atmos/domain/AtmosObject.java index c200ba213c..f2c0745829 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/domain/AtmosObject.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/domain/BoundedSet.java b/apis/atmos/src/main/java/org/jclouds/atmos/domain/BoundedSet.java index b9ce32f4a4..8a791e6d16 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/domain/BoundedSet.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/BoundedLinkedHashSet.java b/apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/BoundedLinkedHashSet.java index c3d9dd1a13..7d5838cad5 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/BoundedLinkedHashSet.java +++ b/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; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ReturnEndpointIfAlreadyExists.java b/apis/atmos/src/main/java/org/jclouds/atmos/functions/ReturnEndpointIfAlreadyExists.java index a3205b6b27..0fe81361d1 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/functions/ReturnEndpointIfAlreadyExists.java +++ b/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; diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/config/AtmosBlobStoreModuleTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/config/AtmosBlobStoreModuleTest.java index 971dc6ea82..7c87d6eeb9 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/config/AtmosBlobStoreModuleTest.java +++ b/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; diff --git a/apis/byon/src/main/java/org/jclouds/byon/config/CacheNodeStoreModule.java b/apis/byon/src/main/java/org/jclouds/byon/config/CacheNodeStoreModule.java index 12ea397d3e..4aa00e2d9c 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/config/CacheNodeStoreModule.java +++ b/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; diff --git a/apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java b/apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java index 3f61d70927..5a253555a1 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/config/YamlNodeStoreModule.java +++ b/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; diff --git a/apis/byon/src/test/java/org/jclouds/byon/config/CacheNodeStoreModuleTest.java b/apis/byon/src/test/java/org/jclouds/byon/config/CacheNodeStoreModuleTest.java index a59d08a051..fd746e4dac 100644 --- a/apis/byon/src/test/java/org/jclouds/byon/config/CacheNodeStoreModuleTest.java +++ b/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; diff --git a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseCdnUriFromHeaders.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseCdnUriFromHeaders.java index 529f877a65..e49f4739f3 100644 --- a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseCdnUriFromHeaders.java +++ b/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; diff --git a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java index 042c44219b..b53a4144e6 100644 --- a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/functions/ParseContainerCDNMetadataFromHeaders.java +++ b/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; diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/LB.java b/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/LB.java index 658a2134e5..213eea8d48 100644 --- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/functions/LB.java +++ b/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; diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/NodeClientLiveTest.java b/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/NodeClientLiveTest.java index 5a905a3689..e722442f85 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/features/NodeClientLiveTest.java +++ b/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; diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java b/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java index 521aa3a0ef..0fc4fb0bff 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java +++ b/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; diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java b/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java index 95b1e0d848..b6fc178223 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java +++ b/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; diff --git a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/options/ListOptionsTest.java b/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/options/ListOptionsTest.java index 97489d6293..bd91e252b1 100644 --- a/apis/cloudloadbalancers/src/test/java/org/jclouds/cloudloadbalancers/options/ListOptionsTest.java +++ b/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; diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersContextBuilder.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersContextBuilder.java index c3e941ac49..9c322927d5 100644 --- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersContextBuilder.java +++ b/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; diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindBackupScheduleToJsonPayload.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindBackupScheduleToJsonPayload.java index 46b076f64e..03b7ee2982 100644 --- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/binders/BindBackupScheduleToJsonPayload.java +++ b/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; diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/FlavorToHardware.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/FlavorToHardware.java index 4b70a8765c..f4f4a13dd8 100644 --- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/functions/FlavorToHardware.java +++ b/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; diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptions.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptions.java index d6bec1b39d..9091fb1e26 100644 --- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptions.java +++ b/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; diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerActive.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerActive.java index 458ffdbbe3..9c73e6b42f 100644 --- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerActive.java +++ b/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; diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerDeleted.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerDeleted.java index 7d4ff28896..47fd4b2565 100644 --- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/predicates/ServerDeleted.java +++ b/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; diff --git a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaTemplateBuilderImpl.java b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaTemplateBuilderImpl.java index 57a31f2d05..0a5cb5f86c 100644 --- a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/CloudSigmaTemplateBuilderImpl.java +++ b/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 javax.inject.Named; -import javax.inject.Provider; -import java.util.Set; +import com.google.common.base.Supplier; /** * @author Andrei Savu diff --git a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextStringTest.java b/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextStringTest.java index 750267356a..e040fee83c 100644 --- a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/binders/BindCloneDriveOptionsToPlainTextStringTest.java +++ b/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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import java.io.IOException; import java.util.List; diff --git a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandlerTest.java b/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandlerTest.java index 0267afce59..ac5a46a3bd 100644 --- a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandlerTest.java +++ b/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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.verify; import java.net.URI; diff --git a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/options/CloneDriveOptionsTest.java b/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/options/CloneDriveOptionsTest.java index d8f733bedf..1b58cd9b49 100644 --- a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/options/CloneDriveOptionsTest.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackClient.java index fc153e06a3..969ef8c96c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackClient.java +++ b/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. *

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackGlobalAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackGlobalAsyncClient.java index 521251719c..3c7d9a39ba 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackGlobalAsyncClient.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackPropertiesBuilder.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackPropertiesBuilder.java index 26113807e0..a271e36510 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackPropertiesBuilder.java +++ b/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 static org.jclouds.Constants.PROPERTY_ENDPOINT; +import org.jclouds.PropertiesBuilder; /** * Builds properties used in cloudstack Clients diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java index 9e06beb905..1e9ab1c6ac 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindIdListToCommaDelimitedQueryParam.java +++ b/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 com.google.common.collect.Iterables; -import org.jclouds.http.HttpRequest; -import org.jclouds.http.utils.ModifyRequest; -import org.jclouds.rest.Binder; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; 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 static com.google.common.base.Preconditions.checkNotNull; +import org.jclouds.http.HttpRequest; +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 diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java index 4b84f614b3..d107b6210b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindSnapshotPolicyScheduleToQueryParam.java +++ b/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 org.jclouds.http.HttpRequest; -import org.jclouds.http.utils.ModifyRequest; -import org.jclouds.rest.Binder; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; 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 static com.google.common.base.Preconditions.checkNotNull; +import org.jclouds.cloudstack.domain.SnapshotPolicySchedule; +import org.jclouds.http.HttpRequest; +import org.jclouds.http.utils.ModifyRequest; +import org.jclouds.rest.Binder; /** * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java index 0fe99a40a9..db265ce7a9 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/binders/BindTemplateMetadataToQueryParams.java +++ b/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 org.jclouds.http.HttpRequest; -import org.jclouds.http.utils.ModifyRequest; -import org.jclouds.rest.Binder; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Inject; import javax.inject.Provider; import javax.ws.rs.core.UriBuilder; -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; +import org.jclouds.cloudstack.domain.TemplateMetadata; +import org.jclouds.http.HttpRequest; +import org.jclouds.http.utils.ModifyRequest; +import org.jclouds.rest.Binder; /** * @author Richard Downer diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java index 8166526b33..98906dbdf3 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadata.java +++ b/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 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.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; -import com.google.common.util.concurrent.UncheckedExecutionException; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.collect.Iterables.filter; +import static com.google.common.collect.Iterables.transform; +import static com.google.common.collect.Sets.newHashSet; +import static org.jclouds.compute.util.ComputeServiceUtils.parseGroupFromName; +import static org.jclouds.util.InetAddresses2.isPrivateIPAddress; + +import java.util.Map; +import java.util.Set; + +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 javax.inject.Inject; -import javax.inject.Singleton; -import java.util.Map; -import java.util.Set; - -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.collect.Iterables.filter; -import static com.google.common.collect.Iterables.transform; -import static com.google.common.collect.Sets.newHashSet; -import static org.jclouds.compute.util.ComputeServiceUtils.parseGroupFromName; -import static org.jclouds.util.InetAddresses2.isPrivateIPAddress; +import com.google.common.base.Function; +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.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.util.concurrent.UncheckedExecutionException; /** * @author Adrian Cole, Andrei Savu diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java index d8aa4d2a03..15cf65672d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java +++ b/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. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/BasicNetworkOptionsConverter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/BasicNetworkOptionsConverter.java index 072de8a5b0..e14c049d5f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/BasicNetworkOptionsConverter.java +++ b/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. * 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 34d29c9c5b..4ace1b5a87 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 @@ -18,14 +18,22 @@ */ package org.jclouds.cloudstack.compute.strategy; -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.ImmutableSet.Builder; -import com.google.common.collect.Sets; -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; + +import java.util.List; +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 javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Singleton; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ExecutionException; - -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; +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.ImmutableSet.Builder; +import com.google.common.collect.Sets; +import com.google.common.primitives.Ints; /** * defines the connection between the {@link CloudStackClient} implementation diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/OptionsConverter.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/OptionsConverter.java index bbd0cf5e18..dbd30da725 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/OptionsConverter.java +++ b/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 diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java index 81a2ecdff1..d962601dd2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java index 2f9a6b0d8c..a674727131 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java +++ b/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 * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java index 794cfa02b5..cd3714775c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java +++ b/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. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java index baf5fe6f3c..a8375b96b7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java +++ b/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 diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java index 43d81a3996..b5bf126503 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOfferingAvailabilityType.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOfferingAvailabilityType.java index 07a6a48818..8de9036edc 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOfferingAvailabilityType.java +++ b/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 diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java index b5405ecc87..18d865a01c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java index dc16d6d430..4301f172ea 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java index a080e13356..44f5f26462 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java index fc7234c1f4..70dbf8e68c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java +++ b/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 com.google.gson.annotations.SerializedName; +import static com.google.common.base.Preconditions.checkNotNull; 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 diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SystemVmType.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SystemVmType.java index c503483d0d..c3f4730a93 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SystemVmType.java +++ b/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 */ diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java index d1968cc84e..68a9d84f03 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java +++ b/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; /** diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java index 4b1f08633e..4cfd865fdf 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java +++ b/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 */ diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java index 8eebb63462..71eb70902c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountAsyncClient.java index 2990634ab0..de8d94bf0f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountAsyncClient.java +++ b/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 javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to CloudStack Account features available to Domain diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncClient.java index c2567a8632..2d38b33739 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainAsyncClient.java +++ b/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 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; /** * Provides asynchronous access to CloudStack Domain features available to Domain diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainClient.java index a2ae7ca5cc..329a9e574c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainClient.java +++ b/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. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncClient.java index 6803b2b473..b4a8eb107b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserAsyncClient.java +++ b/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 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; /** * Provides asynchronous access to CloudStack User features available to Domain diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserClient.java index 3c4f01bdfd..227c4c10fd 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserClient.java +++ b/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. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java index a9201deecb..15a529f551 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventAsyncClient.java +++ b/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. *

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClient.java index 6153248b8d..d5488af9b7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClient.java +++ b/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 javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; -import java.util.Set; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to CloudStack Account features available to Global diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertClient.java index 69a0197aa4..629d00ee64 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertClient.java +++ b/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. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClient.java index 523d130116..4d44603592 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClient.java +++ b/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 javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; -import java.util.Set; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to CloudStack Account features available to Global diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityClient.java index dade9ad535..75127a95b4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityClient.java +++ b/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. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncClient.java index 8e7de2a46a..5e059ad8de 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationAsyncClient.java +++ b/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 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; /** * Provides asynchronous access to CloudStack Configuration features available to Global diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationClient.java index 1b03c439a2..ae03bfed2b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationClient.java +++ b/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. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncClient.java index eb6dbbfe6f..bb5ac3e186 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainAsyncClient.java +++ b/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 javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to CloudStack Domain features available to Global diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainClient.java index 9dd9099f43..1d31b5ab4b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainClient.java +++ b/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. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncClient.java index 6814a23ac7..2cbd2a666d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostAsyncClient.java +++ b/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 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; /** * Provides asynchronous access to cloudstack via their REST API. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostClient.java index 7345263990..1b09d8f778 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostClient.java +++ b/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. *

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingClient.java index 01c643048b..f3598a5e6a 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingClient.java +++ b/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. *

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncClient.java index 5aef4f2dfc..a635dd03f0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodAsyncClient.java +++ b/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 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; /** * Provides asynchronous access to CloudStack Pod features available to Global diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodClient.java index fa8ac1a64b..9de12d792e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodClient.java +++ b/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. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClient.java index 07868fb546..4d066f720d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClient.java +++ b/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 javax.ws.rs.GET; -import javax.ws.rs.core.MediaType; -import java.util.Set; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to CloudStack storage pool features. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolClient.java index 6a7e48970b..70b7e973f3 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolClient.java +++ b/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. *

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncClient.java index ac68dc40a2..ad0f449867 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageAsyncClient.java +++ b/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 javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import java.util.Date; -import java.util.Set; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to CloudStack usage features. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageClient.java index 2736732a7f..e7da353465 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageClient.java +++ b/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. *

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncClient.java index cb0d234d85..005dd4e203 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserAsyncClient.java +++ b/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 javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to CloudStack User features available to Global diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncClient.java index e4f7803237..e7fced4ef8 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanAsyncClient.java +++ b/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 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; /** * Provides asynchronous access to cloudstack via their REST API. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanClient.java index 3ac3f51820..65f1e8fcc0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanClient.java +++ b/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. *

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncClient.java index 9a7fdd453d..81f28ce696 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneAsyncClient.java +++ b/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 javax.ws.rs.GET; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to CloudStack Account features available to Global diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneClient.java index b3b2bf9de6..db65cace0c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneClient.java +++ b/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. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java index 04c14bd4ba..f912c3acbe 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClient.java +++ b/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 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; /** * Provides asynchronous access to CloudStack SSHKeyPair features. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java index 9a8be7c3af..5823eb3b9c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotAsyncClient.java +++ b/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 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; /** * Provides synchronous access to CloudStack Snapshot features. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java index cdd68c3844..a45136b568 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupAsyncClient.java +++ b/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 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 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 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. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java index cf9263bc14..88d29fae30 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java +++ b/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. *

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java index d44b694dd9..a1693c6664 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineAsyncClient.java +++ b/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 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; /** * Provides asynchronous access to cloudstack via their REST API. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java index 3414ee062b..66de6de9b1 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java +++ b/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. *

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncClient.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncClient.java index 85165f3c6b..166ff808d5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeAsyncClient.java +++ b/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. *

diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java index 1e8573f595..4f8f0bd3b8 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/QuerySigner.java +++ b/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 com.google.common.base.Joiner; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSortedSet; -import com.google.common.collect.Multimap; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.util.Map.Entry; + +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 javax.inject.Inject; -import javax.inject.Named; -import javax.inject.Provider; -import javax.inject.Singleton; -import javax.ws.rs.core.UriBuilder; -import java.util.Map.Entry; - -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSortedSet; +import com.google.common.collect.Multimap; /** * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/ReEncodeQueryWithDefaultURLEncoder.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/ReEncodeQueryWithDefaultURLEncoder.java index 06058535a2..c4dd18e893 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/ReEncodeQueryWithDefaultURLEncoder.java +++ b/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 com.google.inject.Inject; -import com.google.inject.Provider; +import static com.google.common.collect.Iterables.getOnlyElement; + +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 static com.google.common.collect.Iterables.getOnlyElement; +import com.google.common.collect.Multimap; +import com.google.inject.Inject; +import com.google.inject.Provider; /** * By default, jclouds controls encoding based on rules which are different diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/DateToYyyyMmDd.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/DateToYyyyMmDd.java index a92d2b02ec..1d4af9b8ca 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/DateToYyyyMmDd.java +++ b/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 static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.Function; /** * Convert a Date object into a "yyyy-MM-dd" String diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/LoginWithPasswordCredentials.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/LoginWithPasswordCredentials.java index 5909404008..2f91ec5976 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/LoginWithPasswordCredentials.java +++ b/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 javax.inject.Singleton; -import java.io.File; +import com.google.common.base.Function; @Singleton public class LoginWithPasswordCredentials implements Function { diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java index 5b0a949dd4..1b20f5221f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseEventTypesFromHttpResponse.java +++ b/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 diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java index 557a2764ad..107e7d86ef 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java +++ b/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 com.google.common.base.Splitter; -import com.google.inject.Inject; -import com.google.inject.TypeLiteral; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.collect.Iterables.get; +import static com.google.common.collect.Iterables.getOnlyElement; + 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 static com.google.common.collect.Iterables.get; -import static com.google.common.collect.Iterables.getOnlyElement; +import com.google.common.base.Function; +import com.google.common.base.Splitter; +import com.google.inject.Inject; +import com.google.inject.TypeLiteral; /** * @author Andrei Savu diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java index b140ad8223..7f1ba7d325 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseTypedAsyncJob.java +++ b/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; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedData.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedData.java index eb618740c6..732a74c507 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/WindowsLoginCredentialsFromEncryptedData.java +++ b/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 com.google.common.base.Throwables; -import com.google.inject.Inject; -import com.google.inject.Singleton; +import java.nio.charset.Charset; +import java.security.KeyFactory; +import java.security.PrivateKey; +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 java.nio.charset.Charset; -import java.security.KeyFactory; -import java.security.PrivateKey; -import java.security.spec.KeySpec; +import com.google.common.base.Function; +import com.google.common.base.Throwables; +import com.google.inject.Inject; +import com.google.inject.Singleton; /** * Given an encrypted Windows Administrator password and the decryption key, return a LoginCredentials instance. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ZoneIdToZone.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ZoneIdToZone.java index 8ee174f15f..d798bfb5b0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ZoneIdToZone.java +++ b/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 com.google.inject.Inject; +import static com.google.common.base.Preconditions.checkNotNull; + 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. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java index b62930d37d..d9cfcd64b5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java +++ b/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 com.google.common.io.Closeables; +import java.io.IOException; + +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 javax.inject.Singleton; -import java.io.IOException; +import com.google.common.base.Throwables; +import com.google.common.io.Closeables; /** * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java index b90a8273a2..599caf979b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnClose.java +++ b/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 com.google.inject.Inject; -import com.google.inject.Singleton; +import static org.jclouds.http.HttpUtils.releasePayload; + +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 javax.annotation.Resource; - -import static org.jclouds.http.HttpUtils.releasePayload; +import com.google.common.cache.LoadingCache; +import com.google.inject.Inject; +import com.google.inject.Singleton; /** * This will parse and set an appropriate exception on the command object. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddClusterOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddClusterOptions.java index 9abad4f4f7..639a0d17dd 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddClusterOptions.java +++ b/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 * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddHostOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddHostOptions.java index 20650f7881..7c3c73833b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddHostOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddHostOptions.java @@ -18,12 +18,13 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; +import java.util.Set; + import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.http.options.BaseHttpRequestOptions; -import java.util.Set; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableSet; /** * Options to the GlobalHostClient.addHost() API call diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptions.java index cfe8d5b146..17358dbb8e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options for the GlobalHostClient.addSecondaryStorage() API call * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateAccountOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateAccountOptions.java index 10d05941d4..1444a499f4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateAccountOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateAccountOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Optional fields for account creation * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptions.java index 806efa2dd7..444be67c5d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptions.java @@ -18,10 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; - import java.util.Set; +import com.google.common.collect.ImmutableSet; + /** * Options to control how disk offerings are created * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateDomainOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateDomainOptions.java index 9012402b5b..62a58092d7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateDomainOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateDomainOptions.java @@ -18,11 +18,9 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * Options used to control how a domain is created diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateFirewallRuleOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateFirewallRuleOptions.java index 00b37bd525..0d27e80a99 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateFirewallRuleOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateFirewallRuleOptions.java @@ -18,11 +18,12 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; +import java.util.Set; + import org.jclouds.http.options.BaseHttpRequestOptions; -import java.util.Set; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableSet; /** * Options used to control how a firewall rule is created diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateLoadBalancerRuleOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateLoadBalancerRuleOptions.java index c1a0049b13..9a6a156d81 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateLoadBalancerRuleOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateLoadBalancerRuleOptions.java @@ -18,11 +18,11 @@ */ package org.jclouds.cloudstack.options; +import java.util.Set; + import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; -import java.util.Set; - /** * Options used to control what load balancer rules are returned * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreatePodOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreatePodOptions.java index 08db00fb2c..e001b865d5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreatePodOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreatePodOptions.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 GlobalPodClient.createPod API call. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptions.java index c724c30331..ee7b5c5ff3 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptions.java @@ -18,11 +18,12 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; +import java.util.Set; + import org.jclouds.cloudstack.domain.StorageType; import org.jclouds.cloudstack.domain.SystemVmType; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * Options to control how service offerings are created diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java index f7f34075c6..8298ecef31 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateTemplateOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options used to control how a template is created. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateUserOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateUserOptions.java index d407ebcbfa..91831babf0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateUserOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateUserOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Optional fields for user creation * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java index 031d1b70d7..0aa7f5fdf6 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options used to control options for creating a VM group * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateZoneOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateZoneOptions.java index 9db7c5086b..486432b330 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateZoneOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateZoneOptions.java @@ -18,11 +18,12 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.http.options.BaseHttpRequestOptions; import org.jclouds.javax.annotation.Nullable; +import com.google.common.collect.ImmutableSet; + /** * Options used to control how a zone is created * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteHostOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteHostOptions.java index f8d3a12edf..357c627d63 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteHostOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteHostOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options to the GlobalHostClient.deleteHost() API call * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java index 21061bb3af..c0cfb86ced 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteISOOptions.java @@ -36,9 +36,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options for the ISO deleteISO method. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java index 4236d916a2..7adaec65d0 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeleteTemplateOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options used to control how a template is created. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java index 4742afcff0..acc2371d17 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java @@ -21,6 +21,8 @@ package org.jclouds.cloudstack.options; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Map; + import org.jclouds.encryption.internal.Base64; import com.google.common.base.Function; @@ -29,8 +31,6 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import java.util.Map; - /** * Options used to control what disk offerings are returned * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java index a0b8de2da9..8bedbabb6c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractISOOptions.java @@ -36,9 +36,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options for the ISO extractISO method. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java index 53d0000fb0..63206f09eb 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ExtractTemplateOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * @author Richard Downer */ diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptions.java index 58e01e434e..c9a1865b07 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options to the GlobalUsageClient.generateUsageOptions() API call * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAlertsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAlertsOptions.java index bee1bc4eb1..0afe8a0ca7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAlertsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListAlertsOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options to the listAlerts command. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListCapacityOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListCapacityOptions.java index b3a8827c00..83d560b3c7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListCapacityOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListCapacityOptions.java @@ -18,10 +18,11 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.Capacity; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options to the listCapacity command. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListClustersOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListClustersOptions.java index 35c12e3f4e..71e6ec64b5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListClustersOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListClustersOptions.java @@ -18,12 +18,13 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.cloudstack.domain.Cluster; import org.jclouds.cloudstack.domain.Host; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options used to control what cluster information is returned * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListConfigurationEntriesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListConfigurationEntriesOptions.java index 1f585ae529..ca9620296f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListConfigurationEntriesOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListConfigurationEntriesOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options used to control what configuration entries are returned * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDomainChildrenOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDomainChildrenOptions.java index 1adcea6a7b..994a055958 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDomainChildrenOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDomainChildrenOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options used to control what domain children are returned * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDomainsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDomainsOptions.java index 3b987df6ad..1313d6d0e9 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDomainsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListDomainsOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options used to control what domains are returned * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java index 770213ea78..c86288fc6d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java @@ -20,9 +20,10 @@ package org.jclouds.cloudstack.options; import java.util.Date; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options used to control what events are returned * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java index cabb8aabbe..29e92f1618 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java @@ -36,12 +36,12 @@ */ package org.jclouds.cloudstack.options; +import java.util.Set; + import org.jclouds.cloudstack.domain.ISO; import com.google.common.collect.ImmutableSet; -import java.util.Set; - /** * Options for the ISO listISOs method. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPodsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPodsOptions.java index 4bd746f1a7..8915f8ee2f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPodsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPodsOptions.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 GlobalPodClient.listPods API call. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java index cf1685a4db..0ebcb733ac 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java @@ -19,9 +19,10 @@ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * @author Vijay Kiran */ diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java index 11d32e62f0..d998a4e7c9 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java @@ -36,9 +36,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.Snapshot; +import com.google.common.collect.ImmutableSet; + /** * Options for the Snapshot listSnapshots method. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListStoragePoolsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListStoragePoolsOptions.java index a8657e10e7..70c058ed62 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListStoragePoolsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListStoragePoolsOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options to the GlobalStoragePools[Async]Client.listStoragePools API call * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListUsersOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListUsersOptions.java index 503c2a764c..2122259091 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListUsersOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListUsersOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.User; +import com.google.common.collect.ImmutableSet; + /** * Options used to control what user information is returned * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java index 59e8f05841..17bca84a70 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.Volume; +import com.google.common.collect.ImmutableSet; + /** * Options used to control what volume * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateAccountOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateAccountOptions.java index cde893b9b4..84f9884a9f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateAccountOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateAccountOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Optional arguments for updating an Account * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateClusterOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateClusterOptions.java index ef09aa8114..aee8bbbedf 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateClusterOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateClusterOptions.java @@ -18,12 +18,13 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.cloudstack.domain.Cluster; import org.jclouds.cloudstack.domain.Host; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options for the GlobalHostClient.updateCluster() API call. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateDomainOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateDomainOptions.java index d7d972f460..0dacb090c6 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateDomainOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateDomainOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options used to control how a domain is created * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateHostOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateHostOptions.java index 997a12aa48..8aec16bff4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateHostOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateHostOptions.java @@ -18,12 +18,13 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; +import java.util.Set; + import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.http.options.BaseHttpRequestOptions; -import java.util.Set; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableSet; /** * Options to the GlobalHostClient.addHost() API call diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java index 397c5f4e9e..ced93568dc 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOOptions.java @@ -36,9 +36,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options for the ISO updateISO method. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java index f1d85593cd..330af8b303 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateISOPermissionsOptions.java @@ -18,11 +18,12 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.PermissionOperation; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableSet; + /** * Options for the ISO updateISOPermissions method. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateLoadBalancerRuleOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateLoadBalancerRuleOptions.java index e2613e1a53..511e0933e7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateLoadBalancerRuleOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateLoadBalancerRuleOptions.java @@ -18,12 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.LoadBalancerRule; import org.jclouds.http.options.BaseHttpRequestOptions; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * Options used to control how a load balancer rule is updated diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptions.java index 152ba64e03..6f5989fdba 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateNetworkOfferingOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType; +import com.google.common.collect.ImmutableSet; + /** * Options to control how network offerings are created * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdatePodOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdatePodOptions.java index ea33124d76..e79506a77e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdatePodOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdatePodOptions.java @@ -18,11 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.http.options.BaseHttpRequestOptions; -import javax.annotation.concurrent.Immutable; +import com.google.common.collect.ImmutableSet; /** * Options to the GlobalPodClient.updatePod API call. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java index b350f1d32c..94ed82e021 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplateOptions.java @@ -18,10 +18,11 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.domain.Template; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options used to control how a template should be updated. * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateUserOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateUserOptions.java index 8397c576b6..b64ff30e07 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateUserOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateUserOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Optional arguments for updating an User * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java index 055fdb38ca..c938309fae 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateVMGroupOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; import org.jclouds.http.options.BaseHttpRequestOptions; +import com.google.common.collect.ImmutableSet; + /** * Options used to control updates to VMGroups * diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateZoneOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateZoneOptions.java index e287df7432..34c537c0b5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateZoneOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateZoneOptions.java @@ -18,13 +18,14 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; -import org.jclouds.cloudstack.domain.AllocationState; -import org.jclouds.http.options.BaseHttpRequestOptions; +import static com.google.common.base.Preconditions.checkArgument; import java.util.List; -import static com.google.common.base.Preconditions.checkArgument; +import org.jclouds.cloudstack.domain.AllocationState; +import org.jclouds.http.options.BaseHttpRequestOptions; + +import com.google.common.collect.ImmutableSet; /** * Options used to control how a zone is updated diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java index 9f69f02190..e5c9233498 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/NetworkPredicates.java @@ -20,6 +20,8 @@ package org.jclouds.cloudstack.predicates; import static com.google.common.base.Preconditions.checkNotNull; +import javax.annotation.Nullable; + import org.jclouds.cloudstack.domain.GuestIPType; import org.jclouds.cloudstack.domain.Network; import org.jclouds.cloudstack.domain.NetworkService; @@ -28,8 +30,6 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; -import javax.annotation.Nullable; - /** * * @author Adrian Cole diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java index fd4540835b..d0ec431978 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/suppliers/ZoneIdToZoneSupplier.java @@ -18,17 +18,19 @@ */ package org.jclouds.cloudstack.suppliers; +import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; + +import java.util.concurrent.TimeUnit; + +import javax.inject.Named; + +import org.jclouds.cloudstack.domain.Zone; + import com.google.common.base.Supplier; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.inject.Inject; -import org.jclouds.cloudstack.domain.Zone; - -import javax.inject.Named; -import java.util.concurrent.TimeUnit; - -import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL; /** * Supplies a cache that maps from zone IDs to zones. diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/util/ApiKeyPairs.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/util/ApiKeyPairs.java index d2033fd86d..4e9ee91773 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/util/ApiKeyPairs.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/util/ApiKeyPairs.java @@ -18,8 +18,13 @@ */ package org.jclouds.cloudstack.util; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.net.URI; +import java.util.NoSuchElementException; +import java.util.Properties; +import java.util.Set; + import org.jclouds.Constants; import org.jclouds.cloudstack.CloudStackClient; import org.jclouds.cloudstack.domain.Account; @@ -29,12 +34,8 @@ import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.ComputeServiceContextFactory; import org.jclouds.rest.RestContextFactory; -import java.net.URI; -import java.util.NoSuchElementException; -import java.util.Properties; -import java.util.Set; - -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Module; /** * @author Andrei Savu 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 47837c3d0f..d4d0916d4b 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/PasswordAuthenticationExpectTest.java @@ -24,6 +24,7 @@ import java.net.URI; import java.net.URLEncoder; import java.util.Properties; +import org.jclouds.cloudstack.config.CloudStackProperties; import org.jclouds.cloudstack.features.AccountClient; import org.jclouds.cloudstack.features.BaseCloudStackRestClientExpectTest; import org.jclouds.http.HttpRequest; diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java index 923fb916b2..c99cb8bdfe 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java @@ -18,6 +18,21 @@ */ package org.jclouds.cloudstack.compute; +import static com.google.common.collect.Iterables.concat; +import static com.google.common.collect.Iterables.get; +import static com.google.common.collect.Iterables.getOnlyElement; +import static com.google.common.collect.Sets.newTreeSet; +import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.vlan; +import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.specifyVLAN; +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions; import org.jclouds.cloudstack.domain.EncryptedPasswordAndPrivateKey; import org.jclouds.cloudstack.domain.Network; @@ -34,21 +49,6 @@ import org.jclouds.crypto.Crypto; import org.jclouds.encryption.bouncycastle.BouncyCastleCrypto; import org.testng.annotations.Test; -import java.net.URI; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - -import static com.google.common.collect.Iterables.concat; -import static com.google.common.collect.Iterables.get; -import static com.google.common.collect.Iterables.getOnlyElement; -import static com.google.common.collect.Sets.newTreeSet; -import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.vlan; -import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.specifyVLAN; -import static org.testng.Assert.assertEquals; - /** * @author Adrian Cole */ diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java index 25fb7baade..3508b5ac35 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/functions/VirtualMachineToNodeMetadataTest.java @@ -18,12 +18,11 @@ */ package org.jclouds.cloudstack.compute.functions; -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.collect.ImmutableSet; -import com.google.common.collect.Iterables; +import static org.testng.Assert.assertEquals; + +import java.net.UnknownHostException; +import java.util.Set; + import org.jclouds.cloudstack.compute.functions.VirtualMachineToNodeMetadata.FindImageForVirtualMachine; import org.jclouds.cloudstack.compute.functions.VirtualMachineToNodeMetadata.FindLocationForVirtualMachine; import org.jclouds.cloudstack.domain.GuestIPType; @@ -43,10 +42,12 @@ import org.jclouds.domain.Location; import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; -import java.net.UnknownHostException; -import java.util.Set; - -import static org.testng.Assert.assertEquals; +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.collect.ImmutableSet; +import com.google.common.collect.Iterables; /** * @author Adrian Cole, Andrei Savu diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java index 8d49b67b3f..33ce9c3b6b 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java @@ -30,13 +30,13 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import java.util.Map; + import org.jclouds.compute.options.TemplateOptions; import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableSet; import org.testng.collections.Maps; -import java.util.Map; +import com.google.common.collect.ImmutableSet; /** * Tests possible uses of {@code CloudStackTemplateOptions} and diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java index af11e90524..6ceb93795a 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java @@ -18,19 +18,20 @@ */ package org.jclouds.cloudstack.compute.strategy; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.util.Collections; +import java.util.Map; + import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions; import org.jclouds.cloudstack.domain.Network; import org.jclouds.cloudstack.domain.NetworkService; import org.jclouds.cloudstack.options.DeployVirtualMachineOptions; import org.testng.annotations.Test; -import java.util.Collections; -import java.util.Map; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; @Test(singleThreaded = true, testName="OptionsConverterTest") public class OptionsConverterTest { diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java index 1004b68714..ecc7e4ce68 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/domain/VirtualMachineTest.java @@ -18,12 +18,12 @@ */ package org.jclouds.cloudstack.domain; -import org.testng.annotations.Test; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.testng.annotations.Test; + /** * Tests for the VirtualMachine class. * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobClientLiveTest.java index fbc99e7c37..86f7c7d59b 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobClientLiveTest.java @@ -18,13 +18,13 @@ */ package org.jclouds.cloudstack.features; -import static org.jclouds.cloudstack.domain.AsyncJob.ResultCode; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.util.Set; import org.jclouds.cloudstack.domain.AsyncJob; +import org.jclouds.cloudstack.domain.AsyncJob.ResultCode; import org.testng.annotations.Test; /** diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackRestClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackRestClientExpectTest.java index be8fccfbaa..706767cdb3 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackRestClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/BaseCloudStackRestClientExpectTest.java @@ -18,10 +18,12 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; +import static org.jclouds.crypto.CryptoStreams.md5Hex; + +import java.net.URI; +import java.net.URLEncoder; +import java.util.Properties; + import org.jclouds.cloudstack.CloudStackContext; import org.jclouds.compute.ComputeServiceContextFactory; import org.jclouds.http.HttpRequest; @@ -29,11 +31,10 @@ import org.jclouds.http.HttpResponse; import org.jclouds.logging.config.NullLoggingModule; import org.jclouds.rest.BaseRestClientExpectTest; -import java.net.URI; -import java.net.URLEncoder; -import java.util.Properties; - -import static org.jclouds.crypto.CryptoStreams.md5Hex; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Module; /** * Base class for writing CloudStack Rest Client Expect tests diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainAccountClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainAccountClientLiveTest.java index 7b36052c1b..81b954ddf9 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainAccountClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainAccountClientLiveTest.java @@ -18,16 +18,16 @@ */ package org.jclouds.cloudstack.features; -import org.jclouds.cloudstack.domain.Account; -import org.jclouds.cloudstack.domain.AsyncCreateResponse; -import org.jclouds.cloudstack.domain.AsyncJob; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.features.GlobalAccountClientLiveTest.createTestAccount; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import org.jclouds.cloudstack.domain.Account; +import org.jclouds.cloudstack.domain.AsyncCreateResponse; +import org.jclouds.cloudstack.domain.AsyncJob; +import org.testng.annotations.Test; + /** * Tests behavior of {@code DomainAccountClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainDomainClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainDomainClientExpectTest.java index f47d03e03d..9b7179ae8c 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainDomainClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainDomainClientExpectTest.java @@ -18,24 +18,20 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; +import static org.jclouds.cloudstack.options.ListDomainChildrenOptions.Builder.parentDomainId; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; + +import java.net.URI; + import org.jclouds.cloudstack.CloudStackContext; -import org.jclouds.cloudstack.domain.Account; import org.jclouds.cloudstack.domain.Domain; -import org.jclouds.cloudstack.domain.User; -import org.jclouds.cloudstack.options.ListDomainChildrenOptions; -import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.testng.annotations.Test; -import java.net.URI; -import java.util.Set; - -import static org.jclouds.cloudstack.options.ListDomainChildrenOptions.Builder.parentDomainId; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; /** * Test the CloudStack DomainDomainClient diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainDomainClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainDomainClientLiveTest.java index 7a68cdd0dc..cf7aedcb1a 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainDomainClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainDomainClientLiveTest.java @@ -18,19 +18,21 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.base.Predicate; -import org.jclouds.cloudstack.domain.Domain; -import org.testng.annotations.Test; - -import javax.annotation.Nullable; -import java.util.Set; - import static com.google.common.collect.Iterables.find; import static org.jclouds.cloudstack.options.ListDomainChildrenOptions.Builder.parentDomainId; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; +import java.util.Set; + +import javax.annotation.Nullable; + +import org.jclouds.cloudstack.domain.Domain; +import org.testng.annotations.Test; + +import com.google.common.base.Predicate; + /** * Tests behavior of {@code DomainDomainClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainUserAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainUserAsyncClientTest.java index 93d0b759d0..da177e64be 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainUserAsyncClientTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainUserAsyncClientTest.java @@ -18,10 +18,11 @@ */ package org.jclouds.cloudstack.features; -import com.google.inject.TypeLiteral; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; +import com.google.inject.TypeLiteral; + /** * Tests behavior of {@code DomainUserAsyncClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainUserClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainUserClientLiveTest.java index 86ce8e10d9..110f0a9434 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainUserClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/DomainUserClientLiveTest.java @@ -18,20 +18,20 @@ */ package org.jclouds.cloudstack.features; -import org.jclouds.cloudstack.domain.Account; -import org.jclouds.cloudstack.domain.AsyncCreateResponse; -import org.jclouds.cloudstack.domain.AsyncJob; -import org.jclouds.cloudstack.domain.User; -import org.testng.annotations.Test; - -import java.util.Set; - import static org.jclouds.cloudstack.features.GlobalAccountClientLiveTest.createTestAccount; import static org.jclouds.cloudstack.features.GlobalUserClientLiveTest.createTestUser; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.util.Set; + +import org.jclouds.cloudstack.domain.Account; +import org.jclouds.cloudstack.domain.AsyncCreateResponse; +import org.jclouds.cloudstack.domain.AsyncJob; +import org.jclouds.cloudstack.domain.User; +import org.testng.annotations.Test; + /** * Tests behavior of {@code DomainUserClient} */ diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventAsyncClientTest.java index a616fab1ba..a63672a3b9 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventAsyncClientTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/EventAsyncClientTest.java @@ -21,7 +21,6 @@ package org.jclouds.cloudstack.features; import java.io.IOException; import java.lang.reflect.Method; -import com.google.inject.TypeLiteral; import org.jclouds.cloudstack.functions.ParseEventTypesFromHttpResponse; import org.jclouds.cloudstack.options.ListEventsOptions; import org.jclouds.http.HttpRequest; @@ -30,6 +29,8 @@ import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; +import com.google.inject.TypeLiteral; + /** * Tests behavior of {@code EventAsyncClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallClientLiveTest.java index 83e1d4888d..e25fbee915 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/FirewallClientLiveTest.java @@ -26,7 +26,8 @@ import static org.testng.Assert.assertTrue; import java.util.NoSuchElementException; import java.util.Set; -import com.google.common.base.Predicates; +import javax.annotation.Nullable; + import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.FirewallRule; import org.jclouds.cloudstack.domain.Network; @@ -41,8 +42,7 @@ import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; import com.google.common.base.Predicate; - -import javax.annotation.Nullable; +import com.google.common.base.Predicates; /** * Tests behavior of {@code FirewallClientLiveTest} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAccountAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAccountAsyncClientTest.java index b1464935d2..3b17b72c1a 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAccountAsyncClientTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAccountAsyncClientTest.java @@ -18,6 +18,8 @@ */ package org.jclouds.cloudstack.features; +import java.lang.reflect.Method; + import org.jclouds.cloudstack.domain.Account; import org.jclouds.cloudstack.options.CreateAccountOptions; import org.jclouds.cloudstack.options.UpdateAccountOptions; @@ -30,8 +32,6 @@ import org.testng.annotations.Test; import com.google.inject.TypeLiteral; -import java.lang.reflect.Method; - /** * Tests behavior of {@code GlobalAccountAsyncClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAccountClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAccountClientLiveTest.java index 78b35d5ba6..8f1302420f 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAccountClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAccountClientLiveTest.java @@ -18,14 +18,14 @@ */ package org.jclouds.cloudstack.features; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + import org.jclouds.cloudstack.CloudStackGlobalClient; import org.jclouds.cloudstack.domain.Account; import org.jclouds.crypto.CryptoStreams; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - /** * Tests behavior of {@code GlobalAccountClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClientTest.java index 8a2dbad363..6b84706df0 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClientTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertAsyncClientTest.java @@ -18,7 +18,9 @@ */ package org.jclouds.cloudstack.features; -import com.google.inject.TypeLiteral; +import java.io.IOException; +import java.lang.reflect.Method; + import org.jclouds.cloudstack.options.ListAlertsOptions; import org.jclouds.http.HttpRequest; import org.jclouds.http.functions.ParseFirstJsonValueNamed; @@ -26,8 +28,7 @@ import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code GlobalAlertsAsyncClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertClientLiveTest.java index ef27e5c883..89a1449cb0 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalAlertClientLiveTest.java @@ -18,13 +18,15 @@ */ package org.jclouds.cloudstack.features; -import org.jclouds.cloudstack.domain.Alert; -import org.jclouds.cloudstack.options.ListAlertsOptions; -import org.testng.annotations.Test; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNotSame; +import static org.testng.Assert.assertTrue; import java.util.Set; -import static org.testng.Assert.*; +import org.jclouds.cloudstack.domain.Alert; +import org.jclouds.cloudstack.options.ListAlertsOptions; +import org.testng.annotations.Test; /** * Tests behavior of {@code GlobalAlertsClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClientTest.java index 965033998e..f8364603ba 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClientTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalCapacityAsyncClientTest.java @@ -18,7 +18,9 @@ */ package org.jclouds.cloudstack.features; -import com.google.inject.TypeLiteral; +import java.io.IOException; +import java.lang.reflect.Method; + import org.jclouds.cloudstack.domain.Capacity; import org.jclouds.cloudstack.options.ListCapacityOptions; import org.jclouds.http.HttpRequest; @@ -27,8 +29,7 @@ import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code GlobalCapacityAsyncClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationClientExpectTest.java index 913f0219fa..dd045f5107 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationClientExpectTest.java @@ -18,26 +18,20 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; -import org.jclouds.cloudstack.CloudStackClient; -import org.jclouds.cloudstack.CloudStackContext; -import org.jclouds.cloudstack.CloudStackGlobalClient; -import org.jclouds.cloudstack.domain.AsyncCreateResponse; -import org.jclouds.cloudstack.domain.ConfigurationEntry; -import org.jclouds.cloudstack.domain.FirewallRule; -import org.jclouds.cloudstack.domain.PortForwardingRule; -import org.jclouds.http.HttpRequest; -import org.jclouds.http.HttpResponse; -import org.jclouds.rest.BaseRestClientExpectTest; -import org.testng.annotations.Test; - -import java.net.URI; -import java.util.Set; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; +import java.net.URI; + +import org.jclouds.cloudstack.CloudStackContext; +import org.jclouds.cloudstack.domain.ConfigurationEntry; +import org.jclouds.http.HttpRequest; +import org.jclouds.http.HttpResponse; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; + /** * Test the CloudStack GlobalConfigurationClient * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationClientLiveTest.java index 2ad890f518..eb46e3cfaa 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalConfigurationClientLiveTest.java @@ -18,20 +18,22 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.base.Objects; -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; +import static com.google.common.collect.Iterables.getOnlyElement; +import static org.jclouds.cloudstack.options.ListConfigurationEntriesOptions.Builder.name; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + +import javax.annotation.Nullable; + import org.jclouds.cloudstack.domain.ConfigurationEntry; import org.testng.annotations.Test; import org.testng.collections.Sets; -import javax.annotation.Nullable; -import java.util.Set; - -import static com.google.common.collect.Iterables.getOnlyElement; -import static org.jclouds.cloudstack.options.ListConfigurationEntriesOptions.Builder.name; -import static org.testng.Assert.assertEquals; +import com.google.common.base.Objects; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; /** * Tests behavior of {@code GlobalConfigurationClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalDomainClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalDomainClientExpectTest.java index 4b3ecb8715..9da467eb74 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalDomainClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalDomainClientExpectTest.java @@ -18,21 +18,19 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; +import static org.jclouds.cloudstack.options.UpdateDomainOptions.Builder.name; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; + +import java.net.URI; + import org.jclouds.cloudstack.CloudStackContext; import org.jclouds.cloudstack.domain.Domain; -import org.jclouds.cloudstack.options.UpdateDomainOptions; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.testng.annotations.Test; -import java.net.URI; - -import static org.jclouds.cloudstack.options.ListDomainChildrenOptions.Builder.parentDomainId; -import static org.jclouds.cloudstack.options.UpdateDomainOptions.Builder.name; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; +import com.google.common.collect.ImmutableMultimap; /** * Test the CloudStack GlobalDomainClient diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalDomainClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalDomainClientLiveTest.java index d585ebef01..7e7558a88e 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalDomainClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalDomainClientLiveTest.java @@ -18,18 +18,19 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.base.Predicate; -import org.jclouds.cloudstack.domain.Domain; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -import javax.annotation.Nullable; - import static com.google.common.collect.Iterables.find; import static org.jclouds.cloudstack.options.UpdateDomainOptions.Builder.name; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; +import javax.annotation.Nullable; + +import org.jclouds.cloudstack.domain.Domain; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import com.google.common.base.Predicate; + /** * Tests behavior of {@code GlobalDomainClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalHostClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalHostClientExpectTest.java index 877313075c..2007c900ba 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalHostClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalHostClientExpectTest.java @@ -18,8 +18,15 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.Set; +import java.util.TimeZone; + import org.jclouds.cloudstack.CloudStackContext; import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.cloudstack.domain.Cluster; @@ -34,15 +41,8 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.testng.annotations.Test; -import java.net.URI; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.Set; -import java.util.TimeZone; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; /** * Test the CloudStack GlobalHostClient diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalHostClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalHostClientLiveTest.java index 1c1741fb46..23da1c9c69 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalHostClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalHostClientLiveTest.java @@ -23,12 +23,13 @@ import static org.testng.Assert.assertTrue; import java.util.Set; -import com.google.common.base.Strings; import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.cloudstack.domain.Cluster; import org.jclouds.cloudstack.domain.Host; import org.testng.annotations.Test; +import com.google.common.base.Strings; + /** * Tests behavior of {@code GlobalHostClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingClientLiveTest.java index 877b21c38b..df3045ed85 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalOfferingClientLiveTest.java @@ -18,7 +18,15 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableSet; +import static com.google.common.collect.Iterables.getFirst; +import static org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType.OPTIONAL; +import static org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType.REQUIRED; +import static org.jclouds.cloudstack.options.CreateDiskOfferingOptions.Builder.diskSizeInGB; +import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.highlyAvailable; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + import org.jclouds.cloudstack.domain.DiskOffering; import org.jclouds.cloudstack.domain.NetworkOffering; import org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType; @@ -30,14 +38,7 @@ import org.jclouds.cloudstack.options.UpdateServiceOfferingOptions; import org.jclouds.logging.Logger; import org.testng.annotations.Test; -import static com.google.common.collect.Iterables.getFirst; -import static org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType.OPTIONAL; -import static org.jclouds.cloudstack.domain.NetworkOfferingAvailabilityType.REQUIRED; -import static org.jclouds.cloudstack.options.CreateDiskOfferingOptions.Builder.diskSizeInGB; -import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.highlyAvailable; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; +import com.google.common.collect.ImmutableSet; /** * Tests behavior of {@code GlobalOfferingClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalPodClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalPodClientExpectTest.java index 93e8a8fa4e..6c46271105 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalPodClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalPodClientExpectTest.java @@ -18,8 +18,10 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; +import static org.testng.Assert.assertEquals; + +import java.net.URI; + import org.jclouds.cloudstack.CloudStackContext; import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.cloudstack.domain.Pod; @@ -29,9 +31,8 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.testng.annotations.Test; -import java.net.URI; - -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; /** * Test the CloudStack PodClient diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalPodClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalPodClientLiveTest.java index 20c3d6d2ce..7640f04213 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalPodClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalPodClientLiveTest.java @@ -18,9 +18,14 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + +import java.util.Set; + import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.cloudstack.domain.NetworkType; import org.jclouds.cloudstack.domain.Pod; @@ -31,10 +36,8 @@ import org.jclouds.cloudstack.options.UpdatePodOptions; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; -import java.util.Set; - -import static org.jclouds.cloudstack.options.UpdateZoneOptions.Builder.name; -import static org.testng.Assert.*; +import com.google.common.base.Strings; +import com.google.common.collect.Iterables; /** * Tests behavior of {@code GlobalPodClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClientTest.java index 22932b9a19..024f154188 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClientTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolAsyncClientTest.java @@ -18,7 +18,8 @@ */ package org.jclouds.cloudstack.features; -import com.google.inject.TypeLiteral; +import java.lang.reflect.Method; + import org.jclouds.cloudstack.options.ListStoragePoolsOptions; import org.jclouds.http.HttpRequest; import org.jclouds.http.functions.ParseFirstJsonValueNamed; @@ -26,7 +27,7 @@ import org.jclouds.rest.functions.MapHttp4xxCodesToExceptions; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; -import java.lang.reflect.Method; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code GlobalStoragePoolAsyncClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolClientLiveTest.java index f44d7e9846..5d82df5df9 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalStoragePoolClientLiveTest.java @@ -18,13 +18,16 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.base.Strings; -import org.jclouds.cloudstack.domain.StoragePool; -import org.testng.annotations.Test; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; import java.util.Set; -import static org.testng.Assert.*; +import org.jclouds.cloudstack.domain.StoragePool; +import org.testng.annotations.Test; + +import com.google.common.base.Strings; /** * Tests behavior of {@code GlobalStoragePoolClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalUserClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalUserClientLiveTest.java index ba5e9cac7f..e42de2287e 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalUserClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalUserClientLiveTest.java @@ -18,8 +18,15 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; +import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.cloudstack.features.GlobalAccountClientLiveTest.createTestAccount; +import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.userName; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.util.Properties; +import java.util.Set; + import org.jclouds.cloudstack.CloudStackClient; import org.jclouds.cloudstack.CloudStackGlobalClient; import org.jclouds.cloudstack.domain.Account; @@ -32,14 +39,8 @@ import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.jclouds.sshj.config.SshjSshClientModule; import org.testng.annotations.Test; -import java.util.Properties; -import java.util.Set; - -import static com.google.common.base.Preconditions.checkNotNull; -import static org.jclouds.cloudstack.features.GlobalAccountClientLiveTest.createTestAccount; -import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.userName; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Module; /** * Tests behavior of {@code GlobaUserClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanClientExpectTest.java index 80cad2a989..9d222679bf 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanClientExpectTest.java @@ -18,8 +18,10 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; +import static junit.framework.Assert.assertEquals; + +import java.net.URI; + import org.jclouds.cloudstack.CloudStackContext; import org.jclouds.cloudstack.domain.VlanIPRange; import org.jclouds.cloudstack.options.CreateVlanIPRangeOptions; @@ -27,9 +29,8 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.testng.annotations.Test; -import java.net.URI; - -import static junit.framework.Assert.assertEquals; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; /** * Test the CloudStack VlanClient diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanClientLiveTest.java index 30c759f91c..eea075dba9 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalVlanClientLiveTest.java @@ -18,31 +18,30 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.base.Predicate; -import com.google.common.base.Strings; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; +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; +import static org.testng.Assert.assertTrue; + +import java.util.Set; + import org.jclouds.cloudstack.domain.Network; import org.jclouds.cloudstack.domain.NetworkOffering; import org.jclouds.cloudstack.domain.TrafficType; import org.jclouds.cloudstack.domain.VlanIPRange; import org.jclouds.cloudstack.domain.Zone; import org.jclouds.cloudstack.options.CreateVlanIPRangeOptions; -import org.jclouds.cloudstack.options.ListNetworksOptions; import org.jclouds.cloudstack.options.ListVlanIPRangesOptions; import org.jclouds.cloudstack.predicates.NetworkOfferingPredicates; import org.jclouds.cloudstack.predicates.ZonePredicates; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; -import javax.annotation.Nullable; -import java.util.Set; - -import static com.google.common.collect.Iterables.filter; -import static com.google.common.collect.Iterables.find; -import static com.google.common.collect.Iterables.getFirst; -import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.zoneId; -import static org.testng.Assert.*; +import com.google.common.base.Predicate; +import com.google.common.base.Strings; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; /** * Tests behavior of {@code GlobalVlanClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalZoneClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalZoneClientExpectTest.java index 571950775e..5e46a13087 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalZoneClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalZoneClientExpectTest.java @@ -18,8 +18,12 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMultimap; +import static org.jclouds.cloudstack.options.UpdateZoneOptions.Builder.name; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; + +import java.net.URI; + import org.jclouds.cloudstack.CloudStackContext; import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.cloudstack.domain.NetworkType; @@ -28,11 +32,8 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.testng.annotations.Test; -import java.net.URI; - -import static org.jclouds.cloudstack.options.UpdateZoneOptions.Builder.name; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMultimap; /** * Test the CloudStack GlobalZoneClient diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalZoneClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalZoneClientLiveTest.java index e873376895..9309bb3d14 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalZoneClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GlobalZoneClientLiveTest.java @@ -18,14 +18,15 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableList; +import static org.jclouds.cloudstack.options.UpdateZoneOptions.Builder.name; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + import org.jclouds.cloudstack.domain.NetworkType; import org.jclouds.cloudstack.domain.Zone; import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.UpdateZoneOptions.Builder.name; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code GlobalZoneClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitAsyncClientTest.java index 210994ab22..3a059d239b 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitAsyncClientTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LimitAsyncClientTest.java @@ -21,7 +21,6 @@ package org.jclouds.cloudstack.features; import java.io.IOException; import java.lang.reflect.Method; -import com.google.inject.TypeLiteral; import org.jclouds.cloudstack.options.ListResourceLimitsOptions; import org.jclouds.http.HttpRequest; import org.jclouds.http.functions.ParseFirstJsonValueNamed; @@ -29,6 +28,8 @@ import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; +import com.google.inject.TypeLiteral; + /** * Tests behavior of {@code LimitAsyncClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerClientLiveTest.java index 4d258e88ab..d190627bdd 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/LoadBalancerClientLiveTest.java @@ -30,6 +30,8 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; + import org.jclouds.cloudstack.domain.AsyncJob; import org.jclouds.cloudstack.domain.JobResult; import org.jclouds.cloudstack.domain.LoadBalancerRule; @@ -39,7 +41,6 @@ import org.jclouds.cloudstack.domain.Network; import org.jclouds.cloudstack.domain.PublicIPAddress; import org.jclouds.cloudstack.domain.VirtualMachine; import org.jclouds.cloudstack.predicates.LoadBalancerRuleActive; -import org.jclouds.cloudstack.predicates.NetworkPredicates; import org.jclouds.net.IPSocket; import org.jclouds.predicates.RetryablePredicate; import org.jclouds.ssh.SshException; @@ -50,8 +51,6 @@ import org.testng.annotations.Test; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import javax.annotation.Nullable; - /** * Tests behavior of {@code LoadBalancerClientLiveTest} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java index fb8800756f..78dba8a0d9 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java @@ -18,6 +18,22 @@ */ package org.jclouds.cloudstack.features; +import static com.google.common.collect.Iterables.find; +import static com.google.common.collect.Iterables.get; +import static com.google.common.collect.Iterables.getOnlyElement; +import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.vlan; +import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.specifyVLAN; +import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.accountInDomain; +import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.id; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.net.URI; +import java.util.NoSuchElementException; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.jclouds.cloudstack.domain.GuestIPType; import org.jclouds.cloudstack.domain.Network; import org.jclouds.cloudstack.domain.NetworkOffering; @@ -27,20 +43,6 @@ import org.jclouds.cloudstack.predicates.ZonePredicates; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -import java.net.URI; -import java.util.NoSuchElementException; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - -import static com.google.common.collect.Iterables.*; -import static org.jclouds.cloudstack.options.CreateNetworkOptions.Builder.vlan; -import static org.jclouds.cloudstack.options.ListNetworkOfferingsOptions.Builder.specifyVLAN; -import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.accountInDomain; -import static org.jclouds.cloudstack.options.ListNetworksOptions.Builder.id; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - /** * Tests behavior of {@code NetworkClientLiveTest} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClientTest.java index c60dcfc94d..59d1d8cd35 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClientTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairAsyncClientTest.java @@ -18,8 +18,12 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.base.Functions; -import com.google.inject.TypeLiteral; +import static org.testng.Assert.assertEquals; + +import java.io.IOException; +import java.lang.reflect.Method; +import java.net.URLEncoder; + import org.jclouds.cloudstack.filters.QuerySigner; import org.jclouds.cloudstack.options.ListSSHKeyPairsOptions; import org.jclouds.crypto.SshKeys; @@ -34,11 +38,8 @@ import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.URLEncoder; - -import static org.testng.Assert.assertEquals; +import com.google.common.base.Functions; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code SSHKeyPairAsyncClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientExpectTest.java index d360c4465e..c734d90a65 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientExpectTest.java @@ -18,9 +18,11 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; -import com.sun.jersey.api.uri.UriComponent; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.net.URI; + import org.jclouds.cloudstack.CloudStackContext; import org.jclouds.cloudstack.domain.SshKeyPair; import org.jclouds.crypto.SshKeys; @@ -28,10 +30,9 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.testng.annotations.Test; -import java.net.URI; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; +import com.sun.jersey.api.uri.UriComponent; /** * Test the CloudStack SSHKeyPairClient diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java index e6f38c08d4..52e0687966 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SSHKeyPairClientLiveTest.java @@ -18,19 +18,19 @@ */ package org.jclouds.cloudstack.features; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; + +import java.util.Map; +import java.util.Set; + import org.jclouds.cloudstack.domain.SshKeyPair; import org.jclouds.crypto.SshKeys; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.Map; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; - /** * Tests behavior of {@code SSHKeyPairClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionClientExpectTest.java index 887832b03c..9b54604ccd 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionClientExpectTest.java @@ -18,7 +18,13 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableMultimap; +import static org.jclouds.crypto.CryptoStreams.md5Hex; +import static org.testng.Assert.assertEquals; + +import java.io.IOException; +import java.net.URI; +import java.net.URLEncoder; + import org.jclouds.cloudstack.CloudStackContext; import org.jclouds.cloudstack.domain.Account; import org.jclouds.cloudstack.domain.LoginResponse; @@ -26,12 +32,7 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.testng.annotations.Test; -import java.io.IOException; -import java.net.URI; -import java.net.URLEncoder; - -import static org.jclouds.crypto.CryptoStreams.md5Hex; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableMultimap; /** * Tests behavior of {@code SessionClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionClientLiveTest.java index e546ee98e7..ca7efd015d 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/SessionClientLiveTest.java @@ -18,6 +18,13 @@ */ package org.jclouds.cloudstack.features; +import static org.jclouds.cloudstack.features.GlobalAccountClientLiveTest.createTestAccount; +import static org.jclouds.cloudstack.features.GlobalUserClientLiveTest.createTestUser; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.net.URI; + import org.jclouds.cloudstack.domain.Account; import org.jclouds.cloudstack.domain.ApiKeyPair; import org.jclouds.cloudstack.domain.LoginResponse; @@ -27,13 +34,6 @@ import org.jclouds.crypto.CryptoStreams; import org.jclouds.rest.AuthorizationException; import org.testng.annotations.Test; -import java.net.URI; - -import static org.jclouds.cloudstack.features.GlobalAccountClientLiveTest.createTestAccount; -import static org.jclouds.cloudstack.features.GlobalUserClientLiveTest.createTestUser; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - /** * Tests behavior of {@code SessionClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java index feb296c54c..ab02040466 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java @@ -18,22 +18,39 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; -import org.jclouds.cloudstack.domain.*; -import org.jclouds.cloudstack.options.*; +import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.zoneId; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + +import java.net.URI; +import java.net.URLDecoder; +import java.util.Set; + +import javax.annotation.Nullable; + +import org.jclouds.cloudstack.domain.AsyncCreateResponse; +import org.jclouds.cloudstack.domain.AsyncJob; +import org.jclouds.cloudstack.domain.ExtractMode; +import org.jclouds.cloudstack.domain.Network; +import org.jclouds.cloudstack.domain.OSType; +import org.jclouds.cloudstack.domain.Template; +import org.jclouds.cloudstack.domain.TemplateExtraction; +import org.jclouds.cloudstack.domain.TemplateMetadata; +import org.jclouds.cloudstack.domain.VirtualMachine; +import org.jclouds.cloudstack.domain.Volume; +import org.jclouds.cloudstack.domain.Zone; +import org.jclouds.cloudstack.options.CreateTemplateOptions; +import org.jclouds.cloudstack.options.ListNetworksOptions; +import org.jclouds.cloudstack.options.ListVolumesOptions; +import org.jclouds.cloudstack.options.RegisterTemplateOptions; import org.jclouds.logging.Logger; import org.jclouds.predicates.RetryablePredicate; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; -import javax.annotation.Nullable; -import java.net.URI; -import java.net.URLDecoder; -import java.util.Set; - -import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.zoneId; -import static org.testng.Assert.*; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; /** * Tests behavior of {@code TemplateClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupAsyncClientTest.java index 649bde16ba..bbb066b707 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupAsyncClientTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupAsyncClientTest.java @@ -18,8 +18,9 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.base.Functions; -import com.google.inject.TypeLiteral; +import java.io.IOException; +import java.lang.reflect.Method; + import org.jclouds.cloudstack.options.CreateVMGroupOptions; import org.jclouds.cloudstack.options.ListVMGroupsOptions; import org.jclouds.cloudstack.options.UpdateVMGroupOptions; @@ -34,8 +35,8 @@ import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; +import com.google.common.base.Functions; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code VMGroupAsyncClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupClientLiveTest.java index 00ae1d0ecd..e8cb96e318 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupClientLiveTest.java @@ -18,16 +18,17 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.Iterables; +import static org.testng.Assert.assertEquals; + +import java.util.Random; +import java.util.Set; + import org.jclouds.cloudstack.domain.VMGroup; import org.jclouds.cloudstack.options.ListVMGroupsOptions; import org.testng.annotations.AfterGroups; import org.testng.annotations.Test; -import java.util.Random; -import java.util.Set; - -import static org.testng.Assert.assertEquals; +import com.google.common.collect.Iterables; /** * Tests behavior of {@code VMGroupClient} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientExpectTest.java index 495a6eb4a8..3ed82ed219 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientExpectTest.java @@ -18,7 +18,12 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableMultimap; +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; + import org.jclouds.cloudstack.CloudStackContext; import org.jclouds.cloudstack.domain.EncryptedPasswordAndPrivateKey; import org.jclouds.cloudstack.functions.WindowsLoginCredentialsFromEncryptedData; @@ -28,11 +33,7 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.testng.annotations.Test; -import java.net.URI; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; - -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableMultimap; /** * Test the CloudStack VirtualMachineClientClient diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeAsyncClientTest.java index 82894ffe86..c73e85c389 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeAsyncClientTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeAsyncClientTest.java @@ -21,7 +21,6 @@ package org.jclouds.cloudstack.features; import java.io.IOException; import java.lang.reflect.Method; -import com.google.inject.TypeLiteral; import org.jclouds.cloudstack.options.ListVolumesOptions; import org.jclouds.http.HttpRequest; import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; @@ -30,6 +29,8 @@ import org.jclouds.rest.functions.ReturnVoidOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; +import com.google.inject.TypeLiteral; + /** * Tests behavior of {@code EventAsyncClient} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneClientExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneClientExpectTest.java index d71874016b..d57e9376d2 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneClientExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/ZoneClientExpectTest.java @@ -18,8 +18,10 @@ */ package org.jclouds.cloudstack.features; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; +import static org.testng.Assert.assertEquals; + +import java.net.URI; + import org.jclouds.cloudstack.CloudStackContext; import org.jclouds.cloudstack.domain.NetworkType; import org.jclouds.cloudstack.domain.Zone; @@ -27,9 +29,8 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.testng.annotations.Test; -import java.net.URI; - -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; /** * Test the CloudStack ZoneClient diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java index 2e75496028..356bcc7751 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/QuerySignerTest.java @@ -27,11 +27,11 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.IntegrationTestAsyncClient; import org.jclouds.http.IntegrationTestClient; import org.jclouds.logging.config.NullLoggingModule; +import org.jclouds.rest.BaseRestClientTest.MockModule; import org.jclouds.rest.RequestSigner; import org.jclouds.rest.RestContextBuilder; import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextSpec; -import org.jclouds.rest.BaseRestClientTest.MockModule; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/ReEncodeQueryWithJavaNetURLEncoderTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/ReEncodeQueryWithJavaNetURLEncoderTest.java index c4c9f13e43..e562e20c15 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/ReEncodeQueryWithJavaNetURLEncoderTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/filters/ReEncodeQueryWithJavaNetURLEncoderTest.java @@ -18,19 +18,21 @@ */ package org.jclouds.cloudstack.filters; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.sun.jersey.api.uri.UriBuilderImpl; -import com.sun.jersey.api.uri.UriComponent; +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.net.URLEncoder; + +import javax.ws.rs.core.UriBuilder; + import org.jclouds.http.HttpRequest; import org.jclouds.util.Strings2; import org.testng.annotations.Test; -import javax.ws.rs.core.UriBuilder; -import java.net.URI; -import java.net.URLEncoder; - -import static org.testng.Assert.assertEquals; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.sun.jersey.api.uri.UriBuilderImpl; +import com.sun.jersey.api.uri.UriComponent; /** * @author Adrian Cole diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/BlockUntilJobCompletesAndReturnResultTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/BlockUntilJobCompletesAndReturnResultTest.java index 54f6c32c32..e946c061a3 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/BlockUntilJobCompletesAndReturnResultTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/BlockUntilJobCompletesAndReturnResultTest.java @@ -18,17 +18,17 @@ */ package org.jclouds.cloudstack.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; -import static org.jclouds.cloudstack.domain.AsyncJobError.ErrorCode; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import org.jclouds.cloudstack.CloudStackClient; import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncJob; import org.jclouds.cloudstack.domain.AsyncJobError; +import org.jclouds.cloudstack.domain.AsyncJobError.ErrorCode; import org.jclouds.cloudstack.features.AsyncJobClient; import org.jclouds.cloudstack.strategy.BlockUntilJobCompletesAndReturnResult; import org.testng.annotations.Test; diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java index d3b7c038fc..27957ba85f 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ParseAsyncJobFromHttpResponseTest.java @@ -18,16 +18,16 @@ */ package org.jclouds.cloudstack.functions; -import static org.jclouds.cloudstack.domain.AsyncJob.ResultCode; -import static org.jclouds.cloudstack.domain.AsyncJob.Status; -import static org.jclouds.cloudstack.domain.AsyncJobError.ErrorCode; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.io.InputStream; import org.jclouds.cloudstack.domain.AsyncJob; +import org.jclouds.cloudstack.domain.AsyncJob.ResultCode; +import org.jclouds.cloudstack.domain.AsyncJob.Status; import org.jclouds.cloudstack.domain.AsyncJobError; +import org.jclouds.cloudstack.domain.AsyncJobError.ErrorCode; import org.jclouds.cloudstack.domain.IPForwardingRule; import org.jclouds.cloudstack.domain.PublicIPAddress; import org.jclouds.cloudstack.domain.Template; diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java index 56ec7aba7f..36c62343ab 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/functions/ReuseOrAssociateNewPublicIPAddressTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.cloudstack.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.jclouds.cloudstack.options.AssociateIPAddressOptions.Builder.networkId; import static org.jclouds.cloudstack.options.ListPublicIPAddressesOptions.Builder.allocatedOnly; import static org.testng.Assert.assertEquals; diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java index 8e404804d8..b49089c62a 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandlerTest.java @@ -18,7 +18,14 @@ */ package org.jclouds.cloudstack.handlers; -import com.google.inject.Guice; +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.EasyMock.verify; + +import java.net.URI; + import org.easymock.IArgumentMatcher; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpRequest; @@ -29,13 +36,7 @@ import org.jclouds.rest.ResourceNotFoundException; import org.jclouds.util.Strings2; import org.testng.annotations.Test; -import java.net.URI; - -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.reportMatcher; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import com.google.inject.Guice; /** * @author Adrian Cole diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java index 2166402701..416fd9241e 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/handlers/InvalidateSessionAndRetryOn401AndLogoutOnCloseTest.java @@ -18,7 +18,16 @@ */ package org.jclouds.cloudstack.handlers; -import com.google.common.cache.LoadingCache; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + +import java.util.concurrent.atomic.AtomicInteger; + import org.easymock.IAnswer; import org.jclouds.cloudstack.domain.LoginResponse; import org.jclouds.cloudstack.features.SessionClient; @@ -28,15 +37,7 @@ import org.jclouds.http.HttpResponse; import org.jclouds.io.Payloads; import org.testng.annotations.Test; -import java.util.concurrent.atomic.AtomicInteger; - -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; +import com.google.common.cache.LoadingCache; /** * Tests behavior of {@code InvalidateSessionAndRetryOn401AndLogoutOnClose} handler diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddClusterOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddClusterOptionsTest.java index 222605e458..0d3a64a407 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddClusterOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddClusterOptionsTest.java @@ -18,12 +18,17 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; +import static org.jclouds.cloudstack.options.AddClusterOptions.Builder.allocationState; +import static org.jclouds.cloudstack.options.AddClusterOptions.Builder.password; +import static org.jclouds.cloudstack.options.AddClusterOptions.Builder.podId; +import static org.jclouds.cloudstack.options.AddClusterOptions.Builder.url; +import static org.jclouds.cloudstack.options.AddClusterOptions.Builder.username; +import static org.testng.Assert.assertEquals; + import org.jclouds.cloudstack.domain.AllocationState; import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.AddClusterOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code AddClusterOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddHostOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddHostOptionsTest.java index 7f7f937260..c56570c41e 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddHostOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddHostOptionsTest.java @@ -18,13 +18,18 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; +import static org.jclouds.cloudstack.options.AddHostOptions.Builder.allocationState; +import static org.jclouds.cloudstack.options.AddHostOptions.Builder.clusterId; +import static org.jclouds.cloudstack.options.AddHostOptions.Builder.clusterName; +import static org.jclouds.cloudstack.options.AddHostOptions.Builder.hostTags; +import static org.jclouds.cloudstack.options.AddHostOptions.Builder.podId; +import static org.testng.Assert.assertEquals; + import org.jclouds.cloudstack.domain.AllocationState; import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.AddHostOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; /** * Tests behavior of {@code AddHostOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptionsTest.java index 3d9ca51ec7..cb245a35e0 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/AddSecondaryStorageOptionsTest.java @@ -18,11 +18,12 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; +import static org.jclouds.cloudstack.options.AddSecondaryStorageOptions.Builder.zoneId; +import static org.testng.Assert.assertEquals; + import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.AddSecondaryStorageOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code AddSecondaryStorageOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateAccountOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateAccountOptionsTest.java index dcef5fca20..de1e279180 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateAccountOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateAccountOptionsTest.java @@ -18,14 +18,15 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.options.CreateAccountOptions.Builder.account; import static org.jclouds.cloudstack.options.CreateAccountOptions.Builder.domainId; import static org.jclouds.cloudstack.options.CreateAccountOptions.Builder.networkDomain; import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableSet; + /** * Tests behavior of {@code CreateAccountOptions} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptionsTest.java index a7e7b4d690..4461d27735 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateDiskOfferingOptionsTest.java @@ -18,14 +18,15 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.options.CreateDiskOfferingOptions.Builder.customized; import static org.jclouds.cloudstack.options.CreateDiskOfferingOptions.Builder.diskSizeInGB; import static org.jclouds.cloudstack.options.CreateDiskOfferingOptions.Builder.tags; import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableSet; + /** * Tests behavior of {@code CreateDiskOfferingOptions} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreatePodOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreatePodOptionsTest.java index 5576d97520..6cc9b07594 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreatePodOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreatePodOptionsTest.java @@ -18,12 +18,13 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; +import static org.jclouds.cloudstack.options.CreatePodOptions.Builder.allocationState; +import static org.testng.Assert.assertEquals; + import org.jclouds.cloudstack.domain.AllocationState; import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.CreatePodOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code CreatePodOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptionsTest.java index 351d9bae29..04de4094ab 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateServiceOfferingOptionsTest.java @@ -18,11 +18,6 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; -import org.jclouds.cloudstack.domain.StorageType; -import org.jclouds.cloudstack.domain.SystemVmType; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.highlyAvailable; import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.hostTags; import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.isSystem; @@ -33,6 +28,12 @@ import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builde import static org.jclouds.cloudstack.options.CreateServiceOfferingOptions.Builder.tags; import static org.testng.Assert.assertEquals; +import org.jclouds.cloudstack.domain.StorageType; +import org.jclouds.cloudstack.domain.SystemVmType; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableSet; + /** * Tests behavior of {@code CreateServiceOfferingOptions} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateUserOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateUserOptionsTest.java index 8b79bda2d5..bc1317e2ac 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateUserOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateUserOptionsTest.java @@ -18,13 +18,14 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.options.CreateUserOptions.Builder.domainId; import static org.jclouds.cloudstack.options.CreateUserOptions.Builder.timezone; import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableSet; + /** * Tests behavior of {@code CreateUserOptions} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptionsTest.java index 4a072a4999..f4c245cfdc 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptionsTest.java @@ -18,11 +18,20 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; +import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.accountInDomain; +import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.domainId; +import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.forVirtualNetwork; +import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.gateway; +import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.netmask; +import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.networkId; +import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.podId; +import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.vlan; +import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.zoneId; +import static org.testng.Assert.assertEquals; + import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.CreateVlanIPRangeOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableSet; /** * Tests behavior of {@code CreateVlanIPRangeOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/DeleteHostOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/DeleteHostOptionsTest.java index 0445a2e926..6b6ee4f87d 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/DeleteHostOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/DeleteHostOptionsTest.java @@ -18,13 +18,13 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import org.jclouds.cloudstack.domain.Host; +import static org.jclouds.cloudstack.options.DeleteHostOptions.Builder.forceDestroyLocalStorage; +import static org.jclouds.cloudstack.options.DeleteHostOptions.Builder.forced; +import static org.testng.Assert.assertEquals; + import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.DeleteHostOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code DeleteHostOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptionsTest.java index d06407afae..1f5cdd4ecc 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/GenerateUsageRecordsOptionsTest.java @@ -18,12 +18,13 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.options.GenerateUsageRecordsOptions.Builder.domainId; import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableSet; + /** * Tests behavior of {@code GenerateUsageRecordsOptions} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAlertsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAlertsOptionsTest.java index e77f05c1f9..000bf8e650 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAlertsOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListAlertsOptionsTest.java @@ -18,14 +18,15 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.options.ListAlertsOptions.Builder.id; import static org.jclouds.cloudstack.options.ListAlertsOptions.Builder.keyword; import static org.jclouds.cloudstack.options.ListAlertsOptions.Builder.type; import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableList; + /** * Tests behavior of {@code ListAlertsOptions} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListCapacityOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListCapacityOptionsTest.java index 96b760eba0..b6ce10fe9c 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListCapacityOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListCapacityOptionsTest.java @@ -18,12 +18,17 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; +import static org.jclouds.cloudstack.options.ListCapacityOptions.Builder.hostId; +import static org.jclouds.cloudstack.options.ListCapacityOptions.Builder.keyword; +import static org.jclouds.cloudstack.options.ListCapacityOptions.Builder.podId; +import static org.jclouds.cloudstack.options.ListCapacityOptions.Builder.type; +import static org.jclouds.cloudstack.options.ListCapacityOptions.Builder.zoneId; +import static org.testng.Assert.assertEquals; + import org.jclouds.cloudstack.domain.Capacity; import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.ListCapacityOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code ListCapacityOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListClustersOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListClustersOptionsTest.java index 5b5ee48d7c..18f201f8e6 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListClustersOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListClustersOptionsTest.java @@ -18,14 +18,23 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; +import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.allocationState; +import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.clusterType; +import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.hypervisor; +import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.id; +import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.keyword; +import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.managedState; +import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.name; +import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.podId; +import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.zoneId; +import static org.testng.Assert.assertEquals; + import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.cloudstack.domain.Cluster; import org.jclouds.cloudstack.domain.Host; import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.ListClustersOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code ListClustersOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListHostsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListHostsOptionsTest.java index 4f337112f4..a04e176a97 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListHostsOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListHostsOptionsTest.java @@ -18,11 +18,6 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; -import org.jclouds.cloudstack.domain.AllocationState; -import org.jclouds.cloudstack.domain.Host; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.allocationState; import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.clusterId; import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.id; @@ -37,6 +32,12 @@ import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.virtualMac import static org.jclouds.cloudstack.options.ListHostsOptions.Builder.zoneId; import static org.testng.Assert.assertEquals; +import org.jclouds.cloudstack.domain.AllocationState; +import org.jclouds.cloudstack.domain.Host; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableList; + /** * Tests behavior of {@code ListHostsOptions} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPodsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPodsOptionsTest.java index eedab15236..110319571c 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPodsOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListPodsOptionsTest.java @@ -18,12 +18,17 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; +import static org.jclouds.cloudstack.options.ListPodsOptions.Builder.allocationState; +import static org.jclouds.cloudstack.options.ListPodsOptions.Builder.id; +import static org.jclouds.cloudstack.options.ListPodsOptions.Builder.keyword; +import static org.jclouds.cloudstack.options.ListPodsOptions.Builder.name; +import static org.jclouds.cloudstack.options.ListPodsOptions.Builder.zoneId; +import static org.testng.Assert.assertEquals; + import org.jclouds.cloudstack.domain.AllocationState; import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.ListPodsOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code ListPodsOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListStoragePoolsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListStoragePoolsOptionsTest.java index 38eb811bbf..c3a35804c5 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListStoragePoolsOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListStoragePoolsOptionsTest.java @@ -18,11 +18,19 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; +import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.clusterId; +import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.id; +import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.ipAddress; +import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.keyword; +import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.name; +import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.path; +import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.podId; +import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.zoneId; +import static org.testng.Assert.assertEquals; + import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.ListStoragePoolsOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * Test for the ListStoragePoolsOptions class. diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListUsageRecordsOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListUsageRecordsOptionsTest.java index ff3272baeb..e2690a7d83 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListUsageRecordsOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListUsageRecordsOptionsTest.java @@ -18,11 +18,15 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; +import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.accountId; +import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.accountInDomain; +import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.domainId; +import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.keyword; +import static org.testng.Assert.assertEquals; + import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.ListUsageRecordsOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableSet; /** * Options to the GlobalUsageClient.listUsageOptions() API call diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListUsersOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListUsersOptionsTest.java index b45f44a773..9772f8532d 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListUsersOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListUsersOptionsTest.java @@ -18,11 +18,6 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import org.jclouds.cloudstack.domain.User; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.accountInDomain; import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.accountType; import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.domainId; @@ -34,6 +29,12 @@ import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.state; import static org.jclouds.cloudstack.options.ListUsersOptions.Builder.userName; import static org.testng.Assert.assertEquals; +import org.jclouds.cloudstack.domain.User; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; + /** * Tests behavior of {@code ListUsersOptions} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptionsTest.java index 9c160ecdd8..0ec8903461 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptionsTest.java @@ -18,11 +18,20 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; +import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.accountInDomain; +import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.domainId; +import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.forVirtualNetwork; +import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.id; +import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.keyword; +import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.networkId; +import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.podId; +import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.vlan; +import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.zoneId; +import static org.testng.Assert.assertEquals; + import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.ListVlanIPRangesOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code ListVlanIPRangesOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateAccountOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateAccountOptionsTest.java index 8f924ac8e8..972af8e4fa 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateAccountOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateAccountOptionsTest.java @@ -18,12 +18,13 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.options.UpdateAccountOptions.Builder.networkDomain; import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableSet; + /** * Tests behavior of {@code UpdateAccountOptions} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateClusterOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateClusterOptionsTest.java index 7495d00133..c98ec8493e 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateClusterOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateClusterOptionsTest.java @@ -18,14 +18,15 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; +import static org.jclouds.cloudstack.options.UpdateClusterOptions.Builder.allocationState; +import static org.testng.Assert.assertEquals; + import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.cloudstack.domain.Cluster; import org.jclouds.cloudstack.domain.Host; import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.UpdateClusterOptions.Builder.allocationState; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code UpdateClusterOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptionsTest.java index 729e7018ff..13ccc000af 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateDiskOfferingOptionsTest.java @@ -18,13 +18,14 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.options.UpdateDiskOfferingOptions.Builder.displayText; import static org.jclouds.cloudstack.options.UpdateDiskOfferingOptions.Builder.name; import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableSet; + /** * Tests behavior of {@code UpdateDiskOfferingOptions} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateHostOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateHostOptionsTest.java index ac4872f298..d98af8d2ad 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateHostOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateHostOptionsTest.java @@ -18,13 +18,16 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; +import static org.jclouds.cloudstack.options.UpdateHostOptions.Builder.allocationState; +import static org.jclouds.cloudstack.options.UpdateHostOptions.Builder.hostTags; +import static org.jclouds.cloudstack.options.UpdateHostOptions.Builder.osCategoryId; +import static org.testng.Assert.assertEquals; + import org.jclouds.cloudstack.domain.AllocationState; import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.UpdateHostOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; /** * Tests behavior of {@code UpdateHostOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdatePodOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdatePodOptionsTest.java index ffa1a01055..dc27ddb1b7 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdatePodOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdatePodOptionsTest.java @@ -18,12 +18,18 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableList; +import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.allocationState; +import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.endIp; +import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.gateway; +import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.name; +import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.netmask; +import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.startIp; +import static org.testng.Assert.assertEquals; + import org.jclouds.cloudstack.domain.AllocationState; import org.testng.annotations.Test; -import static org.jclouds.cloudstack.options.UpdatePodOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code UpdatePodOptions} diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateUserOptionsTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateUserOptionsTest.java index f8fc14a88a..12d1a60c30 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateUserOptionsTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/options/UpdateUserOptionsTest.java @@ -18,9 +18,6 @@ */ package org.jclouds.cloudstack.options; -import com.google.common.collect.ImmutableSet; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.email; import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.firstName; import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.lastName; @@ -30,6 +27,10 @@ import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.userName; import static org.jclouds.cloudstack.options.UpdateUserOptions.Builder.userSecretKey; import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableSet; + /** * Tests behavior of {@code UpdateUserOptions} * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListClustersResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListClustersResponseTest.java index 8b29b304cb..b74c49adc9 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListClustersResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListClustersResponseTest.java @@ -18,7 +18,8 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.ImmutableSet; +import java.util.Set; + import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.cloudstack.domain.Cluster; import org.jclouds.cloudstack.domain.Host; @@ -26,7 +27,7 @@ import org.jclouds.json.BaseSetParserTest; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * @author Richard Downer diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListConfigurationEntriesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListConfigurationEntriesResponseTest.java index 0a734a98a0..e8ee0345b7 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListConfigurationEntriesResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListConfigurationEntriesResponseTest.java @@ -18,18 +18,18 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Guice; -import com.google.inject.Injector; +import java.util.Set; + import org.jclouds.cloudstack.config.CloudStackParserModule; import org.jclouds.cloudstack.domain.ConfigurationEntry; -import org.jclouds.cloudstack.domain.FirewallRule; import org.jclouds.json.BaseSetParserTest; import org.jclouds.json.config.GsonModule; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import java.util.Set; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * @author Andrei Savu diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDomainsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDomainsResponseTest.java index f6fa41acd4..2cbe9e51c9 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDomainsResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListDomainsResponseTest.java @@ -18,9 +18,8 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Guice; -import com.google.inject.Injector; +import java.util.Set; + import org.jclouds.cloudstack.config.CloudStackParserModule; import org.jclouds.cloudstack.domain.Domain; import org.jclouds.json.BaseSetParserTest; @@ -28,7 +27,9 @@ import org.jclouds.json.config.GsonModule; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import java.util.Set; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * @author Andrei Savu diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListFirewallRulesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListFirewallRulesResponseTest.java index 1a67ca39c6..eca9c2a204 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListFirewallRulesResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListFirewallRulesResponseTest.java @@ -18,9 +18,8 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Guice; -import com.google.inject.Injector; +import java.util.Set; + import org.jclouds.cloudstack.config.CloudStackParserModule; import org.jclouds.cloudstack.domain.FirewallRule; import org.jclouds.json.BaseSetParserTest; @@ -28,7 +27,9 @@ import org.jclouds.json.config.GsonModule; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import java.util.Set; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java index a26a097689..7f575bd67f 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListHostsResponseTest.java @@ -18,9 +18,8 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Guice; -import com.google.inject.Injector; +import java.util.Set; + import org.jclouds.cloudstack.config.CloudStackParserModule; import org.jclouds.cloudstack.domain.AllocationState; import org.jclouds.cloudstack.domain.Host; @@ -30,7 +29,9 @@ import org.jclouds.json.config.GsonModule; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import java.util.Set; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * @author Andrei Savu diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java index 5156aae3cd..67215f21a2 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListIPForwardingRulesResponseTest.java @@ -18,13 +18,14 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.ImmutableSet; +import java.util.Set; + import org.jclouds.cloudstack.domain.IPForwardingRule; import org.jclouds.json.BaseSetParserTest; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListLoadBalancerRulesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListLoadBalancerRulesResponseTest.java index b6e0af97df..bef79e1a3c 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListLoadBalancerRulesResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListLoadBalancerRulesResponseTest.java @@ -18,9 +18,8 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Guice; -import com.google.inject.Injector; +import java.util.Set; + import org.jclouds.cloudstack.config.CloudStackParserModule; import org.jclouds.cloudstack.domain.LoadBalancerRule; import org.jclouds.json.BaseSetParserTest; @@ -29,7 +28,9 @@ import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; import org.testng.collections.Sets; -import java.util.Set; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java index 13c291cb6d..5671b8ee51 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListNetworksResponseTest.java @@ -18,7 +18,9 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.*; +import java.net.URI; +import java.util.Set; + import org.jclouds.cloudstack.domain.GuestIPType; import org.jclouds.cloudstack.domain.Network; import org.jclouds.cloudstack.domain.NetworkService; @@ -27,8 +29,11 @@ import org.jclouds.json.BaseSetParserTest; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import java.net.URI; -import java.util.Set; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSortedMap; +import com.google.common.collect.ImmutableSortedSet; /** * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPodsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPodsResponseTest.java index 31696db210..8bc6ca5fcd 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPodsResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPodsResponseTest.java @@ -18,17 +18,15 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.ImmutableSet; +import java.util.Set; + import org.jclouds.cloudstack.domain.AllocationState; -import org.jclouds.cloudstack.domain.Host; -import org.jclouds.cloudstack.domain.NetworkType; import org.jclouds.cloudstack.domain.Pod; -import org.jclouds.cloudstack.domain.Zone; import org.jclouds.json.BaseSetParserTest; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java index 5079c7c6a5..8b49b557c4 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListPortForwardingRulesResponseTest.java @@ -20,8 +20,6 @@ package org.jclouds.cloudstack.parse; import java.util.Set; -import com.google.inject.Guice; -import com.google.inject.Injector; import org.jclouds.cloudstack.config.CloudStackParserModule; import org.jclouds.cloudstack.domain.PortForwardingRule; import org.jclouds.json.BaseSetParserTest; @@ -30,6 +28,8 @@ import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java index 0e85803779..ec4cd6ae0c 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListSSHKeyPairsResponseTest.java @@ -18,9 +18,8 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Guice; -import com.google.inject.Injector; +import java.util.Set; + import org.jclouds.cloudstack.config.CloudStackParserModule; import org.jclouds.cloudstack.domain.SshKeyPair; import org.jclouds.json.BaseSetParserTest; @@ -28,7 +27,9 @@ import org.jclouds.json.config.GsonModule; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import java.util.Set; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * @author Adrian Cole diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java index fa914bfe95..e64bfb4f94 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java @@ -18,9 +18,11 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Guice; -import com.google.inject.Injector; +import java.util.Calendar; +import java.util.Date; +import java.util.Set; +import java.util.TimeZone; + import org.jclouds.cloudstack.config.CloudStackDateAdapter; import org.jclouds.cloudstack.domain.UsageRecord; import org.jclouds.json.BaseSetParserTest; @@ -28,10 +30,9 @@ import org.jclouds.json.config.GsonModule; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import java.util.Calendar; -import java.util.Date; -import java.util.Set; -import java.util.TimeZone; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVlanIPRangesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVlanIPRangesResponseTest.java index 74f94338ab..fe41a31b63 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVlanIPRangesResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListVlanIPRangesResponseTest.java @@ -18,13 +18,14 @@ */ package org.jclouds.cloudstack.parse; -import com.google.common.collect.ImmutableSet; +import java.util.Set; + import org.jclouds.cloudstack.domain.VlanIPRange; import org.jclouds.json.BaseSetParserTest; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java index 9ff6b8f3e0..0662b43c67 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/NetworkPredicatesTest.java @@ -18,19 +18,22 @@ */ package org.jclouds.cloudstack.predicates; -import com.google.common.base.Predicate; +import static org.jclouds.cloudstack.predicates.NetworkPredicates.defaultNetworkInZone; +import static org.jclouds.cloudstack.predicates.NetworkPredicates.hasLoadBalancerService; +import static org.jclouds.cloudstack.predicates.NetworkPredicates.supportsPortForwarding; +import static org.jclouds.cloudstack.predicates.NetworkPredicates.supportsStaticNAT; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + import org.jclouds.cloudstack.domain.Network; import org.jclouds.cloudstack.domain.NetworkService; import org.testng.annotations.Test; +import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import static org.jclouds.cloudstack.predicates.NetworkPredicates.*; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; - /** * * @author Adrian Cole diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/OSCategoryInTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/OSCategoryInTest.java index 009ef211d4..861b1ef678 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/OSCategoryInTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/OSCategoryInTest.java @@ -19,8 +19,16 @@ package org.jclouds.cloudstack.predicates; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + +import java.util.Map; +import java.util.Set; + import org.jclouds.cloudstack.CloudStackClient; import org.jclouds.cloudstack.domain.OSType; import org.jclouds.cloudstack.domain.Template; @@ -28,15 +36,8 @@ import org.jclouds.cloudstack.features.GuestOSClient; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.Map; -import java.util.Set; - -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; /** * @author Andrei Savu diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/TemplatePredicatesTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/TemplatePredicatesTest.java index 7f92319b1b..451c5b285b 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/TemplatePredicatesTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/TemplatePredicatesTest.java @@ -18,14 +18,14 @@ */ package org.jclouds.cloudstack.predicates; -import org.jclouds.cloudstack.domain.Template; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.predicates.TemplatePredicates.isPasswordEnabled; import static org.jclouds.cloudstack.predicates.TemplatePredicates.isReady; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.jclouds.cloudstack.domain.Template; +import org.testng.annotations.Test; + /** * @author Andrei Savu */ diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/UserPredicatesTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/UserPredicatesTest.java index 74b8e6825f..7e3f3ed2e4 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/UserPredicatesTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/UserPredicatesTest.java @@ -18,11 +18,6 @@ */ package org.jclouds.cloudstack.predicates; -import org.jclouds.cloudstack.domain.Account; -import org.jclouds.cloudstack.domain.User; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.predicates.UserPredicates.apiKeyEquals; import static org.jclouds.cloudstack.predicates.UserPredicates.isAdminAccount; import static org.jclouds.cloudstack.predicates.UserPredicates.isDomainAdminAccount; @@ -31,6 +26,11 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.jclouds.cloudstack.domain.Account; +import org.jclouds.cloudstack.domain.User; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + /** * @author Andrei Savu */ diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyedTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyedTest.java index d5be70f9b5..d51711cb5b 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyedTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineDestroyedTest.java @@ -19,12 +19,6 @@ package org.jclouds.cloudstack.predicates; -import org.jclouds.cloudstack.CloudStackClient; -import org.jclouds.cloudstack.domain.VirtualMachine; -import org.jclouds.cloudstack.features.VirtualMachineClient; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; @@ -32,6 +26,12 @@ import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.jclouds.cloudstack.CloudStackClient; +import org.jclouds.cloudstack.domain.VirtualMachine; +import org.jclouds.cloudstack.features.VirtualMachineClient; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + /** * @author Andrei Savu */ diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java index c583848f5a..802afb4a55 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java @@ -19,12 +19,6 @@ package org.jclouds.cloudstack.predicates; -import org.jclouds.cloudstack.CloudStackClient; -import org.jclouds.cloudstack.domain.VirtualMachine; -import org.jclouds.cloudstack.features.VirtualMachineClient; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; @@ -32,6 +26,12 @@ import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.jclouds.cloudstack.CloudStackClient; +import org.jclouds.cloudstack.domain.VirtualMachine; +import org.jclouds.cloudstack.features.VirtualMachineClient; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + /** * @author Andrei Savu */ diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineRunningTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineRunningTest.java index 7a373f5686..05d8cbb9d1 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineRunningTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineRunningTest.java @@ -19,20 +19,20 @@ package org.jclouds.cloudstack.predicates; -import org.jclouds.cloudstack.CloudStackClient; -import org.jclouds.cloudstack.domain.VirtualMachine; -import org.jclouds.cloudstack.features.VirtualMachineClient; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -import static org.jclouds.cloudstack.domain.VirtualMachine.State; import static org.testng.Assert.assertEquals; +import org.jclouds.cloudstack.CloudStackClient; +import org.jclouds.cloudstack.domain.VirtualMachine; +import org.jclouds.cloudstack.domain.VirtualMachine.State; +import org.jclouds.cloudstack.features.VirtualMachineClient; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + /** * @author Andrei Savu */ diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/ZonePredicatesTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/ZonePredicatesTest.java index 561fce00c9..eb135bbf6b 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/ZonePredicatesTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/ZonePredicatesTest.java @@ -18,15 +18,15 @@ */ package org.jclouds.cloudstack.predicates; -import org.jclouds.cloudstack.domain.NetworkType; -import org.jclouds.cloudstack.domain.Zone; -import org.testng.annotations.Test; - import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsAdvancedNetworks; import static org.jclouds.cloudstack.predicates.ZonePredicates.supportsSecurityGroups; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.jclouds.cloudstack.domain.NetworkType; +import org.jclouds.cloudstack.domain.Zone; +import org.testng.annotations.Test; + /** * @author Andrei Savu */ diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Statistics.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Statistics.java index b44b5f335c..0387ff8f1e 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Statistics.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Statistics.java @@ -18,10 +18,10 @@ */ package org.jclouds.cloudwatch.domain; -import com.google.common.base.CaseFormat; - import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.CaseFormat; + /** * @see * diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/GetMetricStatisticsOptions.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/GetMetricStatisticsOptions.java index 8db20b9031..62eb050733 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/GetMetricStatisticsOptions.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/options/GetMetricStatisticsOptions.java @@ -18,12 +18,12 @@ */ package org.jclouds.cloudwatch.options; +import static com.google.common.base.Preconditions.checkNotNull; + import org.jclouds.aws.util.AWSUtils; import org.jclouds.cloudwatch.domain.Unit; import org.jclouds.http.options.BaseHttpRequestOptions; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Options used to control metric statistics are returned * diff --git a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/GetMetricStatisticsOptionsTest.java b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/GetMetricStatisticsOptionsTest.java index c0a54e5ddd..38c060c3de 100644 --- a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/GetMetricStatisticsOptionsTest.java +++ b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/options/GetMetricStatisticsOptionsTest.java @@ -18,14 +18,15 @@ */ package org.jclouds.cloudwatch.options; -import com.google.common.collect.ImmutableSet; -import org.jclouds.cloudwatch.domain.Unit; -import org.testng.annotations.Test; - import static org.jclouds.cloudwatch.options.GetMetricStatisticsOptions.Builder.instanceId; import static org.jclouds.cloudwatch.options.GetMetricStatisticsOptions.Builder.unit; import static org.testng.Assert.assertEquals; +import org.jclouds.cloudwatch.domain.Unit; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableSet; + /** * Tests behavior of {@code GetMetricStatisticsOptions} * diff --git a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java index 3c672c145e..83c6ab4ef9 100644 --- a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java +++ b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudAsyncClient.java @@ -36,9 +36,9 @@ import org.jclouds.deltacloud.domain.DeltacloudCollection; import org.jclouds.deltacloud.domain.HardwareProfile; import org.jclouds.deltacloud.domain.Image; import org.jclouds.deltacloud.domain.Instance; +import org.jclouds.deltacloud.domain.Instance.State; import org.jclouds.deltacloud.domain.Realm; import org.jclouds.deltacloud.domain.Transition; -import org.jclouds.deltacloud.domain.Instance.State; import org.jclouds.deltacloud.functions.ReturnVoidOnRedirectedDelete; import org.jclouds.deltacloud.options.CreateInstanceOptions; import org.jclouds.deltacloud.xml.DeltacloudCollectionsHandler; diff --git a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java index 39f4da8db7..96ab9b62b5 100644 --- a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java +++ b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudClient.java @@ -27,9 +27,9 @@ import org.jclouds.deltacloud.domain.DeltacloudCollection; import org.jclouds.deltacloud.domain.HardwareProfile; import org.jclouds.deltacloud.domain.Image; import org.jclouds.deltacloud.domain.Instance; +import org.jclouds.deltacloud.domain.Instance.State; import org.jclouds.deltacloud.domain.Realm; import org.jclouds.deltacloud.domain.Transition; -import org.jclouds.deltacloud.domain.Instance.State; import org.jclouds.deltacloud.options.CreateInstanceOptions; import org.jclouds.http.HttpRequest; diff --git a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java index 462d8d238e..a2d3c3f902 100644 --- a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java +++ b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java @@ -24,9 +24,8 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.http.HttpRequest; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java index 58d62849fa..cf83cdfce5 100644 --- a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java +++ b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java @@ -23,15 +23,14 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.deltacloud.domain.EnumHardwareProperty; import org.jclouds.deltacloud.domain.FixedHardwareProperty; import org.jclouds.deltacloud.domain.HardwareParameter; import org.jclouds.deltacloud.domain.HardwareProperty; -import org.jclouds.deltacloud.domain.RangeHardwareProperty; import org.jclouds.deltacloud.domain.HardwareProperty.Kind; +import org.jclouds.deltacloud.domain.RangeHardwareProperty; import org.jclouds.http.functions.ParseSax; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.util.SaxUtils; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java index 3be3d3fcbc..ae31df317a 100644 --- a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java +++ b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/InstanceStatesHandler.java @@ -22,11 +22,11 @@ import java.util.Map; import javax.annotation.Resource; +import org.jclouds.deltacloud.domain.Instance.Action; +import org.jclouds.deltacloud.domain.Instance.State; import org.jclouds.deltacloud.domain.Transition; import org.jclouds.deltacloud.domain.TransitionAutomatically; import org.jclouds.deltacloud.domain.TransitionOnAction; -import org.jclouds.deltacloud.domain.Instance.Action; -import org.jclouds.deltacloud.domain.Instance.State; import org.jclouds.http.functions.ParseSax; import org.jclouds.logging.Logger; import org.jclouds.util.SaxUtils; diff --git a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java index 10ed812301..487f613b9f 100644 --- a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java +++ b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/ReadOnlyDeltacloudClientLiveTest.java @@ -32,9 +32,9 @@ import org.jclouds.deltacloud.domain.DeltacloudCollection; import org.jclouds.deltacloud.domain.HardwareProfile; import org.jclouds.deltacloud.domain.Image; import org.jclouds.deltacloud.domain.Instance; +import org.jclouds.deltacloud.domain.Instance.State; import org.jclouds.deltacloud.domain.Realm; import org.jclouds.deltacloud.domain.Transition; -import org.jclouds.deltacloud.domain.Instance.State; import org.jclouds.deltacloud.predicates.InstanceFinished; import org.jclouds.deltacloud.predicates.InstanceRunning; import org.jclouds.logging.log4j.config.Log4JLoggingModule; diff --git a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java index f423b4fed0..da0bf6c7ba 100644 --- a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java +++ b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudErrorHandlerTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.deltacloud.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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.verify; import java.net.URI; diff --git a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java index 9f44994221..c74823b97d 100644 --- a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java +++ b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/handlers/DeltacloudRedirectionRetryHandlerTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.deltacloud.handlers; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import java.net.URI; diff --git a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java index 69843dcb25..8bfe63a430 100644 --- a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java +++ b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImageHandlerTest.java @@ -24,7 +24,6 @@ import java.io.InputStream; import java.net.URI; import org.jclouds.deltacloud.domain.Image; -import org.jclouds.deltacloud.xml.ImageHandler; import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.config.SaxParserModule; import org.testng.annotations.Test; diff --git a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java index e440fa729d..9cb56269e7 100644 --- a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java +++ b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/ImagesHandlerTest.java @@ -25,7 +25,6 @@ import java.net.URI; import java.util.Set; import org.jclouds.deltacloud.domain.Image; -import org.jclouds.deltacloud.xml.ImagesHandler; import org.jclouds.http.functions.BaseHandlerTest; import org.testng.annotations.Test; diff --git a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java index 3c818153ce..95daf73045 100644 --- a/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java +++ b/apis/deltacloud/src/test/java/org/jclouds/deltacloud/xml/InstanceStatesHandlerTest.java @@ -22,11 +22,11 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; +import org.jclouds.deltacloud.domain.Instance.Action; +import org.jclouds.deltacloud.domain.Instance.State; import org.jclouds.deltacloud.domain.Transition; import org.jclouds.deltacloud.domain.TransitionAutomatically; import org.jclouds.deltacloud.domain.TransitionOnAction; -import org.jclouds.deltacloud.domain.Instance.Action; -import org.jclouds.deltacloud.domain.Instance.State; import org.jclouds.http.functions.BaseHandlerTest; import org.testng.annotations.Test; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/EC2ContextBuilder.java b/apis/ec2/src/main/java/org/jclouds/ec2/EC2ContextBuilder.java index 8261230766..d5be95c855 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/EC2ContextBuilder.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/EC2ContextBuilder.java @@ -21,10 +21,10 @@ package org.jclouds.ec2; import java.util.List; import java.util.Properties; +import org.jclouds.compute.ComputeServiceContextBuilder; import org.jclouds.ec2.compute.config.EC2ComputeServiceContextModule; import org.jclouds.ec2.compute.config.EC2ResolveImagesModule; import org.jclouds.ec2.config.EC2RestClientModule; -import org.jclouds.compute.ComputeServiceContextBuilder; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.logging.jdk.config.JDKLoggingModule; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2BindComputeStrategiesByClass.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2BindComputeStrategiesByClass.java index f07ab7f3ea..0a32887794 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2BindComputeStrategiesByClass.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2BindComputeStrategiesByClass.java @@ -18,22 +18,22 @@ */ package org.jclouds.ec2.compute.config; -import org.jclouds.ec2.compute.strategy.EC2DestroyNodeStrategy; -import org.jclouds.ec2.compute.strategy.EC2GetNodeMetadataStrategy; -import org.jclouds.ec2.compute.strategy.EC2ListNodesStrategy; -import org.jclouds.ec2.compute.strategy.EC2RebootNodeStrategy; -import org.jclouds.ec2.compute.strategy.EC2CreateNodesInGroupThenAddToSet; -import org.jclouds.ec2.compute.strategy.EC2ResumeNodeStrategy; -import org.jclouds.ec2.compute.strategy.EC2SuspendNodeStrategy; import org.jclouds.compute.config.BindComputeStrategiesByClass; import org.jclouds.compute.strategy.CreateNodeWithGroupEncodedIntoName; +import org.jclouds.compute.strategy.CreateNodesInGroupThenAddToSet; import org.jclouds.compute.strategy.DestroyNodeStrategy; import org.jclouds.compute.strategy.GetNodeMetadataStrategy; import org.jclouds.compute.strategy.ListNodesStrategy; import org.jclouds.compute.strategy.RebootNodeStrategy; -import org.jclouds.compute.strategy.CreateNodesInGroupThenAddToSet; import org.jclouds.compute.strategy.ResumeNodeStrategy; import org.jclouds.compute.strategy.SuspendNodeStrategy; +import org.jclouds.ec2.compute.strategy.EC2CreateNodesInGroupThenAddToSet; +import org.jclouds.ec2.compute.strategy.EC2DestroyNodeStrategy; +import org.jclouds.ec2.compute.strategy.EC2GetNodeMetadataStrategy; +import org.jclouds.ec2.compute.strategy.EC2ListNodesStrategy; +import org.jclouds.ec2.compute.strategy.EC2RebootNodeStrategy; +import org.jclouds.ec2.compute.strategy.EC2ResumeNodeStrategy; +import org.jclouds.ec2.compute.strategy.EC2SuspendNodeStrategy; /** * @author Adrian Cole diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ResolveImagesModule.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ResolveImagesModule.java index e69656d1f7..875f160ff7 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ResolveImagesModule.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ResolveImagesModule.java @@ -18,11 +18,11 @@ */ package org.jclouds.ec2.compute.config; -import com.google.inject.AbstractModule; - -import org.jclouds.ec2.compute.strategy.EC2PopulateDefaultLoginCredentialsForImageStrategy; import org.jclouds.compute.config.ResolvesImages; import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy; +import org.jclouds.ec2.compute.strategy.EC2PopulateDefaultLoginCredentialsForImageStrategy; + +import com.google.inject.AbstractModule; /** * @author Oleksiy Yarmula diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CredentialsForInstance.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CredentialsForInstance.java index 9d906d9bce..e8c678793d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CredentialsForInstance.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/CredentialsForInstance.java @@ -34,8 +34,8 @@ import org.jclouds.ec2.domain.RunningInstance; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Supplier; -import com.google.common.cache.LoadingCache; import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; /** * diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java index 877ed21638..2f9922d437 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadata.java @@ -24,9 +24,9 @@ import static com.google.common.collect.Iterables.filter; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Set; -import java.util.Map.Entry; import javax.annotation.Resource; import javax.inject.Inject; @@ -60,10 +60,10 @@ import com.google.common.base.Supplier; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.google.common.collect.ImmutableSet.Builder; import com.google.common.util.concurrent.UncheckedExecutionException; /** diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedData.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedData.java index 5873b73f12..9faca8adce 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedData.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedData.java @@ -18,22 +18,24 @@ */ package org.jclouds.ec2.compute.functions; -import com.google.common.base.Function; -import com.google.common.base.Throwables; -import com.google.inject.Singleton; +import java.nio.charset.Charset; +import java.security.KeyFactory; +import java.security.PrivateKey; +import java.security.spec.KeySpec; + +import javax.annotation.Nullable; +import javax.crypto.Cipher; +import javax.inject.Inject; + import org.jclouds.crypto.Crypto; import org.jclouds.crypto.Pems; import org.jclouds.domain.LoginCredentials; import org.jclouds.ec2.compute.domain.PasswordDataAndPrivateKey; import org.jclouds.encryption.internal.Base64; -import javax.annotation.Nullable; -import javax.crypto.Cipher; -import javax.inject.Inject; -import java.nio.charset.Charset; -import java.security.KeyFactory; -import java.security.PrivateKey; -import java.security.spec.KeySpec; +import com.google.common.base.Function; +import com.google.common.base.Throwables; +import com.google.inject.Singleton; /** * Given an encrypted Windows Administrator password and the decryption key, return a LoginCredentials instance. diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java index cb58017980..dbcaa08e14 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/EC2CreateNodesInGroupThenAddToSet.java @@ -57,9 +57,9 @@ import com.google.common.base.Joiner; import com.google.common.base.Predicate; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; -import com.google.common.collect.ImmutableSet.Builder; /** * creates futures that correlate to diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java index 124075b714..231bcb0f4d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/EC2ImageSupplier.java @@ -25,8 +25,8 @@ import static org.jclouds.ec2.reference.EC2Constants.PROPERTY_EC2_AMI_OWNERS; import java.util.Collections; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import javax.annotation.Resource; import javax.inject.Inject; @@ -47,9 +47,9 @@ import com.google.common.base.Predicates; import com.google.common.base.Supplier; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import com.google.common.collect.ImmutableMap.Builder; /** * diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/RegionAndNameToImageSupplier.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/RegionAndNameToImageSupplier.java index d9f53b8532..1769f3c496 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/RegionAndNameToImageSupplier.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/suppliers/RegionAndNameToImageSupplier.java @@ -30,9 +30,9 @@ import org.jclouds.compute.domain.Image; import org.jclouds.ec2.compute.domain.RegionAndName; 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; /** * diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/config/EC2RestClientModule.java b/apis/ec2/src/main/java/org/jclouds/ec2/config/EC2RestClientModule.java index 13f4abbc12..0495303dd3 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/config/EC2RestClientModule.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/config/EC2RestClientModule.java @@ -20,7 +20,6 @@ package org.jclouds.ec2.config; import java.util.Map; - import org.jclouds.aws.config.WithZonesFormSigningRestClientModule; import org.jclouds.ec2.EC2AsyncClient; import org.jclouds.ec2.EC2Client; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Attachment.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Attachment.java index e9caf2c56d..0f1e79bc89 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Attachment.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Attachment.java @@ -18,10 +18,10 @@ */ package org.jclouds.ec2.domain; -import java.util.Date; - import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Date; + /** * @author Adrian Cole * @see diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeDetached.java b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeDetached.java index fe94895be0..2f507fda1a 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeDetached.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/predicates/VolumeDetached.java @@ -19,18 +19,19 @@ package org.jclouds.ec2.predicates; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; -import com.google.inject.Inject; -import com.google.inject.Singleton; +import static com.google.common.collect.Iterables.getLast; + +import javax.annotation.Resource; + import org.jclouds.ec2.domain.Attachment; import org.jclouds.ec2.domain.Volume; import org.jclouds.ec2.services.ElasticBlockStoreClient; import org.jclouds.logging.Logger; -import javax.annotation.Resource; - -import static com.google.common.collect.Iterables.getLast; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import com.google.inject.Inject; +import com.google.inject.Singleton; /** * Tests to see if a volume is detached. diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/AMIAsyncClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/AMIAsyncClient.java index 3fb9277044..19e87c0b70 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/AMIAsyncClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/AMIAsyncClient.java @@ -24,7 +24,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Map; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -34,8 +33,8 @@ import org.jclouds.ec2.EC2AsyncClient; import org.jclouds.ec2.binders.BindUserGroupsToIndexedFormParams; import org.jclouds.ec2.binders.BindUserIdsToIndexedFormParams; import org.jclouds.ec2.domain.Image; -import org.jclouds.ec2.domain.Permission; import org.jclouds.ec2.domain.Image.EbsBlockDevice; +import org.jclouds.ec2.domain.Permission; import org.jclouds.ec2.options.CreateImageOptions; import org.jclouds.ec2.options.DescribeImagesOptions; import org.jclouds.ec2.options.RegisterImageBackedByEbsOptions; @@ -44,6 +43,7 @@ import org.jclouds.ec2.xml.BlockDeviceMappingHandler; import org.jclouds.ec2.xml.DescribeImagesResponseHandler; import org.jclouds.ec2.xml.ImageIdHandler; import org.jclouds.ec2.xml.PermissionHandler; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/AMIClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/AMIClient.java index fc314782c4..43717b91bf 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/AMIClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/AMIClient.java @@ -22,16 +22,15 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.Image; -import org.jclouds.ec2.domain.Permission; import org.jclouds.ec2.domain.Image.EbsBlockDevice; +import org.jclouds.ec2.domain.Permission; import org.jclouds.ec2.options.CreateImageOptions; import org.jclouds.ec2.options.DescribeImagesOptions; import org.jclouds.ec2.options.RegisterImageBackedByEbsOptions; import org.jclouds.ec2.options.RegisterImageOptions; +import org.jclouds.javax.annotation.Nullable; /** * Provides access to EC2 via their REST API. diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionAsyncClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionAsyncClient.java index 402a05b7a9..d3a9d67861 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionAsyncClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionAsyncClient.java @@ -25,7 +25,6 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -36,6 +35,7 @@ import org.jclouds.ec2.options.DescribeAvailabilityZonesOptions; import org.jclouds.ec2.options.DescribeRegionsOptions; import org.jclouds.ec2.xml.DescribeAvailabilityZonesResponseHandler; import org.jclouds.ec2.xml.DescribeRegionsResponseHandler; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClient.java index acfd3f2d0a..3d1eff334d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClient.java @@ -23,12 +23,11 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - +import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.AvailabilityZoneInfo; import org.jclouds.ec2.options.DescribeAvailabilityZonesOptions; import org.jclouds.ec2.options.DescribeRegionsOptions; -import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; /** * Provides EC2 Availability Zones and Regions services for EC2. diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreAsyncClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreAsyncClient.java index 579eedb67e..2e7ff1ea78 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreAsyncClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreAsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -47,6 +46,7 @@ import org.jclouds.ec2.xml.DescribeSnapshotsResponseHandler; import org.jclouds.ec2.xml.DescribeVolumesResponseHandler; import org.jclouds.ec2.xml.PermissionHandler; import org.jclouds.ec2.xml.SnapshotHandler; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.location.functions.ZoneToEndpoint; import org.jclouds.rest.annotations.BinderParam; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreClient.java index d58e3c4069..ffb1f865d5 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreClient.java @@ -21,8 +21,7 @@ package org.jclouds.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - +import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.Attachment; import org.jclouds.ec2.domain.Permission; import org.jclouds.ec2.domain.Snapshot; @@ -30,7 +29,7 @@ import org.jclouds.ec2.domain.Volume; import org.jclouds.ec2.options.CreateSnapshotOptions; import org.jclouds.ec2.options.DescribeSnapshotsOptions; import org.jclouds.ec2.options.DetachVolumeOptions; -import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; /** * Provides access to EC2 Elastic Block Store services. diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressAsyncClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressAsyncClient.java index dcc22ace61..b435b9f5af 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressAsyncClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressAsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -34,6 +33,7 @@ import org.jclouds.ec2.binders.BindPublicIpsToIndexedFormParams; import org.jclouds.ec2.domain.PublicIpInstanceIdPair; import org.jclouds.ec2.xml.AllocateAddressResponseHandler; import org.jclouds.ec2.xml.DescribeAddressesResponseHandler; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressClient.java index 50c22df929..921b655b44 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressClient.java @@ -21,11 +21,10 @@ package org.jclouds.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.aws.AWSResponseException; import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.PublicIpInstanceIdPair; +import org.jclouds.javax.annotation.Nullable; /** * Provides access to EC2 via their REST API. diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceAsyncClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceAsyncClient.java index 1601dd17a6..81917d44ae 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceAsyncClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceAsyncClient.java @@ -24,7 +24,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Map; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -50,6 +49,7 @@ import org.jclouds.ec2.xml.InstanceTypeHandler; import org.jclouds.ec2.xml.RunInstancesResponseHandler; import org.jclouds.ec2.xml.StringValueHandler; import org.jclouds.ec2.xml.UnencodeStringValueHandler; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceClient.java index c67b37357f..4f9071e2bf 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceClient.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.BlockDevice; import org.jclouds.ec2.domain.InstanceState; @@ -32,6 +30,7 @@ import org.jclouds.ec2.domain.Reservation; import org.jclouds.ec2.domain.RunningInstance; import org.jclouds.ec2.domain.Volume.InstanceInitiatedShutdownBehavior; import org.jclouds.ec2.options.RunInstancesOptions; +import org.jclouds.javax.annotation.Nullable; /** * Provides access to EC2 via their REST API. diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairAsyncClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairAsyncClient.java index f7827e8c3a..f243b7f284 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairAsyncClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairAsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -34,6 +33,7 @@ import org.jclouds.ec2.binders.BindKeyNamesToIndexedFormParams; import org.jclouds.ec2.domain.KeyPair; import org.jclouds.ec2.xml.DescribeKeyPairsResponseHandler; import org.jclouds.ec2.xml.KeyPairResponseHandler; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairClient.java index 61ccacc2bb..b2aea7747d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairClient.java @@ -21,10 +21,9 @@ package org.jclouds.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - -import org.jclouds.ec2.domain.KeyPair; import org.jclouds.concurrent.Timeout; +import org.jclouds.ec2.domain.KeyPair; +import org.jclouds.javax.annotation.Nullable; /** * Provides access to EC2 via their REST API. diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupAsyncClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupAsyncClient.java index 39df7357de..15ee1884d1 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupAsyncClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupAsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -36,6 +35,7 @@ import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.domain.UserIdGroupPair; import org.jclouds.ec2.xml.DescribeSecurityGroupsResponseHandler; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java index e6f412ca1e..dcf5f94d2f 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java @@ -21,12 +21,11 @@ package org.jclouds.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - +import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.domain.UserIdGroupPair; -import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; /** * Provides access to EC2 via their REST API. diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsAsyncClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsAsyncClient.java index 42d1f99a3b..b354836a07 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsAsyncClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsAsyncClient.java @@ -23,9 +23,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import org.jclouds.ec2.domain.PasswordData; -import org.jclouds.ec2.xml.GetPasswordDataResponseHandler; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -35,9 +32,12 @@ import org.jclouds.ec2.EC2AsyncClient; import org.jclouds.ec2.binders.BindBundleIdsToIndexedFormParams; import org.jclouds.ec2.binders.BindS3UploadPolicyAndSignature; import org.jclouds.ec2.domain.BundleTask; +import org.jclouds.ec2.domain.PasswordData; import org.jclouds.ec2.options.BundleInstanceS3StorageOptions; import org.jclouds.ec2.xml.BundleTaskHandler; import org.jclouds.ec2.xml.DescribeBundleTasksResponseHandler; +import org.jclouds.ec2.xml.GetPasswordDataResponseHandler; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsClient.java index 5a1af0e0ad..86bd7cb136 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsClient.java @@ -18,15 +18,15 @@ */ package org.jclouds.ec2.services; +import java.util.Set; +import java.util.concurrent.TimeUnit; + import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.BundleTask; import org.jclouds.ec2.domain.PasswordData; import org.jclouds.ec2.options.BundleInstanceS3StorageOptions; import org.jclouds.javax.annotation.Nullable; -import java.util.Set; -import java.util.concurrent.TimeUnit; - /** * Provides windows services for EC2. For more information, refer to the Amazon * EC2 Developer Guide. diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegion.java b/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegion.java index 63eab5cb6e..e1988a3606 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegion.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegion.java @@ -37,10 +37,10 @@ import org.jclouds.util.Suppliers2; import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import com.google.common.collect.ImmutableMap.Builder; @Singleton public class DescribeAvailabilityZonesInRegion implements RegionIdToZoneIdsSupplier { diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/BlockDeviceMappingHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/BlockDeviceMappingHandler.java index 60ea6f09b8..2b025a9498 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/BlockDeviceMappingHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/BlockDeviceMappingHandler.java @@ -21,13 +21,13 @@ package org.jclouds.ec2.xml; import java.util.Date; import java.util.Map; -import com.google.inject.Inject; +import org.jclouds.date.DateService; import org.jclouds.ec2.domain.Attachment; import org.jclouds.ec2.domain.BlockDevice; -import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; import com.google.common.collect.Maps; +import com.google.inject.Inject; /** * diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java index 2e11c937eb..e0c92b2f86 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java @@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import javax.annotation.Resource; import javax.inject.Inject; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java index 9624a77623..e681266e81 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/DescribeImagesResponseHandler.java @@ -27,12 +27,12 @@ import javax.inject.Inject; import org.jclouds.aws.util.AWSUtils; import org.jclouds.ec2.domain.Hypervisor; import org.jclouds.ec2.domain.Image; -import org.jclouds.ec2.domain.RootDeviceType; -import org.jclouds.ec2.domain.VirtualizationType; import org.jclouds.ec2.domain.Image.Architecture; import org.jclouds.ec2.domain.Image.EbsBlockDevice; import org.jclouds.ec2.domain.Image.ImageState; import org.jclouds.ec2.domain.Image.ImageType; +import org.jclouds.ec2.domain.RootDeviceType; +import org.jclouds.ec2.domain.VirtualizationType; import org.jclouds.http.functions.ParseSax; import org.jclouds.location.Region; import org.jclouds.logging.Logger; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/GetPasswordDataResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/GetPasswordDataResponseHandler.java index 3cdd7d80e9..edbaf316f4 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/GetPasswordDataResponseHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/GetPasswordDataResponseHandler.java @@ -18,12 +18,12 @@ */ package org.jclouds.ec2.xml; +import javax.inject.Inject; + import org.jclouds.date.DateService; import org.jclouds.ec2.domain.PasswordData; import org.jclouds.http.functions.ParseSax; -import javax.inject.Inject; - /** * @author Richard Downer */ diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java index a007730cdd..f83af9a86c 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java @@ -38,6 +38,7 @@ import org.jclouds.compute.BaseVersionedServiceLiveTest; import org.jclouds.compute.domain.ExecResponse; import org.jclouds.domain.LoginCredentials; import org.jclouds.ec2.domain.BlockDevice; +import org.jclouds.ec2.domain.Image.EbsBlockDevice; import org.jclouds.ec2.domain.InstanceState; import org.jclouds.ec2.domain.InstanceType; import org.jclouds.ec2.domain.IpProtocol; @@ -45,7 +46,6 @@ import org.jclouds.ec2.domain.KeyPair; import org.jclouds.ec2.domain.PublicIpInstanceIdPair; import org.jclouds.ec2.domain.Reservation; import org.jclouds.ec2.domain.RunningInstance; -import org.jclouds.ec2.domain.Image.EbsBlockDevice; import org.jclouds.ec2.domain.Volume.InstanceInitiatedShutdownBehavior; import org.jclouds.ec2.predicates.InstanceHasIpAddress; import org.jclouds.ec2.predicates.InstanceStateRunning; 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 a11fa1dcdf..233cc93a47 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 @@ -23,6 +23,7 @@ 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; 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 7a9cca15f5..a15384fbd6 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 @@ -19,9 +19,9 @@ package org.jclouds.ec2.compute; import static java.lang.String.format; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c1_medium; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.c1_xlarge; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.cc1_4xlarge; @@ -63,9 +63,9 @@ import com.google.common.base.Function; 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.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModuleTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModuleTest.java index 9e600e96d8..96b898a9a7 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModuleTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/config/EC2ComputeServiceContextModuleTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.ec2.compute.config; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.fail; import org.jclouds.compute.domain.Image; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateSecurityGroupIfNeededTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateSecurityGroupIfNeededTest.java index ceaea5e117..cba89fe0d1 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateSecurityGroupIfNeededTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateSecurityGroupIfNeededTest.java @@ -18,12 +18,12 @@ */ package org.jclouds.ec2.compute.functions; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.util.Set; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPairTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPairTest.java index 6f8b9a5be5..a2ed330bbf 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPairTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/CreateUniqueKeyPairTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.ec2.compute.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.net.UnknownHostException; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/LoadPublicIpForInstanceOrNullTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/LoadPublicIpForInstanceOrNullTest.java index f6d43afd48..fa9c47bbbe 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/LoadPublicIpForInstanceOrNullTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/LoadPublicIpForInstanceOrNullTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.ec2.compute.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import org.jclouds.ec2.EC2Client; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RegionAndIdToImageTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RegionAndIdToImageTest.java index e71deb30f6..3efd76d516 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RegionAndIdToImageTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RegionAndIdToImageTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.ec2.compute.functions; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.createNiceMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.jclouds.ec2.options.DescribeImagesOptions.Builder.imageIds; import static org.testng.Assert.assertEquals; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java index ea5ffa832f..7370e74ddf 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java @@ -47,9 +47,9 @@ import org.testng.annotations.Test; 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.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedDataTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedDataTest.java index e8ebd12c36..b57bb2f66f 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedDataTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/WindowsLoginCredentialsFromEncryptedDataTest.java @@ -18,6 +18,9 @@ */ package org.jclouds.ec2.compute.functions; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; + import org.jclouds.crypto.Crypto; import org.jclouds.domain.LoginCredentials; import org.jclouds.ec2.compute.domain.PasswordDataAndPrivateKey; @@ -25,9 +28,6 @@ import org.jclouds.ec2.domain.PasswordData; import org.jclouds.encryption.bouncycastle.BouncyCastleCrypto; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; - /** * @author Richard Downer */ diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java index bcc1b5b906..d07797015e 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.ec2.compute.strategy; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.lang.reflect.Method; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategyTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategyTest.java index 3cb34bd08a..4304527960 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategyTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/strategy/EC2DestroyNodeStrategyTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.ec2.compute.strategy; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.util.concurrent.ExecutionException; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/predicates/VolumeDetachedTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/predicates/VolumeDetachedTest.java index 76ea1a07cc..0bd903c5e4 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/predicates/VolumeDetachedTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/predicates/VolumeDetachedTest.java @@ -19,25 +19,25 @@ package org.jclouds.ec2.predicates; -import org.jclouds.ec2.domain.Attachment; -import org.jclouds.ec2.domain.Volume; -import org.jclouds.ec2.services.ElasticBlockStoreClient; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - -import java.util.Date; -import java.util.Set; - import static com.google.common.collect.Sets.newHashSet; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -import static org.jclouds.ec2.domain.Attachment.Status; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import java.util.Date; +import java.util.Set; + +import org.jclouds.ec2.domain.Attachment; +import org.jclouds.ec2.domain.Attachment.Status; +import org.jclouds.ec2.domain.Volume; +import org.jclouds.ec2.services.ElasticBlockStoreClient; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + /** * @author Andrei Savu */ diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java index 8c7eb9060e..ef8a59dcdb 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClientLiveTest.java @@ -25,10 +25,10 @@ import static org.testng.Assert.assertNotNull; import java.net.URI; import java.util.Iterator; +import java.util.Map.Entry; import java.util.Properties; import java.util.Set; import java.util.SortedMap; -import java.util.Map.Entry; import org.jclouds.aws.domain.Region; import org.jclouds.compute.BaseVersionedServiceLiveTest; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticBlockStoreClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticBlockStoreClientLiveTest.java index 4655c5f0ce..a1f50b76ae 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticBlockStoreClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/ElasticBlockStoreClientLiveTest.java @@ -18,7 +18,6 @@ */ package org.jclouds.ec2.services; -import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.ec2.options.DescribeSnapshotsOptions.Builder.snapshotIds; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -28,7 +27,6 @@ import java.util.Set; import java.util.SortedSet; import java.util.concurrent.TimeUnit; -import org.jclouds.Constants; import org.jclouds.aws.domain.Region; import org.jclouds.compute.BaseVersionedServiceLiveTest; import org.jclouds.compute.ComputeServiceContextFactory; @@ -42,7 +40,6 @@ import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.jclouds.predicates.RetryablePredicate; import org.jclouds.rest.RestContext; import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java index 3f1b888eaf..4c47ba7178 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java @@ -18,11 +18,16 @@ */ package org.jclouds.ec2.services; -import com.google.common.base.Predicate; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.inject.Module; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +import javax.annotation.Nullable; + import org.jclouds.compute.BaseVersionedServiceLiveTest; import org.jclouds.compute.ComputeService; import org.jclouds.compute.ComputeServiceContext; @@ -48,14 +53,11 @@ import org.jclouds.rest.RestContext; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -import javax.annotation.Nullable; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.TimeUnit; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; +import com.google.common.base.Predicate; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.inject.Module; /** * Tests behavior of {@code WindowsClient} diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegionTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegionTest.java index d9b83f4edd..dd4f00ba37 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegionTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/suppliers/DescribeAvailabilityZonesInRegionTest.java @@ -24,7 +24,6 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; import java.util.Collections; -import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -32,7 +31,6 @@ import org.easymock.classextension.IMocksControl; import org.jclouds.ec2.EC2Client; import org.jclouds.ec2.domain.AvailabilityZoneInfo; import org.jclouds.ec2.services.AvailabilityZoneAndRegionClient; -import org.jclouds.ec2.suppliers.DescribeAvailabilityZonesInRegion; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpResponseException; import org.testng.annotations.Test; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/AttachmentHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/AttachmentHandlerTest.java index b70324b5d6..42eae297bf 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/AttachmentHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/AttachmentHandlerTest.java @@ -18,15 +18,15 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; -import org.jclouds.ec2.domain.Attachment; import org.jclouds.date.DateService; +import org.jclouds.ec2.domain.Attachment; import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/BlockDeviceMappingHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/BlockDeviceMappingHandlerTest.java index e4952ce336..ed14f9a177 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/BlockDeviceMappingHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/BlockDeviceMappingHandlerTest.java @@ -23,9 +23,9 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; import java.util.Map; +import org.jclouds.date.DateService; import org.jclouds.ec2.domain.Attachment; import org.jclouds.ec2.domain.BlockDevice; -import org.jclouds.date.DateService; import org.jclouds.http.functions.BaseHandlerTest; import org.testng.annotations.Test; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/BundleTaskHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/BundleTaskHandlerTest.java index 54d52cefe9..9b32b22d22 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/BundleTaskHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/BundleTaskHandlerTest.java @@ -18,15 +18,15 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; -import org.jclouds.ec2.domain.BundleTask; import org.jclouds.date.DateService; +import org.jclouds.ec2.domain.BundleTask; import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/CreateVolumeResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/CreateVolumeResponseHandlerTest.java index aadef402d3..de74595025 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/CreateVolumeResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/CreateVolumeResponseHandlerTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandlerTest.java index 2895d677b5..2cee791718 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeAddressesResponseHandlerTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeBundleTasksResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeBundleTasksResponseHandlerTest.java index 63329ad395..0f37a5f909 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeBundleTasksResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeBundleTasksResponseHandlerTest.java @@ -18,15 +18,15 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; -import org.jclouds.ec2.domain.BundleTask; import org.jclouds.date.DateService; +import org.jclouds.ec2.domain.BundleTask; import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeImagesResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeImagesResponseHandlerTest.java index d1fbeb39c8..299a694694 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeImagesResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeImagesResponseHandlerTest.java @@ -26,12 +26,12 @@ import java.util.Set; import org.jclouds.ec2.compute.functions.EC2ImageParserTest; import org.jclouds.ec2.domain.Hypervisor; import org.jclouds.ec2.domain.Image; -import org.jclouds.ec2.domain.RootDeviceType; -import org.jclouds.ec2.domain.VirtualizationType; import org.jclouds.ec2.domain.Image.Architecture; import org.jclouds.ec2.domain.Image.EbsBlockDevice; import org.jclouds.ec2.domain.Image.ImageState; import org.jclouds.ec2.domain.Image.ImageType; +import org.jclouds.ec2.domain.RootDeviceType; +import org.jclouds.ec2.domain.VirtualizationType; import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.config.SaxParserModule; import org.jclouds.location.Region; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeKeyPairsResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeKeyPairsResponseHandlerTest.java index d569f2b733..099a7af5dd 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeKeyPairsResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeKeyPairsResponseHandlerTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandlerTest.java index c85158b7a5..54136650df 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandlerTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSnapshotsResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSnapshotsResponseHandlerTest.java index f731a31060..0cf270b349 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSnapshotsResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSnapshotsResponseHandlerTest.java @@ -18,16 +18,16 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; import java.util.Set; -import org.jclouds.ec2.domain.Snapshot; import org.jclouds.date.DateService; +import org.jclouds.ec2.domain.Snapshot; import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeVolumesResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeVolumesResponseHandlerTest.java index 9a3988708a..28866a7cce 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeVolumesResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeVolumesResponseHandlerTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/InstanceStateChangeHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/InstanceStateChangeHandlerTest.java index b1e3131933..a03cdef69e 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/InstanceStateChangeHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/InstanceStateChangeHandlerTest.java @@ -18,17 +18,17 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; import java.util.Set; +import org.jclouds.date.DateService; import org.jclouds.ec2.domain.InstanceState; import org.jclouds.ec2.domain.InstanceStateChange; -import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.BeforeTest; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/KeyPairResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/KeyPairResponseHandlerTest.java index bf29fef2ba..fb3908c8d3 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/KeyPairResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/KeyPairResponseHandlerTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.IOException; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/RunInstancesResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/RunInstancesResponseHandlerTest.java index 6c4199543a..a1b087da2d 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/RunInstancesResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/RunInstancesResponseHandlerTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/SnapshotHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/SnapshotHandlerTest.java index 71d8bbac62..93253fa0e4 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/SnapshotHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/SnapshotHandlerTest.java @@ -18,15 +18,15 @@ */ package org.jclouds.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; -import org.jclouds.ec2.domain.Snapshot; import org.jclouds.date.DateService; +import org.jclouds.ec2.domain.Snapshot; import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/config/ElasticStackComputeServiceContextModule.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/config/ElasticStackComputeServiceContextModule.java index 19f7e43533..d98a4c388c 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/config/ElasticStackComputeServiceContextModule.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/config/ElasticStackComputeServiceContextModule.java @@ -38,10 +38,10 @@ import org.jclouds.elasticstack.ElasticStackAsyncClient; import org.jclouds.elasticstack.ElasticStackClient; import org.jclouds.elasticstack.compute.ElasticStackComputeServiceAdapter; import org.jclouds.elasticstack.compute.functions.ServerInfoToNodeMetadata; -import org.jclouds.elasticstack.compute.functions.WellKnownImageToImage; import org.jclouds.elasticstack.compute.functions.ServerInfoToNodeMetadata.DeviceToVolume; import org.jclouds.elasticstack.compute.functions.ServerInfoToNodeMetadata.FindImageForId; import org.jclouds.elasticstack.compute.functions.ServerInfoToNodeMetadata.GetImageIdFromServer; +import org.jclouds.elasticstack.compute.functions.WellKnownImageToImage; import org.jclouds.elasticstack.domain.Device; import org.jclouds.elasticstack.domain.DriveInfo; import org.jclouds.elasticstack.domain.Server; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/config/ElasticStackRestClientModule.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/config/ElasticStackRestClientModule.java index 9a9008df24..c0c0cc2b42 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/config/ElasticStackRestClientModule.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/config/ElasticStackRestClientModule.java @@ -33,11 +33,11 @@ import org.jclouds.elasticstack.domain.ServerMetrics; import org.jclouds.elasticstack.functions.CreateDriveRequestToMap; import org.jclouds.elasticstack.functions.DriveDataToMap; import org.jclouds.elasticstack.functions.MapToDevices; -import org.jclouds.elasticstack.functions.ServerToMap; import org.jclouds.elasticstack.functions.MapToDevices.DeviceToId; import org.jclouds.elasticstack.functions.MapToDriveMetrics; import org.jclouds.elasticstack.functions.MapToNICs; import org.jclouds.elasticstack.functions.MapToServerMetrics; +import org.jclouds.elasticstack.functions.ServerToMap; import org.jclouds.elasticstack.handlers.ElasticStackErrorHandler; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.RequiresHttp; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/CreateDriveRequest.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/CreateDriveRequest.java index d2b0f9c8bb..d2fc2e9bf5 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/CreateDriveRequest.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/CreateDriveRequest.java @@ -25,7 +25,6 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; - import com.google.common.collect.ImmutableSet; /** diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Drive.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Drive.java index 06aed35a16..5e61ffd759 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Drive.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Drive.java @@ -25,7 +25,6 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; - import com.google.common.collect.ImmutableSet; /** diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/DriveInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/DriveInfo.java index a1c403081c..62c62c3006 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/DriveInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/DriveInfo.java @@ -25,7 +25,6 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; - import com.google.common.collect.ImmutableSet; /** diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java index a4ffc8218e..25f6fe4f63 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/BaseDriveToMap.java @@ -25,8 +25,8 @@ import java.util.Map.Entry; import javax.inject.Singleton; -import org.jclouds.elasticstack.domain.Drive; import org.jclouds.elasticstack.domain.ClaimType; +import org.jclouds.elasticstack.domain.Drive; import com.google.common.base.Function; import com.google.common.base.Joiner; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToNICs.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToNICs.java index b4a12fd75f..d4fffc1326 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToNICs.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToNICs.java @@ -23,14 +23,14 @@ import java.util.Map; import javax.inject.Singleton; -import com.google.inject.Inject; import org.jclouds.elasticstack.domain.Model; import org.jclouds.elasticstack.domain.NIC; +import org.jclouds.rest.annotations.ApiVersion; import com.google.common.base.Function; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import org.jclouds.rest.annotations.ApiVersion; +import com.google.inject.Inject; /** * @author Adrian Cole diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java index f9170e9cd9..98b6f98667 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java @@ -18,18 +18,25 @@ */ package org.jclouds.elasticstack.functions; -import com.google.common.base.Function; -import com.google.common.base.Splitter; -import com.google.common.collect.Maps; -import org.jclouds.elasticstack.domain.*; - -import javax.inject.Inject; -import javax.inject.Singleton; import java.util.Date; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import javax.inject.Inject; +import javax.inject.Singleton; + +import org.jclouds.elasticstack.domain.Device; +import org.jclouds.elasticstack.domain.NIC; +import org.jclouds.elasticstack.domain.ServerInfo; +import org.jclouds.elasticstack.domain.ServerMetrics; +import org.jclouds.elasticstack.domain.ServerStatus; +import org.jclouds.elasticstack.domain.VNC; + +import com.google.common.base.Function; +import com.google.common.base.Splitter; +import com.google.common.collect.Maps; + /** * @author Adrian Cole */ diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindServerToPlainTextStringTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindServerToPlainTextStringTest.java index 16a760eaf2..d4972ecf00 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindServerToPlainTextStringTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindServerToPlainTextStringTest.java @@ -18,6 +18,25 @@ */ package org.jclouds.elasticstack.binders; +import static org.testng.Assert.assertEquals; + +import java.io.IOException; +import java.net.URI; +import java.util.Map; + +import javax.ws.rs.core.MediaType; + +import org.jclouds.elasticstack.domain.IDEDevice; +import org.jclouds.elasticstack.domain.Model; +import org.jclouds.elasticstack.domain.NIC; +import org.jclouds.elasticstack.domain.Server; +import org.jclouds.elasticstack.domain.VNC; +import org.jclouds.elasticstack.functions.ServerToMap; +import org.jclouds.http.HttpRequest; +import org.jclouds.rest.annotations.ApiVersion; +import org.jclouds.util.Strings2; +import org.testng.annotations.Test; + import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -25,19 +44,6 @@ import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.TypeLiteral; -import org.jclouds.elasticstack.domain.*; -import org.jclouds.elasticstack.functions.ServerToMap; -import org.jclouds.http.HttpRequest; -import org.jclouds.rest.annotations.ApiVersion; -import org.jclouds.util.Strings2; -import org.testng.annotations.Test; - -import javax.ws.rs.core.MediaType; -import java.io.IOException; -import java.net.URI; -import java.util.Map; - -import static org.testng.Assert.assertEquals; /** * diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/BaseDriveToMapTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/BaseDriveToMapTest.java index 7fd57fdc9a..d354dcaad2 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/BaseDriveToMapTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/BaseDriveToMapTest.java @@ -22,8 +22,8 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; -import org.jclouds.elasticstack.domain.Drive; import org.jclouds.elasticstack.domain.ClaimType; +import org.jclouds.elasticstack.domain.Drive; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/SplitNewlinesTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/SplitNewlinesTest.java index 905f13d6f3..16cf5aa15b 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/SplitNewlinesTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/SplitNewlinesTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; import java.util.Set; -import org.jclouds.elasticstack.functions.SplitNewlines; import org.jclouds.http.HttpResponse; import org.jclouds.io.Payloads; import org.testng.annotations.Test; diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandlerTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandlerTest.java index fa5c0314a4..431427d548 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandlerTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandlerTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.elasticstack.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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.verify; import java.net.URI; diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java index 6b78459951..e6c3ade4db 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java @@ -54,7 +54,6 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.concurrent.ExecutorService; -import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; @@ -97,6 +96,7 @@ import org.jclouds.http.HttpResponseException; import org.jclouds.http.options.HttpRequestOptions; import org.jclouds.io.Payloads; import org.jclouds.io.payloads.BaseMutableContentMetadata; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.logging.Logger; import org.jclouds.rest.annotations.ParamValidators; diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStoreContextBuilder.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStoreContextBuilder.java index bd2f26fdfe..08a44ca6b9 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStoreContextBuilder.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStoreContextBuilder.java @@ -18,15 +18,17 @@ */ package org.jclouds.filesystem; -import com.google.inject.Module; import java.util.List; import java.util.Properties; + import org.jclouds.blobstore.AsyncBlobStore; import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContextBuilder; import org.jclouds.filesystem.config.FilesystemBlobStoreContextModule; import org.jclouds.filesystem.config.FilesystemBlobStoreModule; +import com.google.inject.Module; + /** * * @author Alfredo "Rainbowbreeze" Morresi diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStorePropertiesBuilder.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStorePropertiesBuilder.java index 04a549b430..4da3e86741 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStorePropertiesBuilder.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStorePropertiesBuilder.java @@ -25,11 +25,12 @@ package org.jclouds.filesystem; import static org.jclouds.Constants.PROPERTY_API_VERSION; import static org.jclouds.Constants.PROPERTY_ENDPOINT; -import static org.jclouds.Constants.PROPERTY_IO_WORKER_THREADS; import static org.jclouds.Constants.PROPERTY_IDENTITY; +import static org.jclouds.Constants.PROPERTY_IO_WORKER_THREADS; import static org.jclouds.Constants.PROPERTY_USER_THREADS; import java.util.Properties; + import org.jclouds.PropertiesBuilder; /** diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/predicates/validators/internal/FilesystemBlobKeyValidatorTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/predicates/validators/internal/FilesystemBlobKeyValidatorTest.java index 3da17b719f..932bf1ee4b 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/predicates/validators/internal/FilesystemBlobKeyValidatorTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/predicates/validators/internal/FilesystemBlobKeyValidatorTest.java @@ -18,12 +18,13 @@ */ package org.jclouds.filesystem.predicates.validators.internal; +import static org.testng.Assert.fail; + import java.io.File; + import org.jclouds.filesystem.predicates.validators.FilesystemBlobKeyValidator; import org.testng.annotations.Test; -import static org.testng.Assert.*; - /** * Test class for {@link FilesystemBlobKeyValidator } class diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/predicates/validators/internal/FilesystemContainerNameValidatorTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/predicates/validators/internal/FilesystemContainerNameValidatorTest.java index d45169dc40..ff6c8c704c 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/predicates/validators/internal/FilesystemContainerNameValidatorTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/predicates/validators/internal/FilesystemContainerNameValidatorTest.java @@ -18,12 +18,13 @@ */ package org.jclouds.filesystem.predicates.validators.internal; -import org.jclouds.filesystem.predicates.validators.internal.FilesystemBlobKeyValidatorImpl; -import java.io.File; -import org.jclouds.filesystem.predicates.validators.FilesystemBlobKeyValidator; -import org.testng.annotations.Test; +import static org.testng.Assert.fail; -import static org.testng.Assert.*; +import java.io.File; + +import org.jclouds.filesystem.predicates.validators.FilesystemBlobKeyValidator; +import org.jclouds.filesystem.predicates.validators.FilesystemContainerNameValidator; +import org.testng.annotations.Test; /** diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/utils/TestUtils.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/utils/TestUtils.java index d9ea6c05ff..d430a05c8b 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/utils/TestUtils.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/utils/TestUtils.java @@ -18,16 +18,18 @@ */ package org.jclouds.filesystem.utils; -import java.util.Arrays; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; import java.io.InputStream; +import java.util.Arrays; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import java.io.File; -import java.io.IOException; -import org.apache.commons.io.FileUtils; -import static org.testng.Assert.*; +import org.apache.commons.io.FileUtils; /** * Utility class for test diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java index b1bfc936f9..2fbfa44b0f 100644 --- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java +++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaAsyncClient.java @@ -18,22 +18,45 @@ */ package org.jclouds.openstack.nova; -import com.google.common.util.concurrent.ListenableFuture; +import java.util.Set; +import java.util.concurrent.ExecutionException; + +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + import org.jclouds.openstack.filters.AddTimestampQuery; import org.jclouds.openstack.filters.AuthenticateRequest; -import org.jclouds.openstack.nova.domain.*; +import org.jclouds.openstack.nova.domain.Addresses; +import org.jclouds.openstack.nova.domain.Flavor; +import org.jclouds.openstack.nova.domain.FloatingIP; +import org.jclouds.openstack.nova.domain.Image; +import org.jclouds.openstack.nova.domain.RebootType; +import org.jclouds.openstack.nova.domain.SecurityGroup; +import org.jclouds.openstack.nova.domain.Server; import org.jclouds.openstack.nova.options.CreateServerOptions; import org.jclouds.openstack.nova.options.ListOptions; import org.jclouds.openstack.nova.options.RebuildServerOptions; -import org.jclouds.rest.annotations.*; +import org.jclouds.rest.annotations.Endpoint; +import org.jclouds.rest.annotations.ExceptionParser; +import org.jclouds.rest.annotations.MapBinder; +import org.jclouds.rest.annotations.Payload; +import org.jclouds.rest.annotations.PayloadParam; +import org.jclouds.rest.annotations.QueryParams; +import org.jclouds.rest.annotations.RequestFilters; +import org.jclouds.rest.annotations.SkipEncoding; +import org.jclouds.rest.annotations.Unwrap; import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.functions.ReturnFalseOnNotFoundOr404; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import java.util.Set; -import java.util.concurrent.ExecutionException; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to OpenStack Nova via their REST API. diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java index 5afbedfa25..3b443dca18 100644 --- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java +++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaPropertiesBuilder.java @@ -18,11 +18,11 @@ */ package org.jclouds.openstack.nova; -import org.jclouds.PropertiesBuilder; +import static org.jclouds.Constants.PROPERTY_API_VERSION; import java.util.Properties; -import static org.jclouds.Constants.PROPERTY_API_VERSION; +import org.jclouds.PropertiesBuilder; /** * Builds properties used in Openstack Nova Clients diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/config/NovaRestClientModule.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/config/NovaRestClientModule.java index 187be80fd0..e5cf6aac85 100644 --- a/apis/nova/src/main/java/org/jclouds/openstack/nova/config/NovaRestClientModule.java +++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/config/NovaRestClientModule.java @@ -23,7 +23,6 @@ import java.net.URI; import javax.inject.Singleton; import org.jclouds.http.HttpErrorHandler; -import org.jclouds.http.HttpRetryHandler; import org.jclouds.http.RequiresHttp; import org.jclouds.http.annotation.ClientError; import org.jclouds.http.annotation.Redirection; @@ -32,7 +31,6 @@ import org.jclouds.json.config.GsonModule.DateAdapter; import org.jclouds.json.config.GsonModule.Iso8601DateAdapter; import org.jclouds.openstack.config.OpenStackAuthenticationModule; import org.jclouds.openstack.functions.URIFromAuthenticationResponseForService; -import org.jclouds.openstack.handlers.RetryOnRenew; import org.jclouds.openstack.nova.NovaAsyncClient; import org.jclouds.openstack.nova.NovaClient; import org.jclouds.openstack.nova.ServerManagement; diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java index d637ea67da..2e3eef910c 100644 --- a/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java +++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java @@ -18,9 +18,10 @@ */ package org.jclouds.openstack.nova.domain; +import org.jclouds.javax.annotation.Nullable; + import com.google.common.base.Function; import com.google.gson.annotations.SerializedName; -import org.jclouds.javax.annotation.Nullable; /** * @author Dmitri Babaev diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Image.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Image.java index 7c9cfe2c59..9e3e4d8420 100644 --- a/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Image.java +++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Image.java @@ -18,12 +18,12 @@ */ package org.jclouds.openstack.nova.domain; -import com.google.common.collect.Maps; - import java.util.Collections; import java.util.Date; import java.util.Map; +import com.google.common.collect.Maps; + /** * An image is a collection of files used to create or rebuild a server. Rackspace provides a number * of pre-built OS images by default. You may also create custom images from cloud servers you have diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java index 616487a072..c232da75cf 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java @@ -18,8 +18,17 @@ */ package org.jclouds.openstack.nova.compute.functions; -import com.google.common.collect.ImmutableList; -import org.jclouds.compute.domain.*; +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.net.URISyntaxException; +import java.net.UnknownHostException; + +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.VolumeBuilder; import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; import org.jclouds.domain.LocationScope; @@ -27,11 +36,7 @@ import org.jclouds.openstack.nova.domain.Flavor; import org.jclouds.openstack.nova.functions.ParseFlavorFromJsonResponseTest; import org.testng.annotations.Test; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.UnknownHostException; - -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; /** * @author Adrian Cole diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerStatusTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerStatusTest.java index 76b179b36e..9a1613cfb5 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerStatusTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerStatusTest.java @@ -18,17 +18,18 @@ */ package org.jclouds.openstack.nova.domain; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import org.testng.annotations.Test; +import static junit.framework.Assert.assertTrue; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; import java.util.Arrays; import java.util.List; import java.util.Set; -import static junit.framework.Assert.assertTrue; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; +import org.testng.annotations.Test; + +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; /** * Tests behavior of {@code CreateImageBinder} diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerTest.java index 8df80cdd68..1595308b55 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.openstack.nova.domain; -import org.testng.annotations.Test; - import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + /** * Tests behavior of {@code CreateImageBinder} * diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseAddressesFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseAddressesFromJsonResponseTest.java index 47eae365b9..7d53128bea 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseAddressesFromJsonResponseTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseAddressesFromJsonResponseTest.java @@ -18,13 +18,12 @@ */ package org.jclouds.openstack.nova.functions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.TypeLiteral; +import static org.testng.Assert.assertTrue; + +import java.io.InputStream; +import java.net.UnknownHostException; +import java.util.List; + import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; @@ -33,11 +32,13 @@ import org.jclouds.openstack.nova.domain.Address; import org.jclouds.openstack.nova.domain.Addresses; import org.testng.annotations.Test; -import java.io.InputStream; -import java.net.UnknownHostException; -import java.util.List; - -import static org.testng.Assert.assertTrue; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code ParseAddressesFromJsonResponse} diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFaultFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFaultFromJsonResponseTest.java index fa1143a76b..2052c5b31c 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFaultFromJsonResponseTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFaultFromJsonResponseTest.java @@ -18,10 +18,11 @@ */ package org.jclouds.openstack.nova.functions; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.TypeLiteral; +import java.io.InputStream; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; @@ -32,10 +33,10 @@ import org.jclouds.openstack.nova.domain.Server; import org.jclouds.openstack.nova.handlers.ParseNovaErrorFromHttpResponse; import org.testng.annotations.Test; -import java.io.InputStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.List; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code ParseServerListFromJsonResponse} diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java index c1128e31cc..fd5ef0db1c 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java @@ -18,11 +18,12 @@ */ package org.jclouds.openstack.nova.functions; -import com.google.gson.Gson; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.TypeLiteral; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.io.IOException; +import java.io.InputStream; + import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; @@ -30,11 +31,11 @@ import org.jclouds.json.config.GsonModule; import org.jclouds.openstack.nova.domain.Flavor; import org.testng.annotations.Test; -import java.io.IOException; -import java.io.InputStream; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; +import com.google.gson.Gson; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code ParseFlavorFromJsonResponse} diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java index a3edb25bf2..f099a93584 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java @@ -18,11 +18,12 @@ */ package org.jclouds.openstack.nova.functions; -import com.google.common.collect.ImmutableList; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.TypeLiteral; +import static org.testng.Assert.assertEquals; + +import java.io.InputStream; +import java.net.UnknownHostException; +import java.util.List; + import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; @@ -30,11 +31,11 @@ import org.jclouds.json.config.GsonModule; import org.jclouds.openstack.nova.domain.Flavor; import org.testng.annotations.Test; -import java.io.InputStream; -import java.net.UnknownHostException; -import java.util.List; - -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code ParseFlavorListFromJsonResponse} diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageFromJsonResponseTest.java index 0fcc39d782..b19f18db0d 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageFromJsonResponseTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageFromJsonResponseTest.java @@ -18,7 +18,11 @@ */ package org.jclouds.openstack.nova.functions; -import com.google.inject.*; +import static org.testng.Assert.assertEquals; + +import java.io.InputStream; +import java.net.UnknownHostException; + import org.jclouds.date.DateService; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; @@ -30,10 +34,11 @@ import org.jclouds.openstack.nova.domain.Image; import org.jclouds.openstack.nova.domain.ImageStatus; import org.testng.annotations.Test; -import java.io.InputStream; -import java.net.UnknownHostException; - -import static org.testng.Assert.assertEquals; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code ParseImageFromJsonResponse} diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageListFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageListFromJsonResponseTest.java index f7bbb8a01c..51ba77526b 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageListFromJsonResponseTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseImageListFromJsonResponseTest.java @@ -18,8 +18,12 @@ */ package org.jclouds.openstack.nova.functions; -import com.google.common.collect.ImmutableList; -import com.google.inject.*; +import static org.testng.Assert.assertEquals; + +import java.io.InputStream; +import java.net.UnknownHostException; +import java.util.List; + import org.jclouds.date.DateService; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; @@ -31,11 +35,12 @@ import org.jclouds.openstack.nova.domain.Image; import org.jclouds.openstack.nova.domain.ImageStatus; import org.testng.annotations.Test; -import java.io.InputStream; -import java.net.UnknownHostException; -import java.util.List; - -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code ParseImageListFromJsonResponse} diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseInetAddressListFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseInetAddressListFromJsonResponseTest.java index 04bb0cab9e..ddb7259a4e 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseInetAddressListFromJsonResponseTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseInetAddressListFromJsonResponseTest.java @@ -18,11 +18,12 @@ */ package org.jclouds.openstack.nova.functions; -import com.google.common.collect.ImmutableList; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Key; -import com.google.inject.TypeLiteral; +import static org.testng.Assert.assertEquals; + +import java.io.InputStream; +import java.net.UnknownHostException; +import java.util.List; + import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.io.Payloads; @@ -30,11 +31,11 @@ import org.jclouds.json.config.GsonModule; import org.jclouds.openstack.nova.domain.Address; import org.testng.annotations.Test; -import java.io.InputStream; -import java.net.UnknownHostException; -import java.util.List; - -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.TypeLiteral; /** * Tests behavior of {@code ParseInetAddressListFromJsonResponse} diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseSecurityGroupsListFromJsonResponse.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseSecurityGroupsListFromJsonResponse.java index d90f00749f..adf95a8225 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseSecurityGroupsListFromJsonResponse.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseSecurityGroupsListFromJsonResponse.java @@ -18,8 +18,8 @@ */ package org.jclouds.openstack.nova.functions; -import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; import java.io.IOException; import java.io.InputStream; diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/options/CreateServerOptionsTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/options/CreateServerOptionsTest.java index 62f10f2b07..daa3688a71 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/options/CreateServerOptionsTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/options/CreateServerOptionsTest.java @@ -18,20 +18,22 @@ */ package org.jclouds.openstack.nova.options; -import com.google.common.collect.ImmutableMap; -import com.google.inject.Guice; -import com.google.inject.Injector; +import static org.jclouds.openstack.nova.options.CreateServerOptions.Builder.withAdminPass; +import static org.jclouds.openstack.nova.options.CreateServerOptions.Builder.withFile; +import static org.jclouds.openstack.nova.options.CreateServerOptions.Builder.withSecurityGroup; +import static org.testng.Assert.assertEquals; + +import java.net.URI; + +import javax.ws.rs.HttpMethod; + import org.jclouds.http.HttpRequest; import org.jclouds.json.config.GsonModule; import org.testng.annotations.Test; -import javax.ws.rs.HttpMethod; -import java.net.URI; - -import static org.jclouds.openstack.nova.options.CreateServerOptions.Builder.withFile; -import static org.jclouds.openstack.nova.options.CreateServerOptions.Builder.withSecurityGroup; -import static org.jclouds.openstack.nova.options.CreateServerOptions.Builder.withAdminPass; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableMap; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * Tests behavior of {@code ParseFlavorFromJsonResponse} diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/options/ListOptionsTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/options/ListOptionsTest.java index 6b2bc7cb82..0905e22344 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/options/ListOptionsTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/options/ListOptionsTest.java @@ -18,13 +18,17 @@ */ package org.jclouds.openstack.nova.options; -import com.google.common.collect.ImmutableList; -import org.testng.annotations.Test; +import static org.jclouds.openstack.nova.options.ListOptions.Builder.changesSince; +import static org.jclouds.openstack.nova.options.ListOptions.Builder.maxResults; +import static org.jclouds.openstack.nova.options.ListOptions.Builder.startAt; +import static org.jclouds.openstack.nova.options.ListOptions.Builder.withDetails; +import static org.testng.Assert.assertEquals; import java.util.Date; -import static org.jclouds.openstack.nova.options.ListOptions.Builder.*; -import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableList; /** * Tests behavior of {@code ListOptions} diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/options/RebuildServerOptionsTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/options/RebuildServerOptionsTest.java index fba3566238..1988c220cd 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/options/RebuildServerOptionsTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/options/RebuildServerOptionsTest.java @@ -18,18 +18,20 @@ */ package org.jclouds.openstack.nova.options; -import com.google.inject.Guice; -import com.google.inject.Injector; +import static org.jclouds.openstack.nova.options.RebuildServerOptions.Builder.withImage; +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.util.HashMap; + +import javax.ws.rs.HttpMethod; + import org.jclouds.http.HttpRequest; import org.jclouds.json.config.GsonModule; import org.testng.annotations.Test; -import javax.ws.rs.HttpMethod; -import java.net.URI; -import java.util.HashMap; - -import static org.jclouds.openstack.nova.options.RebuildServerOptions.Builder.withImage; -import static org.testng.Assert.assertEquals; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * Tests behavior of {@code ParseFlavorFromJsonResponse} diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java index 361489b673..023b7a2777 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/binders/BindSecurityGroupRuleToJsonPayload.java @@ -35,8 +35,8 @@ import org.jclouds.rest.internal.GeneratedHttpRequest; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.Iterables; /** * diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindKeyPairOrCreate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindKeyPairOrCreate.java index 318e03be7e..2b0dd3cf44 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindKeyPairOrCreate.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/compute/loaders/FindKeyPairOrCreate.java @@ -18,14 +18,15 @@ */ package org.jclouds.openstack.nova.v1_1.compute.loaders; -import com.google.common.base.Function; -import com.google.common.cache.CacheLoader; -import org.jclouds.openstack.nova.v1_1.domain.KeyPair; -import org.jclouds.openstack.nova.v1_1.domain.zonescoped.ZoneAndName; +import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Inject; -import static com.google.common.base.Preconditions.checkNotNull; +import org.jclouds.openstack.nova.v1_1.domain.KeyPair; +import org.jclouds.openstack.nova.v1_1.domain.zonescoped.ZoneAndName; + +import com.google.common.base.Function; +import com.google.common.cache.CacheLoader; /** * @author Adam Lowe diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java index 985066392c..e8bee1ae3c 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Server.java @@ -34,10 +34,10 @@ import org.jclouds.openstack.nova.v1_1.extensions.KeyPairClient; import org.jclouds.util.InetAddresses2; import org.jclouds.util.Multimaps2; +import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.base.Strings; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndName.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndName.java index 1bc8b5a631..c09b0ccb01 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndName.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/zonescoped/ZoneAndName.java @@ -24,8 +24,8 @@ 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.base.Splitter; import com.google.common.collect.Iterables; /** diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/CreateServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/CreateServerOptions.java index 3bd7fad2b3..ff9bb7269a 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/CreateServerOptions.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/options/CreateServerOptions.java @@ -26,8 +26,8 @@ import static com.google.common.base.Preconditions.checkState; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import javax.inject.Inject; @@ -40,8 +40,8 @@ import org.jclouds.rest.binders.BindToJsonPayload; import org.jclouds.util.Preconditions2; import com.google.common.base.Objects; -import com.google.common.base.Optional; import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/KeyPairPredicates.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/KeyPairPredicates.java index 82fe99f6e8..12716a284a 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/KeyPairPredicates.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/predicates/KeyPairPredicates.java @@ -18,10 +18,11 @@ */ package org.jclouds.openstack.nova.v1_1.predicates; -import com.google.common.base.Predicate; +import static com.google.common.base.Preconditions.checkNotNull; + import org.jclouds.openstack.nova.v1_1.domain.KeyPair; -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.Predicate; /** * Predicates handy when working with KeyPairs diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java index f1075c165e..b8e1e6ec5a 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/NovaComputeServiceAdapterExpectTest.java @@ -24,8 +24,8 @@ import static org.testng.Assert.assertNotNull; import java.net.URI; import java.util.Map; -import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.ComputeServiceAdapter.NodeAndInitialCredentials; +import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.TemplateBuilder; import org.jclouds.domain.LoginCredentials; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptionsTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptionsTest.java index db0dca399b..952367d46a 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptionsTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/compute/options/NovaTemplateOptionsTest.java @@ -18,7 +18,13 @@ */ package org.jclouds.openstack.nova.v1_1.compute.options; -import static org.jclouds.openstack.nova.v1_1.compute.options.NovaTemplateOptions.Builder.*; +import static org.jclouds.openstack.nova.v1_1.compute.options.NovaTemplateOptions.Builder.authorizePublicKey; +import static org.jclouds.openstack.nova.v1_1.compute.options.NovaTemplateOptions.Builder.autoAssignFloatingIp; +import static org.jclouds.openstack.nova.v1_1.compute.options.NovaTemplateOptions.Builder.blockOnPort; +import static org.jclouds.openstack.nova.v1_1.compute.options.NovaTemplateOptions.Builder.generateKeyPair; +import static org.jclouds.openstack.nova.v1_1.compute.options.NovaTemplateOptions.Builder.inboundPorts; +import static org.jclouds.openstack.nova.v1_1.compute.options.NovaTemplateOptions.Builder.installPrivateKey; +import static org.jclouds.openstack.nova.v1_1.compute.options.NovaTemplateOptions.Builder.securityGroupNames; import static org.testng.Assert.assertEquals; import java.io.IOException; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java index 1c96aad30a..0dc08b589f 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/functions/CreateSecurityGroupIfNeededTest.java @@ -34,9 +34,9 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableMap.Builder; /** * diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseCreatedServerTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseCreatedServerTest.java index b322aad8e5..66110be35c 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseCreatedServerTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseCreatedServerTest.java @@ -27,8 +27,8 @@ import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; import org.jclouds.openstack.domain.Link; -import org.jclouds.openstack.domain.Resource; import org.jclouds.openstack.domain.Link.Relation; +import org.jclouds.openstack.domain.Resource; import org.jclouds.openstack.nova.v1_1.config.NovaParserModule; import org.jclouds.openstack.nova.v1_1.domain.Server; import org.jclouds.openstack.nova.v1_1.domain.Server.Status; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageTest.java index c7579ee71d..33efaacb56 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseImageTest.java @@ -27,8 +27,8 @@ import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; import org.jclouds.openstack.domain.Link; -import org.jclouds.openstack.domain.Resource; import org.jclouds.openstack.domain.Link.Relation; +import org.jclouds.openstack.domain.Resource; import org.jclouds.openstack.nova.v1_1.config.NovaParserModule; import org.jclouds.openstack.nova.v1_1.domain.Image; import org.jclouds.openstack.nova.v1_1.domain.Image.Status; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerTest.java index f249f3bdb1..cf7d2760bc 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerTest.java @@ -27,8 +27,8 @@ import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; import org.jclouds.openstack.domain.Link; -import org.jclouds.openstack.domain.Resource; import org.jclouds.openstack.domain.Link.Relation; +import org.jclouds.openstack.domain.Resource; import org.jclouds.openstack.nova.v1_1.config.NovaParserModule; import org.jclouds.openstack.nova.v1_1.domain.Address; import org.jclouds.openstack.nova.v1_1.domain.Server; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerWithInternetAddressesTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerWithInternetAddressesTest.java index b5272f2cbc..a7703ea142 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerWithInternetAddressesTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/ParseServerWithInternetAddressesTest.java @@ -27,8 +27,8 @@ import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; import org.jclouds.openstack.domain.Link; -import org.jclouds.openstack.domain.Resource; import org.jclouds.openstack.domain.Link.Relation; +import org.jclouds.openstack.domain.Resource; import org.jclouds.openstack.nova.v1_1.config.NovaParserModule; import org.jclouds.openstack.nova.v1_1.domain.Address; import org.jclouds.openstack.nova.v1_1.domain.Server; diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/PublicIpsInPrivateAddressBlockShouldRerouteToPublicBlockExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/PublicIpsInPrivateAddressBlockShouldRerouteToPublicBlockExpectTest.java index 7df750e8c3..789234c3fd 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/PublicIpsInPrivateAddressBlockShouldRerouteToPublicBlockExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/parse/PublicIpsInPrivateAddressBlockShouldRerouteToPublicBlockExpectTest.java @@ -27,8 +27,8 @@ import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; import org.jclouds.openstack.domain.Link; -import org.jclouds.openstack.domain.Resource; import org.jclouds.openstack.domain.Link.Relation; +import org.jclouds.openstack.domain.Resource; import org.jclouds.openstack.nova.v1_1.config.NovaParserModule; import org.jclouds.openstack.nova.v1_1.domain.Address; import org.jclouds.openstack.nova.v1_1.domain.Server; diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java b/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java index 3bd477de58..122970450a 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java +++ b/apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER; import java.util.Set; import java.util.concurrent.ExecutionException; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.HEAD; @@ -41,6 +40,7 @@ import org.jclouds.blobstore.functions.ThrowContainerNotFoundOn404; import org.jclouds.blobstore.functions.ThrowKeyNotFoundOn404; import org.jclouds.http.functions.ParseETagHeader; import org.jclouds.http.options.GetOptions; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3Client.java b/apis/s3/src/main/java/org/jclouds/s3/S3Client.java index 68133874e3..a393d40d78 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/S3Client.java +++ b/apis/s3/src/main/java/org/jclouds/s3/S3Client.java @@ -20,10 +20,12 @@ package org.jclouds.s3; import java.util.Set; import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import org.jclouds.concurrent.Timeout; +import org.jclouds.http.options.GetOptions; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.s3.domain.AccessControlList; import org.jclouds.s3.domain.BucketLogging; import org.jclouds.s3.domain.BucketMetadata; @@ -35,13 +37,9 @@ import org.jclouds.s3.options.CopyObjectOptions; import org.jclouds.s3.options.ListBucketOptions; import org.jclouds.s3.options.PutBucketOptions; import org.jclouds.s3.options.PutObjectOptions; -import org.jclouds.concurrent.Timeout; -import org.jclouds.http.options.GetOptions; import com.google.inject.Provides; -import java.util.concurrent.Future; - /** * Provides access to S3 via their REST API. *

diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3ContextBuilder.java b/apis/s3/src/main/java/org/jclouds/s3/S3ContextBuilder.java index 85d397a28f..64ccf6cec2 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/S3ContextBuilder.java +++ b/apis/s3/src/main/java/org/jclouds/s3/S3ContextBuilder.java @@ -21,11 +21,11 @@ package org.jclouds.s3; import java.util.List; import java.util.Properties; -import org.jclouds.s3.blobstore.config.S3BlobStoreContextModule; -import org.jclouds.s3.config.S3RestClientModule; import org.jclouds.blobstore.BlobStoreContextBuilder; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.logging.jdk.config.JDKLoggingModule; +import org.jclouds.s3.blobstore.config.S3BlobStoreContextModule; +import org.jclouds.s3.config.S3RestClientModule; import com.google.inject.Injector; import com.google.inject.Module; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java index 4396f71a59..e23ba00d0a 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindACLToXMLPayload.java @@ -25,14 +25,14 @@ import javax.ws.rs.core.MediaType; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; +import org.jclouds.http.HttpRequest; +import org.jclouds.rest.Binder; import org.jclouds.s3.domain.AccessControlList; import org.jclouds.s3.domain.AccessControlList.CanonicalUserGrantee; import org.jclouds.s3.domain.AccessControlList.EmailAddressGrantee; import org.jclouds.s3.domain.AccessControlList.Grant; import org.jclouds.s3.domain.AccessControlList.GroupGrantee; import org.jclouds.s3.reference.S3Constants; -import org.jclouds.http.HttpRequest; -import org.jclouds.rest.Binder; import com.google.common.base.Throwables; import com.jamesmurty.utils.XMLBuilder; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java index 09c4368503..e62391456b 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayload.java @@ -25,14 +25,14 @@ import javax.ws.rs.core.MediaType; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; -import org.jclouds.s3.domain.BucketLogging; +import org.jclouds.http.HttpRequest; +import org.jclouds.rest.Binder; import org.jclouds.s3.domain.AccessControlList.CanonicalUserGrantee; import org.jclouds.s3.domain.AccessControlList.EmailAddressGrantee; import org.jclouds.s3.domain.AccessControlList.Grant; import org.jclouds.s3.domain.AccessControlList.GroupGrantee; +import org.jclouds.s3.domain.BucketLogging; import org.jclouds.s3.reference.S3Constants; -import org.jclouds.http.HttpRequest; -import org.jclouds.rest.Binder; import com.google.common.base.Throwables; import com.jamesmurty.utils.XMLBuilder; diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java index 4d6909737a..ed53b46a72 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindPayerToXmlPayload.java @@ -24,9 +24,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Singleton; import javax.ws.rs.core.MediaType; -import org.jclouds.s3.domain.Payer; import org.jclouds.http.HttpRequest; import org.jclouds.rest.Binder; +import org.jclouds.s3.domain.Payer; /** * diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3AsyncBlobStore.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3AsyncBlobStore.java index 7f2a5b6053..3bded56016 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3AsyncBlobStore.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3AsyncBlobStore.java @@ -55,12 +55,12 @@ import org.jclouds.s3.blobstore.functions.ContainerToBucketListOptions; import org.jclouds.s3.blobstore.functions.ObjectToBlob; import org.jclouds.s3.blobstore.functions.ObjectToBlobMetadata; import org.jclouds.s3.domain.AccessControlList; +import org.jclouds.s3.domain.AccessControlList.GroupGranteeURI; +import org.jclouds.s3.domain.AccessControlList.Permission; import org.jclouds.s3.domain.BucketMetadata; import org.jclouds.s3.domain.CannedAccessPolicy; import org.jclouds.s3.domain.ListBucketResponse; import org.jclouds.s3.domain.ObjectMetadata; -import org.jclouds.s3.domain.AccessControlList.GroupGranteeURI; -import org.jclouds.s3.domain.AccessControlList.Permission; import org.jclouds.s3.options.ListBucketOptions; import org.jclouds.s3.options.PutBucketOptions; import org.jclouds.s3.options.PutObjectOptions; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java index 6f8d01a925..3c75d3d3c2 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/S3BlobStore.java @@ -50,10 +50,10 @@ import org.jclouds.s3.blobstore.functions.ContainerToBucketListOptions; import org.jclouds.s3.blobstore.functions.ObjectToBlob; import org.jclouds.s3.blobstore.functions.ObjectToBlobMetadata; import org.jclouds.s3.domain.AccessControlList; -import org.jclouds.s3.domain.BucketMetadata; -import org.jclouds.s3.domain.CannedAccessPolicy; import org.jclouds.s3.domain.AccessControlList.GroupGranteeURI; import org.jclouds.s3.domain.AccessControlList.Permission; +import org.jclouds.s3.domain.BucketMetadata; +import org.jclouds.s3.domain.CannedAccessPolicy; import org.jclouds.s3.options.ListBucketOptions; import org.jclouds.s3.options.PutBucketOptions; import org.jclouds.s3.options.PutObjectOptions; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObject.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObject.java index 8b794efc04..fc3aba0d05 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObject.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObject.java @@ -23,8 +23,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.s3.domain.S3Object; import org.jclouds.blobstore.domain.Blob; +import org.jclouds.s3.domain.S3Object; import com.google.common.base.Function; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObjectMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObjectMetadata.java index 7bfdfeee2e..9229e62a85 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObjectMetadata.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObjectMetadata.java @@ -28,11 +28,9 @@ import org.jclouds.http.HttpUtils; import org.jclouds.rest.InvocationContext; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.jclouds.s3.domain.MutableObjectMetadata; -import org.jclouds.s3.domain.ObjectMetadata; import org.jclouds.s3.domain.internal.MutableObjectMetadataImpl; import com.google.common.base.Function; -import org.jclouds.s3.reference.S3Headers; /** * @author Adrian Cole diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java index 91173239ae..0c0b9bc1b4 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceList.java @@ -24,11 +24,11 @@ import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.s3.domain.ListBucketResponse; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; import org.jclouds.blobstore.domain.internal.PageSetImpl; +import org.jclouds.s3.domain.ListBucketResponse; import com.google.common.base.Function; import com.google.common.collect.Iterables; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceMetadata.java index 8fc3212750..8fb168c150 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceMetadata.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BucketToResourceMetadata.java @@ -22,12 +22,12 @@ package org.jclouds.s3.blobstore.functions; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.s3.domain.BucketMetadata; import org.jclouds.blobstore.domain.MutableStorageMetadata; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; import org.jclouds.blobstore.domain.internal.MutableStorageMetadataImpl; import org.jclouds.domain.Location; +import org.jclouds.s3.domain.BucketMetadata; import com.google.common.base.Function; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ContainerToBucketListOptions.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ContainerToBucketListOptions.java index 9150776c92..d7ba8fde91 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ContainerToBucketListOptions.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ContainerToBucketListOptions.java @@ -22,8 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Singleton; -import org.jclouds.s3.options.ListBucketOptions; import org.jclouds.blobstore.options.ListContainerOptions; +import org.jclouds.s3.options.ListBucketOptions; import com.google.common.base.Function; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketLocation.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketLocation.java index 49c765f74b..7793cb6b83 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketLocation.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/LocationFromBucketLocation.java @@ -25,12 +25,12 @@ import javax.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.s3.S3Client; -import org.jclouds.s3.domain.BucketMetadata; import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; import org.jclouds.logging.Logger; +import org.jclouds.s3.S3Client; +import org.jclouds.s3.domain.BucketMetadata; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java index 3fe757a005..30154408e4 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/ObjectToBlobMetadata.java @@ -27,9 +27,9 @@ import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl; import org.jclouds.blobstore.strategy.IfDirectoryReturnNameStrategy; import org.jclouds.http.HttpUtils; import org.jclouds.s3.domain.AccessControlList; -import org.jclouds.s3.domain.ObjectMetadata; import org.jclouds.s3.domain.AccessControlList.GroupGranteeURI; import org.jclouds.s3.domain.AccessControlList.Permission; +import org.jclouds.s3.domain.ObjectMetadata; import com.google.common.base.Function; import com.google.common.cache.CacheLoader; diff --git a/apis/s3/src/main/java/org/jclouds/s3/config/S3ObjectModule.java b/apis/s3/src/main/java/org/jclouds/s3/config/S3ObjectModule.java index 3fe4bca19d..a45cbca505 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/config/S3ObjectModule.java +++ b/apis/s3/src/main/java/org/jclouds/s3/config/S3ObjectModule.java @@ -21,10 +21,10 @@ package org.jclouds.s3.config; import javax.inject.Inject; import javax.inject.Provider; +import org.jclouds.blobstore.config.BlobStoreObjectModule; import org.jclouds.s3.domain.MutableObjectMetadata; import org.jclouds.s3.domain.S3Object; import org.jclouds.s3.domain.internal.S3ObjectImpl; -import org.jclouds.blobstore.config.BlobStoreObjectModule; import com.google.inject.AbstractModule; import com.google.inject.Provides; diff --git a/apis/s3/src/main/java/org/jclouds/s3/domain/S3Object.java b/apis/s3/src/main/java/org/jclouds/s3/domain/S3Object.java index 15b7e8cc42..8aa361bf9f 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/domain/S3Object.java +++ b/apis/s3/src/main/java/org/jclouds/s3/domain/S3Object.java @@ -18,9 +18,8 @@ */ package org.jclouds.s3.domain; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.io.PayloadEnclosing; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.Multimap; diff --git a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/S3ObjectImpl.java b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/S3ObjectImpl.java index 3d5a7078b5..c5e6e4fdea 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/S3ObjectImpl.java +++ b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/S3ObjectImpl.java @@ -22,11 +22,11 @@ import static com.google.common.base.Preconditions.checkNotNull; import javax.inject.Inject; +import org.jclouds.http.internal.PayloadEnclosingImpl; +import org.jclouds.io.Payload; import org.jclouds.s3.domain.AccessControlList; import org.jclouds.s3.domain.MutableObjectMetadata; import org.jclouds.s3.domain.S3Object; -import org.jclouds.http.internal.PayloadEnclosingImpl; -import org.jclouds.io.Payload; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignature.java b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignature.java index 4c9978b691..db8d97f4dc 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignature.java +++ b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignature.java @@ -35,8 +35,8 @@ import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.Collection; import java.util.Locale; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import javax.annotation.Resource; import javax.inject.Inject; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectFromHeadersAndHttpContent.java b/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectFromHeadersAndHttpContent.java index 8439f99ecb..b92e3ed560 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectFromHeadersAndHttpContent.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/ParseObjectFromHeadersAndHttpContent.java @@ -20,11 +20,11 @@ package org.jclouds.s3.functions; import javax.inject.Inject; -import org.jclouds.s3.domain.MutableObjectMetadata; -import org.jclouds.s3.domain.S3Object; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.rest.InvocationContext; +import org.jclouds.s3.domain.MutableObjectMetadata; +import org.jclouds.s3.domain.S3Object; import com.google.common.base.Function; diff --git a/apis/s3/src/main/java/org/jclouds/s3/options/PutBucketOptions.java b/apis/s3/src/main/java/org/jclouds/s3/options/PutBucketOptions.java index 81b5e8be25..a288863d42 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/options/PutBucketOptions.java +++ b/apis/s3/src/main/java/org/jclouds/s3/options/PutBucketOptions.java @@ -27,9 +27,9 @@ import java.util.Map.Entry; import javax.inject.Inject; import javax.inject.Named; +import org.jclouds.http.options.BaseHttpRequestOptions; import org.jclouds.s3.domain.CannedAccessPolicy; import org.jclouds.s3.reference.S3Headers; -import org.jclouds.http.options.BaseHttpRequestOptions; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; diff --git a/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java b/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java index ddc6d7b016..ffdb53e7fa 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java +++ b/apis/s3/src/main/java/org/jclouds/s3/options/PutObjectOptions.java @@ -34,7 +34,6 @@ import org.jclouds.s3.domain.CannedAccessPolicy; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; -import org.jclouds.s3.domain.ObjectMetadata; /** * Contains options supported in the REST API for the PUT object operation. diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/AccessControlListHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/AccessControlListHandler.java index b013f0e4be..4c858db949 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/AccessControlListHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/AccessControlListHandler.java @@ -24,11 +24,11 @@ import java.net.URI; import org.jclouds.http.functions.ParseSax; import org.jclouds.s3.domain.AccessControlList; -import org.jclouds.s3.domain.CanonicalUser; import org.jclouds.s3.domain.AccessControlList.CanonicalUserGrantee; import org.jclouds.s3.domain.AccessControlList.EmailAddressGrantee; import org.jclouds.s3.domain.AccessControlList.Grantee; import org.jclouds.s3.domain.AccessControlList.GroupGrantee; +import org.jclouds.s3.domain.CanonicalUser; import org.xml.sax.Attributes; /** diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/BucketLoggingHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/BucketLoggingHandler.java index 66135d1c31..2eed05edf6 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/BucketLoggingHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/BucketLoggingHandler.java @@ -24,12 +24,12 @@ import java.net.URI; import java.util.Set; import org.jclouds.http.functions.ParseSax; -import org.jclouds.s3.domain.BucketLogging; import org.jclouds.s3.domain.AccessControlList.CanonicalUserGrantee; import org.jclouds.s3.domain.AccessControlList.EmailAddressGrantee; import org.jclouds.s3.domain.AccessControlList.Grant; import org.jclouds.s3.domain.AccessControlList.Grantee; import org.jclouds.s3.domain.AccessControlList.GroupGrantee; +import org.jclouds.s3.domain.BucketLogging; import org.xml.sax.Attributes; import com.google.common.collect.Sets; diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/CopyObjectHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/CopyObjectHandler.java index 190064d8c3..d61a2be159 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/CopyObjectHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/CopyObjectHandler.java @@ -24,10 +24,10 @@ import java.util.Date; import javax.inject.Inject; -import org.jclouds.s3.domain.ObjectMetadata; -import org.jclouds.s3.domain.internal.CopyObjectResult; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; +import org.jclouds.s3.domain.ObjectMetadata; +import org.jclouds.s3.domain.internal.CopyObjectResult; /** * Parses the response from Amazon S3 COPY Object command. diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/ListAllMyBucketsHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/ListAllMyBucketsHandler.java index 7fe80149e8..e2113a6079 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/ListAllMyBucketsHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/ListAllMyBucketsHandler.java @@ -25,10 +25,10 @@ import java.util.Set; import javax.inject.Inject; -import org.jclouds.s3.domain.BucketMetadata; -import org.jclouds.s3.domain.CanonicalUser; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; +import org.jclouds.s3.domain.BucketMetadata; +import org.jclouds.s3.domain.CanonicalUser; import com.google.common.collect.Sets; diff --git a/apis/s3/src/main/java/org/jclouds/s3/xml/PayerHandler.java b/apis/s3/src/main/java/org/jclouds/s3/xml/PayerHandler.java index 7125fb1370..28487875f0 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/xml/PayerHandler.java +++ b/apis/s3/src/main/java/org/jclouds/s3/xml/PayerHandler.java @@ -20,8 +20,8 @@ package org.jclouds.s3.xml; import static org.jclouds.util.SaxUtils.currentOrNull; -import org.jclouds.s3.domain.Payer; import org.jclouds.http.functions.ParseSax; +import org.jclouds.s3.domain.Payer; /** * Parses the response from Amazon S3 GET Request Payment diff --git a/apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java b/apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java index d37f8e0ce5..0fed98817b 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java @@ -38,17 +38,17 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; +import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest; +import org.jclouds.http.HttpResponseException; import org.jclouds.s3.domain.AccessControlList; -import org.jclouds.s3.domain.CannedAccessPolicy; -import org.jclouds.s3.domain.ObjectMetadata; -import org.jclouds.s3.domain.S3Object; import org.jclouds.s3.domain.AccessControlList.CanonicalUserGrantee; import org.jclouds.s3.domain.AccessControlList.EmailAddressGrantee; import org.jclouds.s3.domain.AccessControlList.GroupGranteeURI; import org.jclouds.s3.domain.AccessControlList.Permission; +import org.jclouds.s3.domain.CannedAccessPolicy; +import org.jclouds.s3.domain.ObjectMetadata; +import org.jclouds.s3.domain.S3Object; import org.jclouds.s3.options.PutObjectOptions; -import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest; -import org.jclouds.http.HttpResponseException; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java b/apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java index efe28b4d5f..5d9ce720bc 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/binders/BindBucketLoggingToXmlPayloadTest.java @@ -23,12 +23,12 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; import java.net.URI; -import org.jclouds.s3.domain.BucketLogging; +import org.jclouds.http.HttpRequest; +import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.s3.domain.AccessControlList.EmailAddressGrantee; import org.jclouds.s3.domain.AccessControlList.Grant; import org.jclouds.s3.domain.AccessControlList.Permission; -import org.jclouds.http.HttpRequest; -import org.jclouds.http.functions.BaseHandlerTest; +import org.jclouds.s3.domain.BucketLogging; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketToContainerListOptions.java b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketToContainerListOptions.java index b94b4af0c1..9ca651e668 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketToContainerListOptions.java +++ b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketToContainerListOptions.java @@ -20,8 +20,8 @@ package org.jclouds.s3.blobstore.functions; import javax.inject.Singleton; -import org.jclouds.s3.options.ListBucketOptions; import org.jclouds.blobstore.options.ListContainerOptions; +import org.jclouds.s3.options.ListBucketOptions; import com.google.common.base.Function; diff --git a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/ResourceToBucketList.java b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/ResourceToBucketList.java index 07b6661192..0667964084 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/ResourceToBucketList.java +++ b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/ResourceToBucketList.java @@ -23,14 +23,14 @@ import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.s3.domain.ListBucketResponse; -import org.jclouds.s3.domain.MutableObjectMetadata; -import org.jclouds.s3.domain.ObjectMetadata; -import org.jclouds.s3.domain.internal.ListBucketResponseImpl; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; +import org.jclouds.s3.domain.ListBucketResponse; +import org.jclouds.s3.domain.MutableObjectMetadata; +import org.jclouds.s3.domain.ObjectMetadata; +import org.jclouds.s3.domain.internal.ListBucketResponseImpl; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java b/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java index 00a3e67cbf..8728bfca94 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.s3.functions; -import static org.easymock.classextension.EasyMock.createMock; +import static org.easymock.EasyMock.createMock; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG; import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; import static org.testng.Assert.assertEquals; diff --git a/apis/s3/src/test/java/org/jclouds/s3/handlers/ParseS3ErrorFromXmlContentTest.java b/apis/s3/src/test/java/org/jclouds/s3/handlers/ParseS3ErrorFromXmlContentTest.java index 072852080d..8591b6d6b5 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/handlers/ParseS3ErrorFromXmlContentTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/handlers/ParseS3ErrorFromXmlContentTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.s3.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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.verify; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG; import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_SERVICE_PATH; import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_VIRTUAL_HOST_BUCKETS; diff --git a/apis/s3/src/test/java/org/jclouds/s3/internal/StubS3AsyncClient.java b/apis/s3/src/test/java/org/jclouds/s3/internal/StubS3AsyncClient.java index e4619e2de8..1f80a5e04c 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/internal/StubS3AsyncClient.java +++ b/apis/s3/src/test/java/org/jclouds/s3/internal/StubS3AsyncClient.java @@ -29,7 +29,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; -import org.jclouds.javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -50,6 +49,7 @@ import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; import org.jclouds.domain.LocationScope; import org.jclouds.http.options.GetOptions; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.s3.S3AsyncClient; import org.jclouds.s3.blobstore.S3AsyncBlobStore; import org.jclouds.s3.blobstore.functions.BlobToObject; @@ -58,6 +58,9 @@ import org.jclouds.s3.blobstore.functions.BucketToContainerListOptions; import org.jclouds.s3.blobstore.functions.ObjectToBlob; import org.jclouds.s3.blobstore.functions.ResourceToBucketList; import org.jclouds.s3.domain.AccessControlList; +import org.jclouds.s3.domain.AccessControlList.CanonicalUserGrantee; +import org.jclouds.s3.domain.AccessControlList.EmailAddressGrantee; +import org.jclouds.s3.domain.AccessControlList.Grant; import org.jclouds.s3.domain.BucketLogging; import org.jclouds.s3.domain.BucketMetadata; import org.jclouds.s3.domain.CannedAccessPolicy; @@ -65,9 +68,6 @@ import org.jclouds.s3.domain.ListBucketResponse; import org.jclouds.s3.domain.ObjectMetadata; import org.jclouds.s3.domain.Payer; import org.jclouds.s3.domain.S3Object; -import org.jclouds.s3.domain.AccessControlList.CanonicalUserGrantee; -import org.jclouds.s3.domain.AccessControlList.EmailAddressGrantee; -import org.jclouds.s3.domain.AccessControlList.Grant; import org.jclouds.s3.options.CopyObjectOptions; import org.jclouds.s3.options.ListBucketOptions; import org.jclouds.s3.options.PutBucketOptions; diff --git a/apis/s3/src/test/java/org/jclouds/s3/xml/AccessControlListHandlerTest.java b/apis/s3/src/test/java/org/jclouds/s3/xml/AccessControlListHandlerTest.java index bc0d21a9f4..3fbe9b140b 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/xml/AccessControlListHandlerTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/xml/AccessControlListHandlerTest.java @@ -21,12 +21,12 @@ package org.jclouds.s3.xml; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import org.jclouds.s3.domain.AccessControlList; -import org.jclouds.s3.domain.AccessControlList.GroupGranteeURI; -import org.jclouds.s3.domain.AccessControlList.Permission; import org.jclouds.http.HttpException; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.http.functions.ParseSax; +import org.jclouds.s3.domain.AccessControlList; +import org.jclouds.s3.domain.AccessControlList.GroupGranteeURI; +import org.jclouds.s3.domain.AccessControlList.Permission; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/apis/s3/src/test/java/org/jclouds/s3/xml/BucketLoggingHandlerTest.java b/apis/s3/src/test/java/org/jclouds/s3/xml/BucketLoggingHandlerTest.java index 112a86ebe4..e919117aee 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/xml/BucketLoggingHandlerTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/xml/BucketLoggingHandlerTest.java @@ -22,11 +22,11 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; +import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.s3.domain.AccessControlList.EmailAddressGrantee; import org.jclouds.s3.domain.AccessControlList.Grant; import org.jclouds.s3.domain.AccessControlList.Permission; import org.jclouds.s3.domain.BucketLogging; -import org.jclouds.http.functions.BaseHandlerTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; diff --git a/apis/s3/src/test/java/org/jclouds/s3/xml/CopyObjectHandlerTest.java b/apis/s3/src/test/java/org/jclouds/s3/xml/CopyObjectHandlerTest.java index ff6c340e23..1346092484 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/xml/CopyObjectHandlerTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/xml/CopyObjectHandlerTest.java @@ -22,11 +22,11 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; -import org.jclouds.s3.domain.ObjectMetadata; -import org.jclouds.s3.domain.internal.CopyObjectResult; import org.jclouds.date.DateService; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.http.functions.BaseHandlerTest; +import org.jclouds.s3.domain.ObjectMetadata; +import org.jclouds.s3.domain.internal.CopyObjectResult; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/apis/s3/src/test/java/org/jclouds/s3/xml/PayerHandlerTest.java b/apis/s3/src/test/java/org/jclouds/s3/xml/PayerHandlerTest.java index 3d15756811..d5d3894570 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/xml/PayerHandlerTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/xml/PayerHandlerTest.java @@ -20,10 +20,10 @@ package org.jclouds.s3.xml; import static org.testng.Assert.assertEquals; -import org.jclouds.s3.domain.Payer; import org.jclouds.http.HttpException; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.http.functions.ParseSax; +import org.jclouds.s3.domain.Payer; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/SwiftObject.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/SwiftObject.java index 42fb26d9ad..fb4dc66837 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/SwiftObject.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/SwiftObject.java @@ -18,9 +18,8 @@ */ package org.jclouds.openstack.swift.domain; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.io.PayloadEnclosing; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.Multimap; diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/functions/ReturnTrueOn404FalseOn409.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/functions/ReturnTrueOn404FalseOn409.java index 482940177d..d815cccb2c 100644 --- a/apis/swift/src/main/java/org/jclouds/openstack/swift/functions/ReturnTrueOn404FalseOn409.java +++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/functions/ReturnTrueOn404FalseOn409.java @@ -25,7 +25,6 @@ import static org.jclouds.util.Throwables2.propagateOrNull; import javax.inject.Singleton; - import com.google.common.base.Function; @Singleton diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/functions/ResourceToObjectList.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/functions/ResourceToObjectList.java index 989ac34c43..5ec3f763d7 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/functions/ResourceToObjectList.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/functions/ResourceToObjectList.java @@ -24,7 +24,6 @@ import javax.inject.Singleton; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.internal.PageSetImpl; -import org.jclouds.openstack.swift.blobstore.functions.ResourceToObjectInfo; import org.jclouds.openstack.swift.domain.ObjectInfo; import com.google.common.base.Function; diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/domain/internal/ParseObjectInfoListFromJsonResponseTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/domain/internal/ParseObjectInfoListFromJsonResponseTest.java index dbc82e309f..135a32a5c7 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/domain/internal/ParseObjectInfoListFromJsonResponseTest.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/domain/internal/ParseObjectInfoListFromJsonResponseTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.openstack.swift.domain.internal; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/functions/ParseObjectInfoFromHeadersTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/functions/ParseObjectInfoFromHeadersTest.java index dd1df579ad..8c36acbef1 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/functions/ParseObjectInfoFromHeadersTest.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/functions/ParseObjectInfoFromHeadersTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.openstack.swift.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertNotNull; import java.net.URI; @@ -30,7 +30,6 @@ import org.jclouds.blobstore.reference.BlobStoreConstants; import org.jclouds.http.HttpResponse; import org.jclouds.io.Payloads; import org.jclouds.openstack.swift.domain.MutableObjectInfoWithMetadata; -import org.jclouds.openstack.swift.functions.ParseObjectInfoFromHeaders; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/handlers/ParseSwiftErrorFromHttpResponseTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/handlers/ParseSwiftErrorFromHttpResponseTest.java index 11fc98273f..a9a52de115 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/handlers/ParseSwiftErrorFromHttpResponseTest.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/handlers/ParseSwiftErrorFromHttpResponseTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.openstack.swift.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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.verify; import java.net.URI; @@ -33,7 +33,6 @@ import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.io.Payloads; -import org.jclouds.openstack.swift.handlers.ParseSwiftErrorFromHttpResponse; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindCatalogItemToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindCatalogItemToXmlPayload.java index fd94db952a..998e0cc901 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindCatalogItemToXmlPayload.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindCatalogItemToXmlPayload.java @@ -26,8 +26,8 @@ import static org.jclouds.vcloud.reference.VCloudConstants.PROPERTY_VCLOUD_XML_S import java.net.URI; import java.util.Map; -import java.util.Properties; import java.util.Map.Entry; +import java.util.Properties; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindParamsToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindParamsToXmlPayload.java index e8edc74a94..897bf3b771 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindParamsToXmlPayload.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindParamsToXmlPayload.java @@ -21,8 +21,8 @@ package org.jclouds.vcloud.binders; import static org.jclouds.vcloud.reference.VCloudConstants.PROPERTY_VCLOUD_XML_NAMESPACE; import java.util.Map; -import java.util.Properties; import java.util.Map.Entry; +import java.util.Properties; import javax.inject.Named; import javax.inject.Singleton; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOn.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOn.java index d40f391d31..b307b877a4 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOn.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/InstantiateVAppTemplateWithGroupEncodedIntoNameThenCustomizeDeployAndPowerOn.java @@ -47,11 +47,11 @@ import org.jclouds.vcloud.compute.options.VCloudTemplateOptions; import org.jclouds.vcloud.domain.GuestCustomizationSection; import org.jclouds.vcloud.domain.NetworkConnection; import org.jclouds.vcloud.domain.NetworkConnectionSection; +import org.jclouds.vcloud.domain.NetworkConnectionSection.Builder; import org.jclouds.vcloud.domain.Task; import org.jclouds.vcloud.domain.VApp; import org.jclouds.vcloud.domain.VAppTemplate; import org.jclouds.vcloud.domain.Vm; -import org.jclouds.vcloud.domain.NetworkConnectionSection.Builder; import org.jclouds.vcloud.domain.network.IpAddressAllocationMode; import org.jclouds.vcloud.domain.network.NetworkConfig; import org.jclouds.vcloud.options.InstantiateVAppTemplateOptions; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudComputeServiceAdapter.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudComputeServiceAdapter.java index d46fce7787..707852c6de 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudComputeServiceAdapter.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/strategy/VCloudComputeServiceAdapter.java @@ -53,8 +53,8 @@ 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.ImmutableSet.Builder; +import com.google.common.collect.Iterables; /** * defines the connection between the {@link VCloudClient} implementation and the jclouds diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java index ddc950c37d..f23b05ad11 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudRestClientModule.java @@ -36,8 +36,8 @@ import static org.jclouds.vcloud.reference.VCloudConstants.PROPERTY_VCLOUD_TIMEO import java.net.URI; import java.util.Map; -import java.util.SortedMap; import java.util.Map.Entry; +import java.util.SortedMap; import java.util.concurrent.atomic.AtomicReference; import javax.inject.Inject; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Catalog.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Catalog.java index 2ffd7b40e7..fb71deee16 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Catalog.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Catalog.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.internal.CatalogImpl; import com.google.inject.ImplementedBy; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/NetworkConnection.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/NetworkConnection.java index 10962d590e..4739ae5ae9 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/NetworkConnection.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/NetworkConnection.java @@ -19,7 +19,6 @@ package org.jclouds.vcloud.domain; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.network.IpAddressAllocationMode; /** diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Org.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Org.java index b4b30e5400..af3d36fdb7 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Org.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Org.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.internal.OrgImpl; import com.google.inject.ImplementedBy; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Task.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Task.java index 53accaf436..8e787839f3 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Task.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Task.java @@ -21,7 +21,6 @@ package org.jclouds.vcloud.domain; import java.util.Date; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.internal.TaskImpl; import com.google.inject.ImplementedBy; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VAppTemplate.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VAppTemplate.java index 9a44ed6091..39fbd7d2c7 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VAppTemplate.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VAppTemplate.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Set; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.internal.VAppTemplateImpl; import org.jclouds.vcloud.domain.ovf.VCloudNetworkSection; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudError.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudError.java index b2e6318365..6561f1ca4c 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudError.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudError.java @@ -21,7 +21,6 @@ package org.jclouds.vcloud.domain; import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.internal.ErrorImpl; import com.google.inject.ImplementedBy; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VDC.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VDC.java index 5bcb73187a..330d8e8699 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VDC.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VDC.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.internal.VDCImpl; import com.google.inject.ImplementedBy; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Vm.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Vm.java index f3a0728b9d..c11626dc2a 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Vm.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Vm.java @@ -21,7 +21,6 @@ package org.jclouds.vcloud.domain; import java.util.List; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.internal.VmImpl; import org.jclouds.vcloud.domain.ovf.VCloudOperatingSystemSection; import org.jclouds.vcloud.domain.ovf.VCloudVirtualHardwareSection; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java index 608d9938ad..e2db58bfd8 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.Catalog; import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Task; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogItemImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogItemImpl.java index ba81422b9b..b1c45e8efc 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogItemImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogItemImpl.java @@ -24,7 +24,6 @@ import java.net.URI; import java.util.Map; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.VCloudMediaType; import org.jclouds.vcloud.domain.CatalogItem; import org.jclouds.vcloud.domain.ReferenceType; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ErrorImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ErrorImpl.java index aa58ea2a24..56438f8139 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ErrorImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ErrorImpl.java @@ -21,7 +21,6 @@ package org.jclouds.vcloud.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.VCloudError; /** diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/OrgImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/OrgImpl.java index cdd95ebc7a..65e795ac82 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/OrgImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/OrgImpl.java @@ -25,9 +25,8 @@ import java.util.List; import java.util.Map; import org.jclouds.javax.annotation.Nullable; - -import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Org; +import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Task; import com.google.common.collect.Iterables; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java index 828bc29c61..1671d6d16b 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java @@ -24,7 +24,6 @@ import java.net.URI; import java.util.Date; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.VCloudMediaType; import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Task; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java index fc7eb44f8e..99a6ca3972 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Set; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Status; import org.jclouds.vcloud.domain.Task; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java index 889860cb34..061aaef62b 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Set; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Status; import org.jclouds.vcloud.domain.Task; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java index 0fbe1c3d06..ec2b008283 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.AllocationModel; import org.jclouds.vcloud.domain.Capacity; import org.jclouds.vcloud.domain.ReferenceType; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java index 5cacb0f7e9..e6d86696ae 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java @@ -24,7 +24,6 @@ import java.net.URI; import java.util.List; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.GuestCustomizationSection; import org.jclouds.vcloud.domain.NetworkConnectionSection; import org.jclouds.vcloud.domain.ReferenceType; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java index b4a888856a..4d72df7a9f 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java @@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.network.firewall.FirewallRule; import com.google.common.collect.Iterables; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java index 1285ce41c3..4dd82a38cd 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java @@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.network.nat.NatPolicy; import org.jclouds.vcloud.domain.network.nat.NatRule; import org.jclouds.vcloud.domain.network.nat.NatType; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/OrgNetwork.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/OrgNetwork.java index 89b78ce14f..93e30a8914 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/OrgNetwork.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/OrgNetwork.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Set; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Task; import org.jclouds.vcloud.domain.internal.VDCImpl; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java index d4be113638..7af8acc259 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Set; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Task; import org.jclouds.vcloud.domain.internal.ReferenceTypeImpl; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java index 397ee551ef..adb2cb9314 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java @@ -21,7 +21,6 @@ package org.jclouds.vcloud.domain.network.nat.rules; import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.network.nat.NatRule; /** diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java index aad3e42d15..69bc3f9f50 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java @@ -21,7 +21,6 @@ package org.jclouds.vcloud.domain.network.nat.rules; import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.vcloud.domain.network.nat.NatProtocol; import org.jclouds.vcloud.domain.network.nat.NatRule; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudOperatingSystemSection.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudOperatingSystemSection.java index f80b456db3..22e0741d31 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudOperatingSystemSection.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudOperatingSystemSection.java @@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.ovf.OperatingSystemSection; import org.jclouds.vcloud.domain.ReferenceType; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncClient.java index 8cc01b8d37..dc1bf0d64f 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.vcloud.VCloudMediaType.CATALOG_XML; import java.net.URI; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -31,6 +30,7 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.MapBinder; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogClient.java index 43c1374cc8..78ec0a6887 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogClient.java @@ -22,9 +22,8 @@ import java.net.URI; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.Catalog; import org.jclouds.vcloud.domain.CatalogItem; import org.jclouds.vcloud.options.CatalogItemOptions; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncClient.java index 7694c15d1e..9834f5095a 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncClient.java @@ -22,10 +22,10 @@ import static org.jclouds.vcloud.VCloudMediaType.NETWORK_XML; import java.net.URI; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.GET; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.RequestFilters; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkClient.java index a7c1783e12..0e51beb2a8 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkClient.java @@ -21,9 +21,8 @@ package org.jclouds.vcloud.features; import java.net.URI; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.network.OrgNetwork; /** diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncClient.java index 57389d4fdb..688b3223cd 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncClient.java @@ -23,10 +23,10 @@ import static org.jclouds.vcloud.VCloudMediaType.ORG_XML; import java.net.URI; import java.util.Map; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.GET; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.Endpoint; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgClient.java index c7794f9e3b..18c3445107 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgClient.java @@ -23,9 +23,8 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.Org; import org.jclouds.vcloud.domain.ReferenceType; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncClient.java index e834702775..3b2d0e5362 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncClient.java @@ -23,12 +23,12 @@ import static org.jclouds.vcloud.VCloudMediaType.TASK_XML; import java.net.URI; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.RequestFilters; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncClient.java index d36dc8546f..fa35cada47 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppAsyncClient.java @@ -25,7 +25,6 @@ import static org.jclouds.vcloud.VCloudMediaType.VAPP_XML; import java.net.URI; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -33,6 +32,7 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.predicates.validators.DnsNameValidator; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppClient.java index c600cb93f1..7f8f8779dd 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppClient.java @@ -21,9 +21,8 @@ package org.jclouds.vcloud.features; import java.net.URI; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.Task; import org.jclouds.vcloud.domain.VApp; import org.jclouds.vcloud.options.CloneVAppOptions; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncClient.java index 944923c553..664952ea1d 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateAsyncClient.java @@ -24,7 +24,6 @@ import static org.jclouds.vcloud.VCloudMediaType.VAPP_XML; import java.net.URI; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -33,6 +32,7 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ovf.Envelope; import org.jclouds.ovf.xml.EnvelopeHandler; import org.jclouds.predicates.validators.DnsNameValidator; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateClient.java index 22159e1d5a..2685b8b402 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VAppTemplateClient.java @@ -22,9 +22,8 @@ import java.net.URI; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ovf.Envelope; import org.jclouds.vcloud.domain.Task; import org.jclouds.vcloud.domain.VApp; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncClient.java index 4d06e476d5..f2228d8db8 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/features/VDCAsyncClient.java @@ -22,10 +22,10 @@ import static org.jclouds.vcloud.VCloudMediaType.VDC_XML; import java.net.URI; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.GET; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.RequestFilters; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndCatalogNameToEndpoint.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndCatalogNameToEndpoint.java index 4ab10367cc..f665beed44 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndCatalogNameToEndpoint.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndCatalogNameToEndpoint.java @@ -27,8 +27,8 @@ import java.util.NoSuchElementException; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Org; +import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.endpoints.Catalog; import com.google.common.base.Function; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndVDCNameToEndpoint.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndVDCNameToEndpoint.java index 0814fcfcde..ba9da5c845 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndVDCNameToEndpoint.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/functions/OrgNameAndVDCNameToEndpoint.java @@ -27,8 +27,8 @@ import java.util.NoSuchElementException; import javax.inject.Inject; import javax.inject.Singleton; -import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Org; +import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.endpoints.VDC; import com.google.common.base.Function; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/location/OrgAndVDCToLocationSupplier.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/location/OrgAndVDCToLocationSupplier.java index 4fad340262..2e64bcc281 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/location/OrgAndVDCToLocationSupplier.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/location/OrgAndVDCToLocationSupplier.java @@ -39,8 +39,8 @@ import org.jclouds.vcloud.domain.ReferenceType; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.common.collect.ImmutableSet.Builder; +import com.google.common.collect.Iterables; /** * @author Adrian Cole diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CaptureVAppOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CaptureVAppOptions.java index 2c11aacfeb..ab5af70caa 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CaptureVAppOptions.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/CaptureVAppOptions.java @@ -18,7 +18,7 @@ */ package org.jclouds.vcloud.options; -import static com.google.common.base.Preconditions.*; +import static com.google.common.base.Preconditions.checkNotNull; /** * diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java index f9946204f4..368e9917a4 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppParamsToXmlPayloadTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.vcloud.binders; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import java.io.IOException; import java.net.URI; diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppTemplateParamsToXmlPayloadTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppTemplateParamsToXmlPayloadTest.java index 93eda1bb9a..c7ccee619a 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppTemplateParamsToXmlPayloadTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/binders/BindCloneVAppTemplateParamsToXmlPayloadTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.vcloud.binders; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import java.io.IOException; import java.net.URI; diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/filters/SetVCloudTokenCookieTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/filters/SetVCloudTokenCookieTest.java index dd46999749..e880b0163e 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/filters/SetVCloudTokenCookieTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/filters/SetVCloudTokenCookieTest.java @@ -25,7 +25,6 @@ import java.net.URI; import javax.ws.rs.core.HttpHeaders; import org.jclouds.http.HttpRequest; -import org.jclouds.vcloud.filters.SetVCloudTokenCookie; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClientTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClientTest.java index e6b3b1a725..3679fc808c 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClientTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/internal/VCloudLoginAsyncClientTest.java @@ -38,7 +38,6 @@ import org.jclouds.vcloud.functions.ParseLoginResponseFromHeaders; import org.testng.annotations.Test; import com.google.common.base.Supplier; -import com.google.common.base.Suppliers; import com.google.inject.Binder; import com.google.inject.Module; import com.google.inject.Provides; diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefaultTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefaultTest.java index d40bd10c72..899a942ac2 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefaultTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefaultTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.vcloud.suppliers; -import static org.easymock.classextension.EasyMock.createMock; +import static org.easymock.EasyMock.createMock; import static org.testng.Assert.assertEquals; import java.util.NoSuchElementException; diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java index 00b4240f92..1b9e07b93a 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudOperatingSystemSectionHandlerTest.java @@ -27,7 +27,6 @@ import java.net.UnknownHostException; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.vcloud.domain.internal.ReferenceTypeImpl; import org.jclouds.vcloud.domain.ovf.VCloudOperatingSystemSection; -import org.jclouds.vcloud.xml.ovf.VCloudOperatingSystemHandler; import org.testng.annotations.Test; /** diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java index c6ed3f0e83..859a4322f8 100644 --- a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java +++ b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/ovf/VCloudVirtualHardwareSectionHandlerTest.java @@ -25,8 +25,8 @@ import java.net.URI; import java.net.UnknownHostException; import org.jclouds.cim.ResourceAllocationSettingData; -import org.jclouds.cim.VirtualSystemSettingData; import org.jclouds.cim.ResourceAllocationSettingData.ResourceType; +import org.jclouds.cim.VirtualSystemSettingData; import org.jclouds.cim.xml.ResourceAllocationSettingDataHandler; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.http.functions.ParseSax; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/AsyncBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/AsyncBlobStore.java index d01c575815..cf2897988b 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/AsyncBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/AsyncBlobStore.java @@ -20,8 +20,6 @@ package org.jclouds.blobstore; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobBuilder; import org.jclouds.blobstore.domain.BlobMetadata; @@ -32,6 +30,7 @@ import org.jclouds.blobstore.options.GetOptions; import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.blobstore.options.PutOptions; import org.jclouds.domain.Location; +import org.jclouds.javax.annotation.Nullable; import com.google.common.util.concurrent.ListenableFuture; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java index 02890c7906..b9fa416c25 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java @@ -20,8 +20,6 @@ package org.jclouds.blobstore; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobBuilder; import org.jclouds.blobstore.domain.BlobMetadata; @@ -32,6 +30,7 @@ import org.jclouds.blobstore.options.GetOptions; import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.blobstore.options.PutOptions; import org.jclouds.domain.Location; +import org.jclouds.javax.annotation.Nullable; /** * Synchronous access to a BlobStore such as Amazon S3 diff --git a/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java b/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java index fcc7f1e8bc..b217065484 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java @@ -24,7 +24,6 @@ import static org.jclouds.util.Throwables2.propagateAuthorizationOrOriginalExcep import java.util.Properties; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextSpec; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java index 53ae0727f3..81ef2f5dfd 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java @@ -49,15 +49,14 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; -import org.jclouds.javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; @@ -66,13 +65,13 @@ import javax.ws.rs.core.UriBuilder; import org.jclouds.Constants; import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.Blob.Factory; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.MutableBlobMetadata; import org.jclouds.blobstore.domain.MutableStorageMetadata; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; -import org.jclouds.blobstore.domain.Blob.Factory; import org.jclouds.blobstore.domain.internal.MutableStorageMetadataImpl; import org.jclouds.blobstore.domain.internal.PageSetImpl; import org.jclouds.blobstore.functions.HttpGetOptionsListToGetOptions; @@ -100,6 +99,7 @@ import org.jclouds.io.Payload; import org.jclouds.io.Payloads; import org.jclouds.io.payloads.ByteArrayPayload; import org.jclouds.io.payloads.DelegatingPayload; +import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/TransientBlobStorePropertiesBuilder.java b/blobstore/src/main/java/org/jclouds/blobstore/TransientBlobStorePropertiesBuilder.java index e33d6a20a1..a9de3a0d85 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/TransientBlobStorePropertiesBuilder.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/TransientBlobStorePropertiesBuilder.java @@ -20,8 +20,8 @@ package org.jclouds.blobstore; import static org.jclouds.Constants.PROPERTY_API_VERSION; import static org.jclouds.Constants.PROPERTY_ENDPOINT; -import static org.jclouds.Constants.PROPERTY_IO_WORKER_THREADS; import static org.jclouds.Constants.PROPERTY_IDENTITY; +import static org.jclouds.Constants.PROPERTY_IO_WORKER_THREADS; import static org.jclouds.Constants.PROPERTY_USER_THREADS; import java.util.Properties; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/Blob.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/Blob.java index 261337dcb5..b2b6c8f0a0 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/Blob.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/Blob.java @@ -18,10 +18,9 @@ */ package org.jclouds.blobstore.domain; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.io.Payload; import org.jclouds.io.PayloadEnclosing; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.Multimap; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java index 107835e073..3631c9a3f9 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java @@ -20,10 +20,9 @@ package org.jclouds.blobstore.domain; import java.net.URI; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.blobstore.domain.internal.BlobMetadataImpl; import org.jclouds.io.ContentMetadata; +import org.jclouds.javax.annotation.Nullable; import com.google.inject.ImplementedBy; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/MutableBlobMetadata.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/MutableBlobMetadata.java index 8b3a2cebcc..292a1075f4 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/MutableBlobMetadata.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/MutableBlobMetadata.java @@ -20,10 +20,9 @@ package org.jclouds.blobstore.domain; import java.net.URI; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl; import org.jclouds.io.MutableContentMetadata; +import org.jclouds.javax.annotation.Nullable; import com.google.inject.ImplementedBy; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java index 4d27d7eb6e..fb36522c8a 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java @@ -25,13 +25,12 @@ import java.net.URI; import java.util.Date; import java.util.Map; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.StorageType; import org.jclouds.domain.Location; import org.jclouds.io.ContentMetadata; +import org.jclouds.javax.annotation.Nullable; /** * System and user Metadata for the {@link Blob}. diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/PageSetImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/PageSetImpl.java index e63f3eb079..636532f3dc 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/PageSetImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/PageSetImpl.java @@ -20,9 +20,8 @@ package org.jclouds.blobstore.domain.internal; import java.util.LinkedHashSet; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.blobstore.domain.PageSet; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.Iterables; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java index 5349397c45..61039998bf 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java @@ -25,12 +25,11 @@ import java.net.URI; import java.util.Date; import java.util.Map; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; import org.jclouds.domain.Location; import org.jclouds.domain.internal.ResourceMetadataImpl; +import org.jclouds.javax.annotation.Nullable; /** * Idpayload of the object diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java index c7a5881354..ee4c38ea05 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInList.java @@ -23,6 +23,7 @@ import static org.jclouds.concurrent.FutureIterables.awaitCompletion; import java.util.Map; import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; import javax.annotation.Resource; import javax.inject.Named; @@ -43,7 +44,6 @@ import org.jclouds.logging.Logger; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import java.util.concurrent.Future; import com.google.inject.Inject; /** diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java index 01bf37b865..613ff0a888 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/FetchBlobMetadata.java @@ -25,7 +25,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import javax.annotation.Resource; -import org.jclouds.javax.annotation.concurrent.NotThreadSafe; import javax.inject.Named; import org.jclouds.Constants; @@ -37,6 +36,7 @@ import org.jclouds.blobstore.domain.StorageType; import org.jclouds.blobstore.domain.internal.PageSetImpl; import org.jclouds.blobstore.reference.BlobStoreConstants; import org.jclouds.http.handlers.BackoffLimitedRetryHandler; +import org.jclouds.javax.annotation.concurrent.NotThreadSafe; import org.jclouds.logging.Logger; import com.google.common.base.Function; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java index 3c5ea25b19..92449c5906 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/MarkersDeleteDirectoryStrategy.java @@ -23,6 +23,7 @@ import static org.jclouds.concurrent.FutureIterables.awaitCompletion; import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; import javax.annotation.Resource; import javax.inject.Named; @@ -38,7 +39,6 @@ import org.jclouds.logging.Logger; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import java.util.concurrent.Future; import com.google.inject.Inject; /** diff --git a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java index 6ebab929ff..d9cec6f7fc 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/strategy/internal/PutBlobsStrategyImpl.java @@ -22,6 +22,7 @@ import static org.jclouds.concurrent.FutureIterables.awaitCompletion; import java.util.Map; import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; import javax.annotation.Resource; import javax.inject.Named; @@ -36,7 +37,6 @@ import org.jclouds.blobstore.strategy.PutBlobsStrategy; import org.jclouds.logging.Logger; import com.google.common.collect.Maps; -import java.util.concurrent.Future; import com.google.inject.Inject; /** diff --git a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java index 61bc3a7ccf..3ff69f33ea 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.blobstore.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.util.Collections; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java index 22111211fb..58dc9bfb55 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobStoreIntegrationTest.java @@ -25,8 +25,8 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CancellationException; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/options/ListOptionsTest.java b/blobstore/src/test/java/org/jclouds/blobstore/options/ListOptionsTest.java index 1f9e6516e8..7965112505 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/options/ListOptionsTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/options/ListOptionsTest.java @@ -19,9 +19,9 @@ package org.jclouds.blobstore.options; import static org.jclouds.blobstore.options.ListContainerOptions.Builder.afterMarker; +import static org.jclouds.blobstore.options.ListContainerOptions.Builder.inDirectory; import static org.jclouds.blobstore.options.ListContainerOptions.Builder.maxResults; import static org.jclouds.blobstore.options.ListContainerOptions.Builder.recursive; -import static org.jclouds.blobstore.options.ListContainerOptions.Builder.inDirectory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/blobstore/src/test/java/org/jclouds/blobstore/util/BlobStoreUtilsTest.java b/blobstore/src/test/java/org/jclouds/blobstore/util/BlobStoreUtilsTest.java index 1a1ab27e99..3b0aa6ecb3 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/util/BlobStoreUtilsTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/util/BlobStoreUtilsTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.blobstore.util; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.jclouds.blobstore.util.BlobStoreUtils.createParentIfNeededAsync; import static org.jclouds.blobstore.util.BlobStoreUtils.getNameFor; import static org.jclouds.blobstore.util.BlobStoreUtils.parseContainerFromPath; diff --git a/common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java b/common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java index 12321d8155..ba64c54992 100644 --- a/common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java +++ b/common/aws/src/test/java/org/jclouds/aws/filters/FormSignerTest.java @@ -25,11 +25,11 @@ import org.jclouds.date.TimeStamp; import org.jclouds.http.IntegrationTestAsyncClient; import org.jclouds.http.IntegrationTestClient; import org.jclouds.logging.config.NullLoggingModule; +import org.jclouds.rest.BaseRestClientTest.MockModule; import org.jclouds.rest.RequestSigner; import org.jclouds.rest.RestContextBuilder; import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextSpec; -import org.jclouds.rest.BaseRestClientTest.MockModule; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/common/aws/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java b/common/aws/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java index e8e1e7d5f2..edcdebed0e 100644 --- a/common/aws/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java +++ b/common/aws/src/test/java/org/jclouds/aws/handlers/AWSClientErrorRetryHandlerTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.aws.handlers; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import org.jclouds.aws.util.AWSUtils; import org.jclouds.http.HttpCommand; diff --git a/common/aws/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java b/common/aws/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java index 0d359ec972..e65a67473d 100644 --- a/common/aws/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java +++ b/common/aws/src/test/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContentTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.aws.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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.verify; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG; import java.net.URI; diff --git a/common/aws/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java b/common/aws/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java index 47aebdf281..220bd81f09 100644 --- a/common/aws/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java +++ b/common/aws/src/test/java/org/jclouds/aws/util/AWSUtilsTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.aws.util; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.IOException; diff --git a/common/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java b/common/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java index d3f1bbd609..dd68b2b4f6 100644 --- a/common/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java +++ b/common/azure/src/test/java/org/jclouds/azure/storage/filters/SharedKeyLiteAuthenticationTest.java @@ -32,10 +32,10 @@ import org.jclouds.http.HttpRequest; import org.jclouds.http.IntegrationTestAsyncClient; import org.jclouds.http.IntegrationTestClient; import org.jclouds.logging.config.NullLoggingModule; +import org.jclouds.rest.BaseRestClientTest.MockModule; import org.jclouds.rest.RestContextBuilder; import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextSpec; -import org.jclouds.rest.BaseRestClientTest.MockModule; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/common/azure/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureErrorFromXmlContentTest.java b/common/azure/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureErrorFromXmlContentTest.java index b9e49c685a..c9b888bd91 100644 --- a/common/azure/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureErrorFromXmlContentTest.java +++ b/common/azure/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureErrorFromXmlContentTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.azure.storage.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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.verify; import java.net.URI; diff --git a/common/openstack/src/test/java/org/jclouds/openstack/filters/AddTimestampQueryTest.java b/common/openstack/src/test/java/org/jclouds/openstack/filters/AddTimestampQueryTest.java index 11d1fa054d..7e0e3dae74 100644 --- a/common/openstack/src/test/java/org/jclouds/openstack/filters/AddTimestampQueryTest.java +++ b/common/openstack/src/test/java/org/jclouds/openstack/filters/AddTimestampQueryTest.java @@ -27,7 +27,6 @@ import javax.inject.Provider; import javax.ws.rs.core.UriBuilder; import org.jclouds.http.HttpRequest; -import org.jclouds.openstack.filters.AddTimestampQuery; import org.testng.annotations.Test; import com.google.common.base.Supplier; diff --git a/common/openstack/src/test/java/org/jclouds/openstack/options/BaseListOptionsTest.java b/common/openstack/src/test/java/org/jclouds/openstack/options/BaseListOptionsTest.java index ca9acf774f..dae393b69e 100644 --- a/common/openstack/src/test/java/org/jclouds/openstack/options/BaseListOptionsTest.java +++ b/common/openstack/src/test/java/org/jclouds/openstack/options/BaseListOptionsTest.java @@ -25,7 +25,6 @@ import static org.testng.Assert.assertEquals; import java.util.Date; -import org.jclouds.openstack.options.BaseListOptions; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncClient.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncClient.java index 2481f5a1d8..f971d93b0d 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncClient.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudAsyncClient.java @@ -38,7 +38,6 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -47,6 +46,7 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.predicates.validators.DnsNameValidator; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudClient.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudClient.java index 584cdc290a..1ab9f4d9f7 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudClient.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/TerremarkVCloudClient.java @@ -24,9 +24,8 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.trmk.vcloud_0_8.domain.Catalog; import org.jclouds.trmk.vcloud_0_8.domain.CatalogItem; import org.jclouds.trmk.vcloud_0_8.domain.CustomizationParameters; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java index cdf12faa03..86e7f11736 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java @@ -31,7 +31,6 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.SortedMap; -import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import javax.inject.Singleton; import javax.xml.parsers.FactoryConfigurationError; @@ -40,6 +39,7 @@ import javax.xml.transform.TransformerException; import org.jclouds.cim.ResourceAllocationSettingData.ResourceType; import org.jclouds.http.HttpRequest; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToStringPayload; import org.jclouds.rest.internal.GeneratedHttpRequest; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindVAppConfigurationToXmlPayload.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindVAppConfigurationToXmlPayload.java index 76930a0b5b..8c26cf4888 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindVAppConfigurationToXmlPayload.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/binders/BindVAppConfigurationToXmlPayload.java @@ -45,8 +45,8 @@ import org.jclouds.rest.MapBinder; import org.jclouds.rest.binders.BindToStringPayload; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.jclouds.trmk.vcloud_0_8.domain.Status; -import org.jclouds.trmk.vcloud_0_8.domain.VAppConfiguration; import org.jclouds.trmk.vcloud_0_8.domain.VApp; +import org.jclouds.trmk.vcloud_0_8.domain.VAppConfiguration; import com.google.common.base.Function; import com.google.inject.Inject; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeClient.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeClient.java index e17206d096..77f49a0f30 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeClient.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeClient.java @@ -25,9 +25,9 @@ import static org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions.Buil import java.net.URI; import java.util.Map; +import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Set; -import java.util.Map.Entry; import javax.annotation.Resource; import javax.inject.Inject; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImageForVCloudExpressVAppTemplate.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImageForVCloudExpressVAppTemplate.java index 219a49f874..167e1828d7 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImageForVCloudExpressVAppTemplate.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/compute/functions/ImageForVCloudExpressVAppTemplate.java @@ -20,7 +20,6 @@ package org.jclouds.trmk.vcloud_0_8.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; - import javax.inject.Inject; import org.jclouds.compute.domain.Image; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java index 2d0c46c4a1..ef66700ad1 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/config/TerremarkVCloudRestClientModule.java @@ -33,8 +33,8 @@ import static org.jclouds.trmk.vcloud_0_8.reference.VCloudConstants.PROPERTY_VCL import java.io.IOException; import java.net.URI; import java.util.Map; -import java.util.SortedMap; import java.util.Map.Entry; +import java.util.SortedMap; import java.util.concurrent.atomic.AtomicReference; import javax.inject.Inject; @@ -88,8 +88,8 @@ import com.google.common.base.Predicate; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.Maps; import com.google.inject.Injector; import com.google.inject.Provides; import com.google.inject.Scopes; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Catalog.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Catalog.java index d739bfc52c..d8ba05c15b 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Catalog.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Catalog.java @@ -21,7 +21,6 @@ package org.jclouds.trmk.vcloud_0_8.domain; import java.util.Map; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.trmk.vcloud_0_8.domain.internal.CatalogImpl; import com.google.inject.ImplementedBy; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Org.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Org.java index 49e8e12c1c..ae05b6ff29 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Org.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Org.java @@ -21,7 +21,6 @@ package org.jclouds.trmk.vcloud_0_8.domain; import java.util.Map; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.trmk.vcloud_0_8.domain.internal.OrgImpl; import org.jclouds.trmk.vcloud_0_8.endpoints.Keys; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Task.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Task.java index 22d8b51b80..b7b3761079 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Task.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/Task.java @@ -21,7 +21,6 @@ package org.jclouds.trmk.vcloud_0_8.domain; import java.util.Date; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.trmk.vcloud_0_8.domain.internal.TaskImpl; import com.google.inject.ImplementedBy; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VApp.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VApp.java index 1521ee2349..d5cdedd4a4 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VApp.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VApp.java @@ -20,10 +20,9 @@ package org.jclouds.trmk.vcloud_0_8.domain; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.cim.ResourceAllocationSettingData; import org.jclouds.cim.VirtualSystemSettingData; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.trmk.vcloud_0_8.domain.internal.VAppImpl; import com.google.common.collect.ListMultimap; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VCloudError.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VCloudError.java index 24b7e8b3c6..b38a4be325 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VCloudError.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VCloudError.java @@ -21,7 +21,6 @@ package org.jclouds.trmk.vcloud_0_8.domain; import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.trmk.vcloud_0_8.domain.internal.ErrorImpl; import com.google.inject.ImplementedBy; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VDC.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VDC.java index 28de382783..bc10b0fdb2 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VDC.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/VDC.java @@ -21,7 +21,6 @@ package org.jclouds.trmk.vcloud_0_8.domain; import java.util.Map; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.trmk.vcloud_0_8.domain.internal.VDCImpl; import org.jclouds.trmk.vcloud_0_8.endpoints.Catalog; import org.jclouds.trmk.vcloud_0_8.endpoints.InternetServices; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java index 6c50b35a47..7f8f82615a 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java @@ -25,7 +25,6 @@ import java.util.LinkedHashMap; import java.util.Map; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.trmk.vcloud_0_8.domain.Catalog; import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ErrorImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ErrorImpl.java index 9f3fd2e3b3..f1e8219a21 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ErrorImpl.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/ErrorImpl.java @@ -18,11 +18,11 @@ */ package org.jclouds.trmk.vcloud_0_8.domain.internal; +import static com.google.common.base.Preconditions.checkNotNull; + import org.jclouds.javax.annotation.Nullable; import org.jclouds.trmk.vcloud_0_8.domain.VCloudError; -import static com.google.common.base.Preconditions.checkNotNull; - /** * * @author Adrian Cole diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/NetworkImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/NetworkImpl.java index 9a31c30c08..7eabb97818 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/NetworkImpl.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/NetworkImpl.java @@ -21,8 +21,8 @@ package org.jclouds.trmk.vcloud_0_8.domain.internal; import java.net.URI; import org.jclouds.trmk.vcloud_0_8.domain.FenceMode; -import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType; import org.jclouds.trmk.vcloud_0_8.domain.Network; +import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType; /** * Locations of resources in vCloud diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/OrgImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/OrgImpl.java index 4859a1d4b7..7f4b6f91e5 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/OrgImpl.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/OrgImpl.java @@ -18,15 +18,16 @@ */ package org.jclouds.trmk.vcloud_0_8.domain.internal; +import static com.google.common.base.Preconditions.checkNotNull; + import java.net.URI; import java.util.Map; -import com.google.common.collect.ImmutableMap; import org.jclouds.javax.annotation.Nullable; import org.jclouds.trmk.vcloud_0_8.domain.Org; import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType; -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.collect.ImmutableMap; /** * Locations of resources in vCloud diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TaskImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TaskImpl.java index d5db58e1bc..513a2044a8 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TaskImpl.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/TaskImpl.java @@ -18,6 +18,8 @@ */ package org.jclouds.trmk.vcloud_0_8.domain.internal; +import static com.google.common.base.Preconditions.checkNotNull; + import java.net.URI; import java.util.Date; @@ -28,8 +30,6 @@ import org.jclouds.trmk.vcloud_0_8.domain.Task; import org.jclouds.trmk.vcloud_0_8.domain.TaskStatus; import org.jclouds.trmk.vcloud_0_8.domain.VCloudError; -import static com.google.common.base.Preconditions.checkNotNull; - /** * * @author Adrian Cole diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppTemplateImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppTemplateImpl.java index ae3383bc0d..49cb2e89fe 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppTemplateImpl.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VAppTemplateImpl.java @@ -21,7 +21,6 @@ package org.jclouds.trmk.vcloud_0_8.domain.internal; import java.net.URI; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType; import org.jclouds.trmk.vcloud_0_8.domain.Status; import org.jclouds.trmk.vcloud_0_8.domain.VAppTemplate; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VDCImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VDCImpl.java index 3539045093..dc8aba3313 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VDCImpl.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/VDCImpl.java @@ -18,15 +18,16 @@ */ package org.jclouds.trmk.vcloud_0_8.domain.internal; +import static com.google.common.base.Preconditions.checkNotNull; + import java.net.URI; import java.util.Map; -import com.google.common.collect.ImmutableMap; import org.jclouds.javax.annotation.Nullable; import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType; import org.jclouds.trmk.vcloud_0_8.domain.VDC; -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.collect.ImmutableMap; /** * Locations of resources in vCloud diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/location/OrgAndVDCToLocationSupplier.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/location/OrgAndVDCToLocationSupplier.java index 54d29527d6..7930b87ec5 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/location/OrgAndVDCToLocationSupplier.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/location/OrgAndVDCToLocationSupplier.java @@ -39,8 +39,8 @@ import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.common.collect.ImmutableSet.Builder; +import com.google.common.collect.Iterables; /** * @author Adrian Cole diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/CloneVAppOptions.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/CloneVAppOptions.java index 04eb45796e..01d5b806ca 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/CloneVAppOptions.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/CloneVAppOptions.java @@ -18,7 +18,8 @@ */ package org.jclouds.trmk.vcloud_0_8.options; -import static com.google.common.base.Preconditions.*; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; /** * diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/InstantiateVAppTemplateOptions.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/InstantiateVAppTemplateOptions.java index 9c7d45364c..abf4429f31 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/InstantiateVAppTemplateOptions.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/options/InstantiateVAppTemplateOptions.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Set; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.ovf.NetworkSection; import org.jclouds.trmk.vcloud_0_8.domain.FenceMode; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/IpAddressesHandler.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/IpAddressesHandler.java index 2cbdf9cac1..ca04338511 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/IpAddressesHandler.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/xml/IpAddressesHandler.java @@ -20,10 +20,10 @@ package org.jclouds.trmk.vcloud_0_8.xml; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import org.jclouds.http.functions.ParseSax; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.logging.Logger; import org.jclouds.trmk.vcloud_0_8.domain.IpAddress; import org.jclouds.trmk.vcloud_0_8.domain.IpAddress.Status; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/TerremarkClientLiveTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/TerremarkClientLiveTest.java index 64b945c307..2a7c953c3f 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/TerremarkClientLiveTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/TerremarkClientLiveTest.java @@ -32,9 +32,9 @@ import java.io.IOException; import java.net.URI; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Properties; import java.util.Set; -import java.util.Map.Entry; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -52,8 +52,8 @@ import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.RestContext; import org.jclouds.rest.RestContextFactory; import org.jclouds.ssh.SshClient; -import org.jclouds.ssh.SshException; import org.jclouds.ssh.SshClient.Factory; +import org.jclouds.ssh.SshException; import org.jclouds.sshj.config.SshjSshClientModule; import org.jclouds.trmk.vcloud_0_8.domain.Catalog; import org.jclouds.trmk.vcloud_0_8.domain.CatalogItem; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddInternetServiceToXmlPayloadTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddInternetServiceToXmlPayloadTest.java index cc0c17ae81..cb82639d70 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddInternetServiceToXmlPayloadTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddInternetServiceToXmlPayloadTest.java @@ -31,7 +31,6 @@ import javax.inject.Named; import javax.inject.Singleton; import org.jclouds.http.HttpRequest; -import org.jclouds.trmk.vcloud_0_8.binders.BindAddInternetServiceToXmlPayload; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddNodeServiceToXmlPayloadTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddNodeServiceToXmlPayloadTest.java index 9b92850102..395098d27c 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddNodeServiceToXmlPayloadTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindAddNodeServiceToXmlPayloadTest.java @@ -30,7 +30,6 @@ import javax.inject.Named; import javax.inject.Singleton; import org.jclouds.http.HttpRequest; -import org.jclouds.trmk.vcloud_0_8.binders.BindAddNodeServiceToXmlPayload; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindCloneVAppParamsToXmlPayloadTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindCloneVAppParamsToXmlPayloadTest.java index 2b7b223148..789dc01400 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindCloneVAppParamsToXmlPayloadTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/binders/BindCloneVAppParamsToXmlPayloadTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.trmk.vcloud_0_8.binders; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import java.io.IOException; import java.net.URI; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeClientTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeClientTest.java index 10027a7bc2..c8386fc85b 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeClientTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/TerremarkVCloudComputeClientTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.trmk.vcloud_0_8.compute; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.io.IOException; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/CleanupOrphanKeysTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/CleanupOrphanKeysTest.java index 01d2e9d3fc..07d742ad45 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/CleanupOrphanKeysTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/CleanupOrphanKeysTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.trmk.vcloud_0_8.compute.strategy; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.jclouds.compute.predicates.NodePredicates.parentLocationId; import java.net.URI; @@ -33,8 +33,6 @@ import org.jclouds.compute.strategy.ListNodesStrategy; import org.jclouds.domain.Credentials; import org.jclouds.trmk.vcloud_0_8.compute.domain.OrgAndName; import org.jclouds.trmk.vcloud_0_8.compute.functions.NodeMetadataToOrgAndName; -import org.jclouds.trmk.vcloud_0_8.compute.strategy.CleanupOrphanKeys; -import org.jclouds.trmk.vcloud_0_8.compute.strategy.DeleteKeyPair; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/CreateNewKeyPairUnlessUserSpecifiedOtherwiseTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/CreateNewKeyPairUnlessUserSpecifiedOtherwiseTest.java index 4a89da2078..026e701b17 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/CreateNewKeyPairUnlessUserSpecifiedOtherwiseTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/CreateNewKeyPairUnlessUserSpecifiedOtherwiseTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.trmk.vcloud_0_8.compute.strategy; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.jclouds.trmk.vcloud_0_8.compute.options.TerremarkVCloudTemplateOptions.Builder.noKeyPair; import static org.jclouds.trmk.vcloud_0_8.compute.options.TerremarkVCloudTemplateOptions.Builder.sshKeyFingerprint; import static org.testng.Assert.assertEquals; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/DeleteKeyPairTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/DeleteKeyPairTest.java index f207e14135..69605f39df 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/DeleteKeyPairTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/compute/strategy/DeleteKeyPairTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.trmk.vcloud_0_8.compute.strategy; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import java.net.URI; import java.util.Map; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/filters/SetVCloudTokenCookieTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/filters/SetVCloudTokenCookieTest.java index 7002e86334..92a3eac8a6 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/filters/SetVCloudTokenCookieTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/filters/SetVCloudTokenCookieTest.java @@ -26,7 +26,6 @@ import javax.inject.Provider; import javax.ws.rs.core.HttpHeaders; import org.jclouds.http.HttpRequest; -import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/functions/ParseLoginResponseFromHeadersTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/functions/ParseLoginResponseFromHeadersTest.java index efb6451e64..26adc8a224 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/functions/ParseLoginResponseFromHeadersTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/functions/ParseLoginResponseFromHeadersTest.java @@ -29,7 +29,6 @@ import org.jclouds.io.Payloads; import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType; import org.jclouds.trmk.vcloud_0_8.domain.VCloudSession; import org.jclouds.trmk.vcloud_0_8.domain.internal.ReferenceTypeImpl; -import org.jclouds.trmk.vcloud_0_8.functions.ParseLoginResponseFromHeaders; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/handlers/ParseTerremarkVCloudErrorFromHttpResponseTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/handlers/ParseTerremarkVCloudErrorFromHttpResponseTest.java index 0846957469..6b9697aaff 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/handlers/ParseTerremarkVCloudErrorFromHttpResponseTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/handlers/ParseTerremarkVCloudErrorFromHttpResponseTest.java @@ -25,7 +25,6 @@ import org.jclouds.http.HttpErrorHandler; import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.InsufficientResourcesException; import org.jclouds.rest.ResourceNotFoundException; -import org.jclouds.trmk.vcloud_0_8.handlers.ParseTerremarkVCloudErrorFromHttpResponse; import org.testng.annotations.Test; /** diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/options/AddInternetServiceOptionsTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/options/AddInternetServiceOptionsTest.java index f39abeb554..efbce6a01a 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/options/AddInternetServiceOptionsTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/options/AddInternetServiceOptionsTest.java @@ -23,7 +23,6 @@ import static org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions.Buil import static org.testng.Assert.assertEquals; import org.jclouds.http.functions.config.SaxParserModule; -import org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions; import org.testng.annotations.Test; import com.google.inject.Guice; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/options/AddNodeOptionsTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/options/AddNodeOptionsTest.java index 77715d2d1a..273625dc28 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/options/AddNodeOptionsTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/options/AddNodeOptionsTest.java @@ -23,7 +23,6 @@ import static org.jclouds.trmk.vcloud_0_8.options.AddNodeOptions.Builder.withDes import static org.testng.Assert.assertEquals; import org.jclouds.http.functions.config.SaxParserModule; -import org.jclouds.trmk.vcloud_0_8.options.AddNodeOptions; import org.testng.annotations.Test; import com.google.inject.Guice; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefaultTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefaultTest.java index f36bc89ddb..52fdab9353 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefaultTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/suppliers/OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefaultTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.trmk.vcloud_0_8.suppliers; -import static org.easymock.classextension.EasyMock.createMock; +import static org.easymock.EasyMock.createMock; import static org.testng.Assert.assertEquals; import java.util.NoSuchElementException; @@ -26,7 +26,6 @@ import java.util.NoSuchElementException; import org.jclouds.config.ValueOfConfigurationKeyOrNull; import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType; import org.jclouds.trmk.vcloud_0_8.domain.internal.ReferenceTypeImpl; -import org.jclouds.trmk.vcloud_0_8.suppliers.OnlyReferenceTypeFirstWithNameMatchingConfigurationKeyOrDefault; import org.testng.annotations.Test; import com.google.common.base.Predicates; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/CatalogItemHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/CatalogItemHandlerTest.java index e2cb6bd056..1a4e1631ee 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/CatalogItemHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/CatalogItemHandlerTest.java @@ -30,9 +30,8 @@ import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.config.SaxParserModule; import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudPropertiesBuilder; import org.jclouds.trmk.vcloud_0_8.domain.CatalogItem; -import org.jclouds.trmk.vcloud_0_8.domain.internal.ReferenceTypeImpl; import org.jclouds.trmk.vcloud_0_8.domain.internal.CatalogItemImpl; -import org.jclouds.trmk.vcloud_0_8.xml.CatalogItemHandler; +import org.jclouds.trmk.vcloud_0_8.domain.internal.ReferenceTypeImpl; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/CustomizationParametersHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/CustomizationParametersHandlerTest.java index a93ed21fe1..be250ed3bc 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/CustomizationParametersHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/CustomizationParametersHandlerTest.java @@ -25,7 +25,6 @@ import java.net.UnknownHostException; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.CustomizationParameters; -import org.jclouds.trmk.vcloud_0_8.xml.CustomizationParametersHandler; import org.testng.annotations.Test; /** diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/DataCenterHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/DataCenterHandlerTest.java index 4fd14d87c7..7c70acc1be 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/DataCenterHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/DataCenterHandlerTest.java @@ -24,7 +24,6 @@ import java.io.InputStream; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.DataCenter; -import org.jclouds.trmk.vcloud_0_8.xml.DataCenterHandler; import org.testng.annotations.Test; /** diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/DataCentersHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/DataCentersHandlerTest.java index 36ae069864..301517bad7 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/DataCentersHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/DataCentersHandlerTest.java @@ -25,7 +25,6 @@ import java.util.Set; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.DataCenter; -import org.jclouds.trmk.vcloud_0_8.xml.DataCentersHandler; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServiceHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServiceHandlerTest.java index 2b3d8f46d2..b0af2ba8f3 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServiceHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServiceHandlerTest.java @@ -28,7 +28,6 @@ import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.InternetService; import org.jclouds.trmk.vcloud_0_8.domain.Protocol; import org.jclouds.trmk.vcloud_0_8.domain.PublicIpAddress; -import org.jclouds.trmk.vcloud_0_8.xml.InternetServiceHandler; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServicesHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServicesHandlerTest.java index 6dec3b2601..a3fb07af2a 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServicesHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/InternetServicesHandlerTest.java @@ -29,7 +29,6 @@ import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.InternetService; import org.jclouds.trmk.vcloud_0_8.domain.Protocol; import org.jclouds.trmk.vcloud_0_8.domain.PublicIpAddress; -import org.jclouds.trmk.vcloud_0_8.xml.InternetServicesHandler; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/IpAddressesHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/IpAddressesHandlerTest.java index 14d60837f5..7559d39c35 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/IpAddressesHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/IpAddressesHandlerTest.java @@ -27,7 +27,6 @@ import java.util.Set; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.IpAddress; import org.jclouds.trmk.vcloud_0_8.domain.IpAddress.Status; -import org.jclouds.trmk.vcloud_0_8.xml.IpAddressesHandler; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/KeyPairByNameHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/KeyPairByNameHandlerTest.java index f6f8c5c464..9d138169fc 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/KeyPairByNameHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/KeyPairByNameHandlerTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.trmk.vcloud_0_8.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; @@ -30,7 +30,6 @@ import java.net.UnknownHostException; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.jclouds.trmk.vcloud_0_8.domain.KeyPair; -import org.jclouds.trmk.vcloud_0_8.xml.KeyPairByNameHandler; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/KeysHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/KeysHandlerTest.java index 50c8376dfa..5cd3c2ffc1 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/KeysHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/KeysHandlerTest.java @@ -27,7 +27,6 @@ import java.util.Set; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.KeyPair; -import org.jclouds.trmk.vcloud_0_8.xml.KeyPairsHandler; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NetworkExtendedInfoHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NetworkExtendedInfoHandlerTest.java index 0a958b3401..cfc2c10993 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NetworkExtendedInfoHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NetworkExtendedInfoHandlerTest.java @@ -26,7 +26,6 @@ import java.net.UnknownHostException; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.NetworkExtendedInfo; -import org.jclouds.trmk.vcloud_0_8.xml.NetworkExtendedInfoHandler; import org.testng.annotations.Test; /** diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NodeHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NodeHandlerTest.java index 070b0195c6..e84715edb8 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NodeHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NodeHandlerTest.java @@ -26,7 +26,6 @@ import java.net.UnknownHostException; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.Node; -import org.jclouds.trmk.vcloud_0_8.xml.NodeHandler; import org.testng.annotations.Test; /** diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NodesHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NodesHandlerTest.java index 91a90125c8..27ff4942e6 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NodesHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/NodesHandlerTest.java @@ -27,7 +27,6 @@ import java.util.Set; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.Node; -import org.jclouds.trmk.vcloud_0_8.xml.NodesHandler; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/OrgListHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/OrgListHandlerTest.java index b02b35602b..2a11b8b970 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/OrgListHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/OrgListHandlerTest.java @@ -27,7 +27,6 @@ import java.util.Map; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType; import org.jclouds.trmk.vcloud_0_8.domain.internal.ReferenceTypeImpl; -import org.jclouds.trmk.vcloud_0_8.xml.OrgListHandler; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/PublicIpAddressHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/PublicIpAddressHandlerTest.java index 9705057e4f..9e21327d37 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/PublicIpAddressHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/PublicIpAddressHandlerTest.java @@ -26,7 +26,6 @@ import java.net.UnknownHostException; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.PublicIpAddress; -import org.jclouds.trmk.vcloud_0_8.xml.PublicIpAddressHandler; import org.testng.annotations.Test; /** diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/PublicIpAddressesHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/PublicIpAddressesHandlerTest.java index fb2ef96733..aa7c155ae7 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/PublicIpAddressesHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/PublicIpAddressesHandlerTest.java @@ -27,7 +27,6 @@ import java.util.Set; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.trmk.vcloud_0_8.domain.PublicIpAddress; -import org.jclouds.trmk.vcloud_0_8.xml.PublicIpAddressesHandler; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/SupportedVersionsHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/SupportedVersionsHandlerTest.java index e81a898aa8..0d88af2d71 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/SupportedVersionsHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/SupportedVersionsHandlerTest.java @@ -27,7 +27,6 @@ import java.util.SortedMap; import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.ParseSax.Factory; import org.jclouds.http.functions.config.SaxParserModule; -import org.jclouds.trmk.vcloud_0_8.xml.SupportedVersionsHandler; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSortedMap; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/VAppHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/VAppHandlerTest.java index 10f9b5c76d..b43b80c623 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/VAppHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/VAppHandlerTest.java @@ -30,8 +30,8 @@ import java.util.Properties; import org.jclouds.Constants; import org.jclouds.cim.CIMPredicates; import org.jclouds.cim.ResourceAllocationSettingData; -import org.jclouds.cim.VirtualSystemSettingData; import org.jclouds.cim.ResourceAllocationSettingData.ResourceType; +import org.jclouds.cim.VirtualSystemSettingData; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.config.SaxParserModule; @@ -39,7 +39,6 @@ import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType; import org.jclouds.trmk.vcloud_0_8.domain.Status; import org.jclouds.trmk.vcloud_0_8.domain.VApp; import org.jclouds.trmk.vcloud_0_8.domain.internal.ReferenceTypeImpl; -import org.jclouds.trmk.vcloud_0_8.xml.VAppHandler; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/VAppTemplateHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/VAppTemplateHandlerTest.java index 38879fba36..2df1fcaa84 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/VAppTemplateHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/VAppTemplateHandlerTest.java @@ -28,7 +28,6 @@ import org.jclouds.http.functions.ParseSax.Factory; import org.jclouds.http.functions.config.SaxParserModule; import org.jclouds.trmk.vcloud_0_8.domain.VAppTemplate; import org.jclouds.trmk.vcloud_0_8.domain.internal.VAppTemplateImpl; -import org.jclouds.trmk.vcloud_0_8.xml.VAppTemplateHandler; import org.testng.annotations.Test; import com.google.inject.Guice; diff --git a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/ovf/VAppHandlerTest.java b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/ovf/VAppHandlerTest.java index 34517bf09d..cabc10efaa 100644 --- a/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/ovf/VAppHandlerTest.java +++ b/common/trmk/src/test/java/org/jclouds/trmk/vcloud_0_8/xml/ovf/VAppHandlerTest.java @@ -28,8 +28,8 @@ import java.util.Set; import org.jclouds.Constants; import org.jclouds.cim.ResourceAllocationSettingData; -import org.jclouds.cim.VirtualSystemSettingData; import org.jclouds.cim.ResourceAllocationSettingData.ResourceType; +import org.jclouds.cim.VirtualSystemSettingData; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.config.SaxParserModule; diff --git a/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java b/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java index 5782f9a1d8..ab54485971 100644 --- a/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java +++ b/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java @@ -24,7 +24,6 @@ import static org.jclouds.util.Throwables2.propagateAuthorizationOrOriginalExcep import java.util.Properties; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextSpec; diff --git a/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java b/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java index b9ae5c461b..ffbc8082be 100644 --- a/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java +++ b/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java @@ -23,11 +23,10 @@ import static org.jclouds.compute.util.ComputeServiceUtils.createNodeErrorMessag import java.util.Map; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.ExecResponse; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.options.RunScriptOptions; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.scriptbuilder.domain.Statement; /** diff --git a/compute/src/main/java/org/jclouds/compute/Utils.java b/compute/src/main/java/org/jclouds/compute/Utils.java index 79d801e56f..d8dc073fc2 100644 --- a/compute/src/main/java/org/jclouds/compute/Utils.java +++ b/compute/src/main/java/org/jclouds/compute/Utils.java @@ -18,10 +18,9 @@ */ package org.jclouds.compute; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.internal.UtilsImpl; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ssh.SshClient; import com.google.common.base.Function; diff --git a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java index b72d325b70..2c9c19d732 100644 --- a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java +++ b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java @@ -26,8 +26,8 @@ import javax.inject.Named; import org.jclouds.compute.domain.ExecResponse; import org.jclouds.compute.domain.NodeMetadata; -import org.jclouds.compute.events.StatementOnNodeFailure; import org.jclouds.compute.events.StatementOnNodeCompletion; +import org.jclouds.compute.events.StatementOnNodeFailure; import org.jclouds.compute.events.StatementOnNodeSubmission; import org.jclouds.compute.options.RunScriptOptions; import org.jclouds.compute.reference.ComputeServiceConstants; diff --git a/compute/src/main/java/org/jclouds/compute/config/BindComputeStrategiesByClass.java b/compute/src/main/java/org/jclouds/compute/config/BindComputeStrategiesByClass.java index 2de2641669..b097fc527b 100644 --- a/compute/src/main/java/org/jclouds/compute/config/BindComputeStrategiesByClass.java +++ b/compute/src/main/java/org/jclouds/compute/config/BindComputeStrategiesByClass.java @@ -19,11 +19,11 @@ package org.jclouds.compute.config; import org.jclouds.compute.strategy.CreateNodeWithGroupEncodedIntoName; +import org.jclouds.compute.strategy.CreateNodesInGroupThenAddToSet; import org.jclouds.compute.strategy.DestroyNodeStrategy; import org.jclouds.compute.strategy.GetNodeMetadataStrategy; import org.jclouds.compute.strategy.ListNodesStrategy; import org.jclouds.compute.strategy.RebootNodeStrategy; -import org.jclouds.compute.strategy.CreateNodesInGroupThenAddToSet; import org.jclouds.compute.strategy.ResumeNodeStrategy; import org.jclouds.compute.strategy.SuspendNodeStrategy; import org.jclouds.compute.strategy.impl.CreateNodesWithGroupEncodedIntoNameThenAddToSet; diff --git a/compute/src/main/java/org/jclouds/compute/config/ResolvesImages.java b/compute/src/main/java/org/jclouds/compute/config/ResolvesImages.java index 0a69870261..2f6c1c301e 100644 --- a/compute/src/main/java/org/jclouds/compute/config/ResolvesImages.java +++ b/compute/src/main/java/org/jclouds/compute/config/ResolvesImages.java @@ -18,12 +18,12 @@ */ package org.jclouds.compute.config; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + /** * Marks that the module can augment an images of * a given cloud. diff --git a/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java b/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java index 54b9936326..601b673bf1 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java +++ b/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java @@ -18,9 +18,8 @@ */ package org.jclouds.compute.domain; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.cim.OSType; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ovf.Envelope; import com.google.common.annotations.Beta; diff --git a/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java b/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java index 747eafc071..347acb0b95 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java +++ b/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java @@ -20,10 +20,9 @@ package org.jclouds.compute.domain; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.internal.ComputeMetadataImpl; import org.jclouds.domain.ResourceMetadata; +import org.jclouds.javax.annotation.Nullable; import com.google.inject.ImplementedBy; diff --git a/compute/src/main/java/org/jclouds/compute/domain/NodeMetadata.java b/compute/src/main/java/org/jclouds/compute/domain/NodeMetadata.java index 0a0a67a50d..36343a7cbf 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/NodeMetadata.java +++ b/compute/src/main/java/org/jclouds/compute/domain/NodeMetadata.java @@ -20,6 +20,7 @@ package org.jclouds.compute.domain; import java.util.Set; +import org.jclouds.compute.ComputeServiceContext; import org.jclouds.compute.domain.internal.NodeMetadataImpl; import org.jclouds.domain.LoginCredentials; import org.jclouds.javax.annotation.Nullable; diff --git a/compute/src/main/java/org/jclouds/compute/domain/NodeMetadataBuilder.java b/compute/src/main/java/org/jclouds/compute/domain/NodeMetadataBuilder.java index a10e6110e1..ff6ebf06b2 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/NodeMetadataBuilder.java +++ b/compute/src/main/java/org/jclouds/compute/domain/NodeMetadataBuilder.java @@ -24,13 +24,12 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.internal.NodeMetadataImpl; import org.jclouds.domain.Credentials; import org.jclouds.domain.Location; import org.jclouds.domain.LoginCredentials; import org.jclouds.domain.LoginCredentials.Builder; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; diff --git a/compute/src/main/java/org/jclouds/compute/domain/Volume.java b/compute/src/main/java/org/jclouds/compute/domain/Volume.java index d905b55abf..1855d9948d 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/Volume.java +++ b/compute/src/main/java/org/jclouds/compute/domain/Volume.java @@ -18,9 +18,8 @@ */ package org.jclouds.compute.domain; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.internal.VolumeImpl; +import org.jclouds.javax.annotation.Nullable; import com.google.inject.ImplementedBy; diff --git a/compute/src/main/java/org/jclouds/compute/domain/VolumeBuilder.java b/compute/src/main/java/org/jclouds/compute/domain/VolumeBuilder.java index 9fc270d083..38f4e85c16 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/VolumeBuilder.java +++ b/compute/src/main/java/org/jclouds/compute/domain/VolumeBuilder.java @@ -20,9 +20,8 @@ package org.jclouds.compute.domain; import static com.google.common.base.Preconditions.checkNotNull; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.internal.VolumeImpl; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java index e31d5264a0..717e3b0cd2 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java @@ -27,8 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.ComputeType; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.Image; @@ -36,6 +34,7 @@ import org.jclouds.compute.domain.Processor; import org.jclouds.compute.domain.Volume; import org.jclouds.domain.Location; import org.jclouds.domain.ResourceMetadata; +import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Predicate; import com.google.common.collect.ComparisonChain; diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java index 6574da6613..79a329cd6a 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java @@ -24,8 +24,6 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.ComputeType; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.NodeMetadata; @@ -35,6 +33,7 @@ import org.jclouds.domain.Credentials; import org.jclouds.domain.Location; import org.jclouds.domain.LoginCredentials; import org.jclouds.domain.LoginCredentials.Builder; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java index 0bbcd575d5..ee5c0968d9 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java @@ -20,8 +20,8 @@ package org.jclouds.compute.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; -import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Hardware; +import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Template; import org.jclouds.compute.options.TemplateOptions; import org.jclouds.domain.Location; diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java index baeac214e6..fd71d11565 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java @@ -20,9 +20,8 @@ package org.jclouds.compute.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.Volume; +import org.jclouds.javax.annotation.Nullable; /** * @author Adrian Cole diff --git a/compute/src/main/java/org/jclouds/compute/internal/PersistNodeCredentials.java b/compute/src/main/java/org/jclouds/compute/internal/PersistNodeCredentials.java index cc5eeff9c9..a1ecdd716d 100644 --- a/compute/src/main/java/org/jclouds/compute/internal/PersistNodeCredentials.java +++ b/compute/src/main/java/org/jclouds/compute/internal/PersistNodeCredentials.java @@ -18,10 +18,10 @@ */ package org.jclouds.compute.internal; -import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import org.jclouds.compute.domain.NodeMetadata; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.scriptbuilder.domain.Statement; import com.google.common.base.Function; diff --git a/compute/src/main/java/org/jclouds/compute/internal/UtilsImpl.java b/compute/src/main/java/org/jclouds/compute/internal/UtilsImpl.java index bcaab810b8..511db6b67c 100644 --- a/compute/src/main/java/org/jclouds/compute/internal/UtilsImpl.java +++ b/compute/src/main/java/org/jclouds/compute/internal/UtilsImpl.java @@ -23,7 +23,6 @@ import java.util.concurrent.ExecutorService; import javax.inject.Named; import javax.inject.Singleton; -import com.google.inject.Injector; import org.jclouds.Constants; import org.jclouds.compute.Utils; import org.jclouds.compute.domain.NodeMetadata; @@ -39,6 +38,7 @@ import org.jclouds.ssh.SshClient.Factory; import com.google.common.base.Function; import com.google.common.eventbus.EventBus; import com.google.inject.Inject; +import com.google.inject.Injector; /** * diff --git a/compute/src/main/java/org/jclouds/compute/predicates/ImagePredicates.java b/compute/src/main/java/org/jclouds/compute/predicates/ImagePredicates.java index c3b49ec995..0156d29352 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/ImagePredicates.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/ImagePredicates.java @@ -22,9 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.Image; +import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java index f666b4add2..178f870e09 100644 --- a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java +++ b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java @@ -19,8 +19,8 @@ package org.jclouds.compute.stub.config; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; @@ -48,8 +48,8 @@ import org.jclouds.rest.ResourceNotFoundException; import com.google.common.base.Supplier; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableList.Builder; +import com.google.common.collect.ImmutableSet; /** * diff --git a/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java b/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java index b5be626e57..084cff0d51 100644 --- a/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java +++ b/compute/src/main/java/org/jclouds/compute/util/ComputeServiceUtils.java @@ -30,8 +30,8 @@ import static org.jclouds.scriptbuilder.domain.Statements.pipeHttpResponseToBash import java.net.URI; import java.util.Formatter; import java.util.Map; -import java.util.NoSuchElementException; import java.util.Map.Entry; +import java.util.NoSuchElementException; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/compute/src/main/java/org/jclouds/ovf/OperatingSystemSection.java b/compute/src/main/java/org/jclouds/ovf/OperatingSystemSection.java index 30fdc1d063..4aab658169 100644 --- a/compute/src/main/java/org/jclouds/ovf/OperatingSystemSection.java +++ b/compute/src/main/java/org/jclouds/ovf/OperatingSystemSection.java @@ -18,9 +18,8 @@ */ package org.jclouds.ovf; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.cim.OSType; +import org.jclouds.javax.annotation.Nullable; /** * An OperatingSystemSection specifies the operating system installed on a virtual machine. diff --git a/compute/src/main/java/org/jclouds/ovf/xml/EnvelopeHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/EnvelopeHandler.java index b415224d16..5a05f4bc30 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/EnvelopeHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/EnvelopeHandler.java @@ -22,8 +22,8 @@ import javax.inject.Inject; import javax.inject.Provider; import org.jclouds.ovf.Envelope; -import org.jclouds.ovf.VirtualSystem; import org.jclouds.ovf.Envelope.Builder; +import org.jclouds.ovf.VirtualSystem; import org.jclouds.ovf.xml.internal.BaseEnvelopeHandler; /** diff --git a/compute/src/main/java/org/jclouds/ovf/xml/NetworkSectionHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/NetworkSectionHandler.java index 0b80c65bd5..9bedda831c 100644 --- a/compute/src/main/java/org/jclouds/ovf/xml/NetworkSectionHandler.java +++ b/compute/src/main/java/org/jclouds/ovf/xml/NetworkSectionHandler.java @@ -28,7 +28,6 @@ import javax.inject.Provider; import org.jclouds.ovf.Network; import org.jclouds.ovf.NetworkSection; -import org.jclouds.ovf.xml.SectionHandler; import org.jclouds.util.SaxUtils; import org.xml.sax.Attributes; diff --git a/compute/src/test/java/org/jclouds/cim/xml/ResourceAllocationSettingDataHandlerTest.java b/compute/src/test/java/org/jclouds/cim/xml/ResourceAllocationSettingDataHandlerTest.java index ff34bfe099..57c95daa9d 100644 --- a/compute/src/test/java/org/jclouds/cim/xml/ResourceAllocationSettingDataHandlerTest.java +++ b/compute/src/test/java/org/jclouds/cim/xml/ResourceAllocationSettingDataHandlerTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; import org.jclouds.cim.ResourceAllocationSettingData; -import org.jclouds.cim.xml.ResourceAllocationSettingDataHandler; import org.jclouds.http.functions.BaseHandlerTest; import org.testng.annotations.Test; diff --git a/compute/src/test/java/org/jclouds/cim/xml/VirtualSystemSettingDataHandlerTest.java b/compute/src/test/java/org/jclouds/cim/xml/VirtualSystemSettingDataHandlerTest.java index d693593ee9..5417fab19e 100644 --- a/compute/src/test/java/org/jclouds/cim/xml/VirtualSystemSettingDataHandlerTest.java +++ b/compute/src/test/java/org/jclouds/cim/xml/VirtualSystemSettingDataHandlerTest.java @@ -23,8 +23,8 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; import org.jclouds.cim.ResourceAllocationSettingData; -import org.jclouds.cim.VirtualSystemSettingData; import org.jclouds.cim.ResourceAllocationSettingData.ResourceType; +import org.jclouds.cim.VirtualSystemSettingData; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.ParseSax.Factory; diff --git a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java index 2c42a16a19..551e37510d 100644 --- a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java +++ b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.compute; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.eq; 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.classextension.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.FileNotFoundException; diff --git a/compute/src/test/java/org/jclouds/compute/config/ComputeServicePropertiesTest.java b/compute/src/test/java/org/jclouds/compute/config/ComputeServicePropertiesTest.java index 3356e60214..10323446fc 100644 --- a/compute/src/test/java/org/jclouds/compute/config/ComputeServicePropertiesTest.java +++ b/compute/src/test/java/org/jclouds/compute/config/ComputeServicePropertiesTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.assertEquals; import java.util.Properties; import org.jclouds.compute.ComputeServiceContextFactory; -import org.jclouds.compute.config.ComputeServiceProperties; import org.jclouds.compute.reference.ComputeServiceConstants.InitStatusProperties; import org.testng.annotations.Test; diff --git a/compute/src/test/java/org/jclouds/compute/config/GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNullTest.java b/compute/src/test/java/org/jclouds/compute/config/GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNullTest.java index f0b7777b97..127f38e61c 100644 --- a/compute/src/test/java/org/jclouds/compute/config/GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNullTest.java +++ b/compute/src/test/java/org/jclouds/compute/config/GetLoginForProviderFromPropertiesAndStoreCredentialsOrReturnNullTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.compute.config; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.util.Map; diff --git a/compute/src/test/java/org/jclouds/compute/config/PersistNodeCredentialsTest.java b/compute/src/test/java/org/jclouds/compute/config/PersistNodeCredentialsTest.java index ac472de6d0..31fb4918b1 100644 --- a/compute/src/test/java/org/jclouds/compute/config/PersistNodeCredentialsTest.java +++ b/compute/src/test/java/org/jclouds/compute/config/PersistNodeCredentialsTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.compute.config; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.util.Map; diff --git a/compute/src/test/java/org/jclouds/compute/functions/DefaultCredentialsFromImageOrOverridingCredentialsTest.java b/compute/src/test/java/org/jclouds/compute/functions/DefaultCredentialsFromImageOrOverridingCredentialsTest.java index 022c3d7f1a..f5fbd518e3 100644 --- a/compute/src/test/java/org/jclouds/compute/functions/DefaultCredentialsFromImageOrOverridingCredentialsTest.java +++ b/compute/src/test/java/org/jclouds/compute/functions/DefaultCredentialsFromImageOrOverridingCredentialsTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.compute.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import org.jclouds.compute.domain.Image; diff --git a/compute/src/test/java/org/jclouds/compute/predicates/RetryIfSocketNotYetOpenTest.java b/compute/src/test/java/org/jclouds/compute/predicates/RetryIfSocketNotYetOpenTest.java index 840e23684f..1b2f859b3c 100644 --- a/compute/src/test/java/org/jclouds/compute/predicates/RetryIfSocketNotYetOpenTest.java +++ b/compute/src/test/java/org/jclouds/compute/predicates/RetryIfSocketNotYetOpenTest.java @@ -18,8 +18,9 @@ */ package org.jclouds.compute.predicates; -import static org.testng.Assert.*; -import static org.jclouds.compute.predicates.SocketOpenPredicates.*; +import static org.jclouds.compute.predicates.SocketOpenPredicates.alwaysFail; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; import java.util.concurrent.TimeUnit; diff --git a/compute/src/test/java/org/jclouds/compute/strategy/PrioritizeCredentialsFromTemplateTest.java b/compute/src/test/java/org/jclouds/compute/strategy/PrioritizeCredentialsFromTemplateTest.java index 017b6f90cf..f3cf1ce6f7 100644 --- a/compute/src/test/java/org/jclouds/compute/strategy/PrioritizeCredentialsFromTemplateTest.java +++ b/compute/src/test/java/org/jclouds/compute/strategy/PrioritizeCredentialsFromTemplateTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.compute.strategy; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import org.jclouds.compute.domain.Image; diff --git a/compute/src/test/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImageTest.java b/compute/src/test/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImageTest.java index a1d943883e..58df466486 100644 --- a/compute/src/test/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImageTest.java +++ b/compute/src/test/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImageTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.compute.strategy.impl; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import org.jclouds.compute.domain.Image; diff --git a/core/src/main/java/org/jclouds/concurrent/DynamicThreadPoolExecutor.java b/core/src/main/java/org/jclouds/concurrent/DynamicThreadPoolExecutor.java index 407116e87b..1e8e3acee6 100644 --- a/core/src/main/java/org/jclouds/concurrent/DynamicThreadPoolExecutor.java +++ b/core/src/main/java/org/jclouds/concurrent/DynamicThreadPoolExecutor.java @@ -38,7 +38,15 @@ package org.jclouds.concurrent; -import java.util.concurrent.*; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.RejectedExecutionHandler; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; /** diff --git a/core/src/main/java/org/jclouds/concurrent/MoreExecutors.java b/core/src/main/java/org/jclouds/concurrent/MoreExecutors.java index e43341b0dc..c1de84c3cf 100644 --- a/core/src/main/java/org/jclouds/concurrent/MoreExecutors.java +++ b/core/src/main/java/org/jclouds/concurrent/MoreExecutors.java @@ -39,8 +39,8 @@ import java.util.List; import java.util.concurrent.AbstractExecutorService; import java.util.concurrent.ExecutorService; import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.TimeUnit; import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy; +import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/core/src/main/java/org/jclouds/crypto/CryptoStreams.java b/core/src/main/java/org/jclouds/crypto/CryptoStreams.java index b9d139a31f..9b650dfc74 100644 --- a/core/src/main/java/org/jclouds/crypto/CryptoStreams.java +++ b/core/src/main/java/org/jclouds/crypto/CryptoStreams.java @@ -18,16 +18,8 @@ */ package org.jclouds.crypto; -import com.google.common.annotations.Beta; -import com.google.common.base.Charsets; -import com.google.common.base.Throwables; -import com.google.common.io.ByteProcessor; -import com.google.common.io.ByteStreams; -import com.google.common.io.InputSupplier; -import org.jclouds.encryption.internal.Base64; -import org.jclouds.io.InputSuppliers; +import static com.google.common.base.Preconditions.checkNotNull; -import javax.crypto.Mac; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -37,7 +29,17 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import static com.google.common.base.Preconditions.checkNotNull; +import javax.crypto.Mac; + +import org.jclouds.encryption.internal.Base64; +import org.jclouds.io.InputSuppliers; + +import com.google.common.annotations.Beta; +import com.google.common.base.Charsets; +import com.google.common.base.Throwables; +import com.google.common.io.ByteProcessor; +import com.google.common.io.ByteStreams; +import com.google.common.io.InputSupplier; /** * functions related to but not in {@link com.google.common.io.ByteStreams} diff --git a/core/src/main/java/org/jclouds/crypto/Pems.java b/core/src/main/java/org/jclouds/crypto/Pems.java index 55740ed4d1..bcde3deb91 100644 --- a/core/src/main/java/org/jclouds/crypto/Pems.java +++ b/core/src/main/java/org/jclouds/crypto/Pems.java @@ -38,8 +38,6 @@ import java.security.spec.RSAPrivateKeySpec; import java.security.spec.X509EncodedKeySpec; import java.util.Map; -import org.jclouds.javax.annotation.Nullable; - import net.oauth.signature.pem.PEMReader; import net.oauth.signature.pem.PKCS1EncodedKeySpec; @@ -48,6 +46,7 @@ import org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure; import org.jclouds.crypto.Pems.PemProcessor.ResultParser; import org.jclouds.crypto.pem.PKCS1EncodedPublicKeySpec; import org.jclouds.io.InputSuppliers; +import org.jclouds.javax.annotation.Nullable; import com.google.common.annotations.Beta; import com.google.common.base.Joiner; diff --git a/core/src/main/java/org/jclouds/crypto/Sha512Crypt.java b/core/src/main/java/org/jclouds/crypto/Sha512Crypt.java index 2df11d5357..e5e6db3c9e 100644 --- a/core/src/main/java/org/jclouds/crypto/Sha512Crypt.java +++ b/core/src/main/java/org/jclouds/crypto/Sha512Crypt.java @@ -66,9 +66,8 @@ package org.jclouds.crypto; import java.security.MessageDigest; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.encryption.internal.JCECrypto; +import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Throwables; diff --git a/core/src/main/java/org/jclouds/crypto/SshKeys.java b/core/src/main/java/org/jclouds/crypto/SshKeys.java index f901b97f4f..09b609acd2 100644 --- a/core/src/main/java/org/jclouds/crypto/SshKeys.java +++ b/core/src/main/java/org/jclouds/crypto/SshKeys.java @@ -54,8 +54,8 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.Iterables; import com.google.common.io.InputSupplier; /** diff --git a/core/src/main/java/org/jclouds/date/internal/SimpleDateFormatDateService.java b/core/src/main/java/org/jclouds/date/internal/SimpleDateFormatDateService.java index 4137f9ac40..78b54a24d6 100644 --- a/core/src/main/java/org/jclouds/date/internal/SimpleDateFormatDateService.java +++ b/core/src/main/java/org/jclouds/date/internal/SimpleDateFormatDateService.java @@ -17,7 +17,9 @@ * under the License. */ package org.jclouds.date.internal; -import static org.jclouds.date.internal.DateUtils.*; +import static org.jclouds.date.internal.DateUtils.findTZ; +import static org.jclouds.date.internal.DateUtils.trimTZ; +import static org.jclouds.date.internal.DateUtils.trimToMillis; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/core/src/main/java/org/jclouds/domain/Credentials.java b/core/src/main/java/org/jclouds/domain/Credentials.java index 08f8018354..70926f9874 100644 --- a/core/src/main/java/org/jclouds/domain/Credentials.java +++ b/core/src/main/java/org/jclouds/domain/Credentials.java @@ -23,9 +23,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.List; -import com.google.common.base.Objects; import org.jclouds.util.Strings2; +import com.google.common.base.Objects; import com.google.common.base.Splitter; import com.google.common.collect.Lists; diff --git a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java index e282ceb3fb..46153efe01 100644 --- a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java +++ b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java @@ -24,10 +24,9 @@ import java.io.Serializable; import java.util.Map; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.domain.Location; import org.jclouds.domain.LocationScope; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java index 0c19c082b8..7ae615d2c2 100644 --- a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java +++ b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java @@ -24,10 +24,9 @@ import java.io.Serializable; import java.net.URI; import java.util.Map; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.domain.Location; import org.jclouds.domain.ResourceMetadata; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.Maps; diff --git a/core/src/main/java/org/jclouds/encryption/internal/JCECrypto.java b/core/src/main/java/org/jclouds/encryption/internal/JCECrypto.java index 4c6dfd6fee..28e29f9123 100644 --- a/core/src/main/java/org/jclouds/encryption/internal/JCECrypto.java +++ b/core/src/main/java/org/jclouds/encryption/internal/JCECrypto.java @@ -27,8 +27,6 @@ import java.security.Provider; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; -import org.jclouds.javax.annotation.Nullable; - import javax.crypto.Cipher; import javax.crypto.Mac; import javax.crypto.NoSuchPaddingException; @@ -37,6 +35,7 @@ import javax.inject.Inject; import javax.inject.Singleton; import org.jclouds.crypto.Crypto; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/core/src/main/java/org/jclouds/functions/ExceptionToValueOrPropagate.java b/core/src/main/java/org/jclouds/functions/ExceptionToValueOrPropagate.java index 081fb11d33..5f8b7e176e 100644 --- a/core/src/main/java/org/jclouds/functions/ExceptionToValueOrPropagate.java +++ b/core/src/main/java/org/jclouds/functions/ExceptionToValueOrPropagate.java @@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.util.Throwables2; import com.google.common.base.Function; diff --git a/core/src/main/java/org/jclouds/functions/JoinOnComma.java b/core/src/main/java/org/jclouds/functions/JoinOnComma.java index 0573e00bdc..9e166b854e 100644 --- a/core/src/main/java/org/jclouds/functions/JoinOnComma.java +++ b/core/src/main/java/org/jclouds/functions/JoinOnComma.java @@ -28,8 +28,8 @@ import javax.inject.Singleton; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; import com.google.common.collect.ImmutableList.Builder; +import com.google.common.collect.Iterables; /** * diff --git a/core/src/main/java/org/jclouds/functions/JoinOnK2.java b/core/src/main/java/org/jclouds/functions/JoinOnK2.java index 39817511c4..23866bc0fd 100644 --- a/core/src/main/java/org/jclouds/functions/JoinOnK2.java +++ b/core/src/main/java/org/jclouds/functions/JoinOnK2.java @@ -19,8 +19,8 @@ package org.jclouds.functions; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import com.google.common.base.Function; import com.google.common.base.Supplier; diff --git a/core/src/main/java/org/jclouds/http/HttpMessage.java b/core/src/main/java/org/jclouds/http/HttpMessage.java index 226d3cf46c..3c016e6341 100644 --- a/core/src/main/java/org/jclouds/http/HttpMessage.java +++ b/core/src/main/java/org/jclouds/http/HttpMessage.java @@ -22,10 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collection; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.http.internal.PayloadEnclosingImpl; import org.jclouds.io.Payload; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; diff --git a/core/src/main/java/org/jclouds/http/HttpResponse.java b/core/src/main/java/org/jclouds/http/HttpResponse.java index 95db165311..efc30f8d61 100644 --- a/core/src/main/java/org/jclouds/http/HttpResponse.java +++ b/core/src/main/java/org/jclouds/http/HttpResponse.java @@ -18,9 +18,8 @@ */ package org.jclouds.http; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.io.Payload; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; diff --git a/core/src/main/java/org/jclouds/http/HttpResponseException.java b/core/src/main/java/org/jclouds/http/HttpResponseException.java index 4cdcb9e26c..b1e03d4d03 100644 --- a/core/src/main/java/org/jclouds/http/HttpResponseException.java +++ b/core/src/main/java/org/jclouds/http/HttpResponseException.java @@ -20,9 +20,8 @@ package org.jclouds.http; import java.io.IOException; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.io.payloads.StringPayload; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.util.Strings2; /** diff --git a/core/src/main/java/org/jclouds/http/annotation/ClientError.java b/core/src/main/java/org/jclouds/http/annotation/ClientError.java index 99960a37a9..b8ce1fe1d0 100644 --- a/core/src/main/java/org/jclouds/http/annotation/ClientError.java +++ b/core/src/main/java/org/jclouds/http/annotation/ClientError.java @@ -18,13 +18,15 @@ */ package org.jclouds.http.annotation; -import javax.inject.Qualifier; -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; /** * Implies that the object can address {@link org.jclouds.http.HttpResponse}s diff --git a/core/src/main/java/org/jclouds/http/annotation/Redirection.java b/core/src/main/java/org/jclouds/http/annotation/Redirection.java index f43d9164aa..ae6b6be2f3 100644 --- a/core/src/main/java/org/jclouds/http/annotation/Redirection.java +++ b/core/src/main/java/org/jclouds/http/annotation/Redirection.java @@ -18,13 +18,15 @@ */ package org.jclouds.http.annotation; -import javax.inject.Qualifier; -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; /** * Implies that the object can address {@link org.jclouds.http.HttpResponse}s that contain status diff --git a/core/src/main/java/org/jclouds/http/annotation/ServerError.java b/core/src/main/java/org/jclouds/http/annotation/ServerError.java index b4bd197ccd..343ef750c4 100644 --- a/core/src/main/java/org/jclouds/http/annotation/ServerError.java +++ b/core/src/main/java/org/jclouds/http/annotation/ServerError.java @@ -18,13 +18,15 @@ */ package org.jclouds.http.annotation; -import javax.inject.Qualifier; -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; /** * Implies that the object can address {@link org.jclouds.http.HttpResponse}s that contain status diff --git a/core/src/main/java/org/jclouds/http/functions/ReturnFalseOn404.java b/core/src/main/java/org/jclouds/http/functions/ReturnFalseOn404.java index 98a756112f..5030acd6fd 100644 --- a/core/src/main/java/org/jclouds/http/functions/ReturnFalseOn404.java +++ b/core/src/main/java/org/jclouds/http/functions/ReturnFalseOn404.java @@ -24,7 +24,6 @@ import static org.jclouds.util.Throwables2.propagateOrNull; import javax.inject.Singleton; - import com.google.common.base.Function; /** diff --git a/core/src/main/java/org/jclouds/http/functions/ReturnTrueOn404.java b/core/src/main/java/org/jclouds/http/functions/ReturnTrueOn404.java index fe7a744697..b1a32ef445 100644 --- a/core/src/main/java/org/jclouds/http/functions/ReturnTrueOn404.java +++ b/core/src/main/java/org/jclouds/http/functions/ReturnTrueOn404.java @@ -24,7 +24,6 @@ import static org.jclouds.util.Throwables2.propagateOrNull; import javax.inject.Singleton; - import com.google.common.base.Function; @Singleton diff --git a/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java b/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java index ffaf49e1a1..dd23d06607 100644 --- a/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java +++ b/core/src/main/java/org/jclouds/http/internal/BaseHttpCommandExecutorService.java @@ -18,7 +18,22 @@ */ package org.jclouds.http.internal; -import com.google.common.io.NullOutputStream; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.io.ByteStreams.copy; +import static org.jclouds.http.HttpUtils.checkRequestHasContentLengthOrChunkedEncoding; +import static org.jclouds.http.HttpUtils.wirePayloadIfEnabled; + +import java.io.FilterInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; + +import javax.annotation.Resource; +import javax.inject.Inject; +import javax.inject.Named; + import org.jclouds.Constants; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpCommandExecutorService; @@ -33,20 +48,7 @@ import org.jclouds.http.handlers.DelegatingRetryHandler; import org.jclouds.logging.Logger; import org.jclouds.util.Throwables2; -import javax.annotation.Resource; -import javax.inject.Inject; -import javax.inject.Named; -import java.io.FilterInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; - -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.io.ByteStreams.copy; -import static org.jclouds.http.HttpUtils.checkRequestHasContentLengthOrChunkedEncoding; -import static org.jclouds.http.HttpUtils.wirePayloadIfEnabled; +import com.google.common.io.NullOutputStream; /** * diff --git a/core/src/main/java/org/jclouds/http/internal/PayloadEnclosingImpl.java b/core/src/main/java/org/jclouds/http/internal/PayloadEnclosingImpl.java index 903cb6de3e..82ef56fe32 100644 --- a/core/src/main/java/org/jclouds/http/internal/PayloadEnclosingImpl.java +++ b/core/src/main/java/org/jclouds/http/internal/PayloadEnclosingImpl.java @@ -24,10 +24,9 @@ import static org.jclouds.io.Payloads.newPayload; import java.io.File; import java.io.InputStream; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.io.Payload; import org.jclouds.io.PayloadEnclosing; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/core/src/main/java/org/jclouds/http/utils/ModifyRequest.java b/core/src/main/java/org/jclouds/http/utils/ModifyRequest.java index 76c830931b..bb2e5f89f8 100644 --- a/core/src/main/java/org/jclouds/http/utils/ModifyRequest.java +++ b/core/src/main/java/org/jclouds/http/utils/ModifyRequest.java @@ -18,6 +18,20 @@ */ package org.jclouds.http.utils; +import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.io.Payloads.newUrlEncodedFormPayload; + +import java.net.URI; +import java.util.Comparator; +import java.util.Iterator; +import java.util.Map; + +import javax.ws.rs.core.UriBuilder; + +import org.jclouds.http.HttpRequest; +import org.jclouds.javax.annotation.Nullable; +import org.jclouds.util.Strings2; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; @@ -25,18 +39,6 @@ import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; -import org.jclouds.http.HttpRequest; -import org.jclouds.javax.annotation.Nullable; -import org.jclouds.util.Strings2; - -import javax.ws.rs.core.UriBuilder; -import java.net.URI; -import java.util.Comparator; -import java.util.Iterator; -import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; -import static org.jclouds.io.Payloads.newUrlEncodedFormPayload; /** * diff --git a/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java b/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java index 2b6dcbfb59..04980c475e 100644 --- a/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java +++ b/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java @@ -26,10 +26,9 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Map.Entry; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.crypto.CryptoStreams; import org.jclouds.io.payloads.BaseImmutableContentMetadata; +import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Predicate; import com.google.common.collect.Multimap; diff --git a/core/src/main/java/org/jclouds/io/Payloads.java b/core/src/main/java/org/jclouds/io/Payloads.java index 9c3362e4e1..d305c15a01 100644 --- a/core/src/main/java/org/jclouds/io/Payloads.java +++ b/core/src/main/java/org/jclouds/io/Payloads.java @@ -30,14 +30,13 @@ import java.security.NoSuchAlgorithmException; import java.util.Comparator; import java.util.Map; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.crypto.CryptoStreams; import org.jclouds.io.payloads.ByteArrayPayload; import org.jclouds.io.payloads.FilePayload; import org.jclouds.io.payloads.InputStreamPayload; import org.jclouds.io.payloads.StringPayload; import org.jclouds.io.payloads.UrlEncodedFormPayload; +import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Throwables; import com.google.common.collect.Multimap; diff --git a/core/src/main/java/org/jclouds/io/payloads/BaseMutableContentMetadata.java b/core/src/main/java/org/jclouds/io/payloads/BaseMutableContentMetadata.java index bd4624a705..6f3e3f3b19 100644 --- a/core/src/main/java/org/jclouds/io/payloads/BaseMutableContentMetadata.java +++ b/core/src/main/java/org/jclouds/io/payloads/BaseMutableContentMetadata.java @@ -20,11 +20,10 @@ package org.jclouds.io.payloads; import java.io.Serializable; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.io.ContentMetadata; import org.jclouds.io.ContentMetadataBuilder; import org.jclouds.io.MutableContentMetadata; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.Multimap; diff --git a/core/src/main/java/org/jclouds/io/payloads/Part.java b/core/src/main/java/org/jclouds/io/payloads/Part.java index 00e138fcdb..93fab7af51 100644 --- a/core/src/main/java/org/jclouds/io/payloads/Part.java +++ b/core/src/main/java/org/jclouds/io/payloads/Part.java @@ -23,11 +23,11 @@ import static com.google.common.collect.Multimaps.forMap; import java.util.LinkedHashMap; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.core.HttpHeaders; import org.jclouds.io.Payload; import org.jclouds.io.Payloads; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; diff --git a/core/src/main/java/org/jclouds/io/payloads/UrlEncodedFormPayload.java b/core/src/main/java/org/jclouds/io/payloads/UrlEncodedFormPayload.java index 3080f761f7..ad4d979bd0 100644 --- a/core/src/main/java/org/jclouds/io/payloads/UrlEncodedFormPayload.java +++ b/core/src/main/java/org/jclouds/io/payloads/UrlEncodedFormPayload.java @@ -22,10 +22,10 @@ import java.io.InputStream; import java.util.Comparator; import java.util.Map; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.core.MediaType; import org.jclouds.http.utils.ModifyRequest; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.util.Strings2; import com.google.common.collect.Multimap; diff --git a/core/src/main/java/org/jclouds/json/config/GsonModule.java b/core/src/main/java/org/jclouds/json/config/GsonModule.java index 5087037880..2af1baf370 100644 --- a/core/src/main/java/org/jclouds/json/config/GsonModule.java +++ b/core/src/main/java/org/jclouds/json/config/GsonModule.java @@ -39,8 +39,8 @@ import org.jclouds.json.internal.GsonWrapper; import org.jclouds.json.internal.NullHackJsonLiteralAdapter; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.Maps; import com.google.common.primitives.Bytes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/core/src/main/java/org/jclouds/json/internal/EnumTypeAdapterThatReturnsFromValue.java b/core/src/main/java/org/jclouds/json/internal/EnumTypeAdapterThatReturnsFromValue.java index 46ca2ffcc8..9264d4d362 100644 --- a/core/src/main/java/org/jclouds/json/internal/EnumTypeAdapterThatReturnsFromValue.java +++ b/core/src/main/java/org/jclouds/json/internal/EnumTypeAdapterThatReturnsFromValue.java @@ -22,9 +22,9 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.concurrent.ExecutionException; -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.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; diff --git a/core/src/main/java/org/jclouds/location/functions/ZoneToEndpoint.java b/core/src/main/java/org/jclouds/location/functions/ZoneToEndpoint.java index bc18f3aac1..a140b10cb1 100644 --- a/core/src/main/java/org/jclouds/location/functions/ZoneToEndpoint.java +++ b/core/src/main/java/org/jclouds/location/functions/ZoneToEndpoint.java @@ -18,8 +18,9 @@ */ package org.jclouds.location.functions; +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.base.Preconditions.*; import java.net.URI; import java.util.Map; diff --git a/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProviderOrJustProvider.java b/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProviderOrJustProvider.java index 17f494a550..4ecf322abb 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProviderOrJustProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/all/RegionToProviderOrJustProvider.java @@ -34,8 +34,8 @@ import org.jclouds.location.Region; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.common.collect.ImmutableSet.Builder; +import com.google.common.collect.Iterables; /** * diff --git a/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java b/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java index e3df0f1757..a9b1129454 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java +++ b/core/src/main/java/org/jclouds/location/suppliers/all/ZoneToRegionToProviderOrJustProvider.java @@ -39,10 +39,10 @@ import org.jclouds.logging.Logger; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Sets.SetView; /** diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java index 4f47bb27b9..13360e87c8 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/LocationIdToIso3166CodesFromConfiguration.java @@ -38,8 +38,8 @@ import com.google.common.base.Splitter; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.ImmutableSet; /** * diff --git a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java index 3c0a3235d1..33636bcae4 100644 --- a/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java +++ b/core/src/main/java/org/jclouds/location/suppliers/fromconfig/RegionIdToZoneIdsFromConfiguration.java @@ -38,8 +38,8 @@ import com.google.common.base.Splitter; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.ImmutableSet; /** * diff --git a/core/src/main/java/org/jclouds/logging/config/ConsoleLoggingModule.java b/core/src/main/java/org/jclouds/logging/config/ConsoleLoggingModule.java index 7abd71667f..2b3036d901 100644 --- a/core/src/main/java/org/jclouds/logging/config/ConsoleLoggingModule.java +++ b/core/src/main/java/org/jclouds/logging/config/ConsoleLoggingModule.java @@ -18,8 +18,8 @@ */ package org.jclouds.logging.config; -import org.jclouds.logging.Logger; import org.jclouds.logging.ConsoleLogger; +import org.jclouds.logging.Logger; /** * Configures logging of type {@link ConsoleLogger} diff --git a/core/src/main/java/org/jclouds/predicates/Validator.java b/core/src/main/java/org/jclouds/predicates/Validator.java index 415142b1f2..565b163db6 100644 --- a/core/src/main/java/org/jclouds/predicates/Validator.java +++ b/core/src/main/java/org/jclouds/predicates/Validator.java @@ -18,10 +18,10 @@ */ package org.jclouds.predicates; -import com.google.common.base.Predicate; - import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.Predicate; + /** * Abstract class that creates a bridge between {@link com.google.common.base.Predicate} * and {@link org.jclouds.rest.annotations.ParamValidators}s. diff --git a/core/src/main/java/org/jclouds/providers/ProviderPredicates.java b/core/src/main/java/org/jclouds/providers/ProviderPredicates.java index e86fd02f63..8df155cc15 100644 --- a/core/src/main/java/org/jclouds/providers/ProviderPredicates.java +++ b/core/src/main/java/org/jclouds/providers/ProviderPredicates.java @@ -18,12 +18,12 @@ */ package org.jclouds.providers; +import org.jclouds.util.Preconditions2; + import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -import org.jclouds.util.Preconditions2; - /** * Container for provider filters (predicates). * diff --git a/core/src/main/java/org/jclouds/providers/Providers.java b/core/src/main/java/org/jclouds/providers/Providers.java index 86dbd03294..8716fedd46 100644 --- a/core/src/main/java/org/jclouds/providers/Providers.java +++ b/core/src/main/java/org/jclouds/providers/Providers.java @@ -21,11 +21,11 @@ package org.jclouds.providers; import static com.google.common.collect.Iterables.filter; import static com.google.common.collect.Iterables.find; -import com.google.common.base.Predicates; - import java.util.NoSuchElementException; import java.util.ServiceLoader; +import com.google.common.base.Predicates; + /** * The Providers class provides static methods for accessing providers. * diff --git a/core/src/main/java/org/jclouds/rest/Providers.java b/core/src/main/java/org/jclouds/rest/Providers.java index a9a94e106c..8ff65fff85 100644 --- a/core/src/main/java/org/jclouds/rest/Providers.java +++ b/core/src/main/java/org/jclouds/rest/Providers.java @@ -31,9 +31,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Properties; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.PropertiesBuilder; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.util.ClassLoadingUtils; import org.jclouds.util.SaxUtils; diff --git a/core/src/main/java/org/jclouds/rest/Utils.java b/core/src/main/java/org/jclouds/rest/Utils.java index 353363321d..5e06a1751a 100644 --- a/core/src/main/java/org/jclouds/rest/Utils.java +++ b/core/src/main/java/org/jclouds/rest/Utils.java @@ -20,16 +20,16 @@ package org.jclouds.rest; import java.util.concurrent.ExecutorService; -import com.google.common.annotations.Beta; -import com.google.common.eventbus.EventBus; -import com.google.inject.Injector; import org.jclouds.crypto.Crypto; import org.jclouds.date.DateService; import org.jclouds.json.Json; import org.jclouds.logging.Logger.LoggerFactory; import org.jclouds.rest.internal.UtilsImpl; +import com.google.common.annotations.Beta; +import com.google.common.eventbus.EventBus; import com.google.inject.ImplementedBy; +import com.google.inject.Injector; /** * diff --git a/core/src/main/java/org/jclouds/rest/annotations/QueryParams.java b/core/src/main/java/org/jclouds/rest/annotations/QueryParams.java index 95d49a049b..4662719f8c 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/QueryParams.java +++ b/core/src/main/java/org/jclouds/rest/annotations/QueryParams.java @@ -18,7 +18,8 @@ */ package org.jclouds.rest.annotations; -import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; diff --git a/core/src/main/java/org/jclouds/rest/annotations/VirtualHost.java b/core/src/main/java/org/jclouds/rest/annotations/VirtualHost.java index d87ec287fb..4af3818f69 100644 --- a/core/src/main/java/org/jclouds/rest/annotations/VirtualHost.java +++ b/core/src/main/java/org/jclouds/rest/annotations/VirtualHost.java @@ -18,8 +18,8 @@ */ package org.jclouds.rest.annotations; -import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; diff --git a/core/src/main/java/org/jclouds/rest/internal/GeneratedHttpRequest.java b/core/src/main/java/org/jclouds/rest/internal/GeneratedHttpRequest.java index 064aa1823a..17b44ae6c4 100644 --- a/core/src/main/java/org/jclouds/rest/internal/GeneratedHttpRequest.java +++ b/core/src/main/java/org/jclouds/rest/internal/GeneratedHttpRequest.java @@ -24,11 +24,10 @@ import java.lang.reflect.Method; import java.net.URI; import java.util.List; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequestFilter; import org.jclouds.io.Payload; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; diff --git a/core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java b/core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java index b7b948e2a3..daff67b488 100644 --- a/core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java +++ b/core/src/main/java/org/jclouds/rest/internal/UtilsImpl.java @@ -23,9 +23,6 @@ import java.util.concurrent.ExecutorService; import javax.inject.Inject; import javax.inject.Named; -import com.google.common.annotations.Beta; -import com.google.common.eventbus.EventBus; -import com.google.inject.Injector; import org.jclouds.Constants; import org.jclouds.crypto.Crypto; import org.jclouds.date.DateService; @@ -35,6 +32,9 @@ import org.jclouds.rest.HttpAsyncClient; import org.jclouds.rest.HttpClient; import org.jclouds.rest.Utils; +import com.google.common.annotations.Beta; +import com.google.common.eventbus.EventBus; +import com.google.inject.Injector; import com.google.inject.Singleton; /** diff --git a/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java b/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java index 2540e3e80d..8385c86ddf 100644 --- a/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java +++ b/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java @@ -27,8 +27,8 @@ import java.net.URI; import javax.inject.Inject; import com.google.common.base.Objects; -import com.google.common.base.Supplier; import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.Supplier; public class URIFromStringSupplier implements Supplier { diff --git a/core/src/main/java/org/jclouds/util/ClassLoadingUtils.java b/core/src/main/java/org/jclouds/util/ClassLoadingUtils.java index f46d704ca3..93f40ea24e 100644 --- a/core/src/main/java/org/jclouds/util/ClassLoadingUtils.java +++ b/core/src/main/java/org/jclouds/util/ClassLoadingUtils.java @@ -19,6 +19,7 @@ package org.jclouds.util; import java.net.URL; + import com.google.common.io.Resources; public class ClassLoadingUtils { diff --git a/core/src/main/java/org/jclouds/util/CredentialUtils.java b/core/src/main/java/org/jclouds/util/CredentialUtils.java index 2732ac1de8..1b09fc547f 100644 --- a/core/src/main/java/org/jclouds/util/CredentialUtils.java +++ b/core/src/main/java/org/jclouds/util/CredentialUtils.java @@ -20,10 +20,9 @@ package org.jclouds.util; import static com.google.common.base.Preconditions.checkNotNull; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.crypto.Pems; import org.jclouds.domain.Credentials; +import org.jclouds.javax.annotation.Nullable; /** diff --git a/core/src/main/java/org/jclouds/util/Multimaps2.java b/core/src/main/java/org/jclouds/util/Multimaps2.java index 6c967eacb2..905e0e5ced 100644 --- a/core/src/main/java/org/jclouds/util/Multimaps2.java +++ b/core/src/main/java/org/jclouds/util/Multimaps2.java @@ -23,9 +23,9 @@ import java.util.Set; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableMultimap.Builder; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; -import com.google.common.collect.ImmutableMultimap.Builder; /** * diff --git a/core/src/main/java/org/jclouds/util/Patterns.java b/core/src/main/java/org/jclouds/util/Patterns.java index 2e9a38da9e..22d5fd620f 100644 --- a/core/src/main/java/org/jclouds/util/Patterns.java +++ b/core/src/main/java/org/jclouds/util/Patterns.java @@ -23,9 +23,9 @@ import java.net.URLEncoder; import java.util.concurrent.ExecutionException; import java.util.regex.Pattern; -import com.google.common.cache.LoadingCache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; /** * diff --git a/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java b/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java index 4f812a24cc..2448bca40d 100644 --- a/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java +++ b/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java @@ -28,6 +28,7 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; +import org.jclouds.http.functions.ParseXMLWithJAXB; import org.jclouds.xml.XMLParser; /** diff --git a/core/src/test/java/org/jclouds/concurrent/FuturesTest.java b/core/src/test/java/org/jclouds/concurrent/FuturesTest.java index 4d0e0535eb..ac8adca3bf 100644 --- a/core/src/test/java/org/jclouds/concurrent/FuturesTest.java +++ b/core/src/test/java/org/jclouds/concurrent/FuturesTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.concurrent; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.util.concurrent.ExecutionException; diff --git a/core/src/test/java/org/jclouds/concurrent/RetryOnTimeOutExceptionFunctionTest.java b/core/src/test/java/org/jclouds/concurrent/RetryOnTimeOutExceptionFunctionTest.java index 4b2136e3a1..80a693819d 100644 --- a/core/src/test/java/org/jclouds/concurrent/RetryOnTimeOutExceptionFunctionTest.java +++ b/core/src/test/java/org/jclouds/concurrent/RetryOnTimeOutExceptionFunctionTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.concurrent; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.util.concurrent.ExecutionException; diff --git a/core/src/test/java/org/jclouds/concurrent/RetryOnTimeOutExceptionSupplierTest.java b/core/src/test/java/org/jclouds/concurrent/RetryOnTimeOutExceptionSupplierTest.java index ae75410fbf..9584f3ff53 100644 --- a/core/src/test/java/org/jclouds/concurrent/RetryOnTimeOutExceptionSupplierTest.java +++ b/core/src/test/java/org/jclouds/concurrent/RetryOnTimeOutExceptionSupplierTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.concurrent; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.util.concurrent.ExecutionException; diff --git a/core/src/test/java/org/jclouds/concurrent/config/ExecutorServiceModuleTest.java b/core/src/test/java/org/jclouds/concurrent/config/ExecutorServiceModuleTest.java index de6eb5b498..77784d6740 100644 --- a/core/src/test/java/org/jclouds/concurrent/config/ExecutorServiceModuleTest.java +++ b/core/src/test/java/org/jclouds/concurrent/config/ExecutorServiceModuleTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.concurrent.config; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.io.IOException; diff --git a/core/src/test/java/org/jclouds/crypto/SshKeysTest.java b/core/src/test/java/org/jclouds/crypto/SshKeysTest.java index e027e954b8..bf95258ba8 100644 --- a/core/src/test/java/org/jclouds/crypto/SshKeysTest.java +++ b/core/src/test/java/org/jclouds/crypto/SshKeysTest.java @@ -21,8 +21,8 @@ package org.jclouds.crypto; import static org.jclouds.crypto.SshKeys.fingerprint; import static org.jclouds.crypto.SshKeys.generate; import static org.jclouds.crypto.SshKeys.privateKeyHasFingerprint; -import static org.jclouds.crypto.SshKeys.privateKeyMatchesPublicKey; import static org.jclouds.crypto.SshKeys.privateKeyHasSha1; +import static org.jclouds.crypto.SshKeys.privateKeyMatchesPublicKey; import static org.jclouds.crypto.SshKeys.publicKeySpecFromOpenSSH; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/jclouds/date/DateServiceTest.java b/core/src/test/java/org/jclouds/date/DateServiceTest.java index 102ef3b83c..2458a23ba7 100644 --- a/core/src/test/java/org/jclouds/date/DateServiceTest.java +++ b/core/src/test/java/org/jclouds/date/DateServiceTest.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.concurrent.ExecutionException; import org.jclouds.PerformanceTest; -import org.jclouds.date.DateService; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/jclouds/date/internal/DateUtilsTest.java b/core/src/test/java/org/jclouds/date/internal/DateUtilsTest.java index cb041f58e3..1a55982cd8 100644 --- a/core/src/test/java/org/jclouds/date/internal/DateUtilsTest.java +++ b/core/src/test/java/org/jclouds/date/internal/DateUtilsTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.date.internal; -import org.testng.annotations.Test; - import static org.testng.AssertJUnit.assertEquals; +import org.testng.annotations.Test; + @Test(groups = "unit", testName = "DateUtilsTest") public class DateUtilsTest { diff --git a/core/src/test/java/org/jclouds/date/internal/SimpleDateFormatDateServiceTest.java b/core/src/test/java/org/jclouds/date/internal/SimpleDateFormatDateServiceTest.java index 5be5245103..0365ba35d2 100644 --- a/core/src/test/java/org/jclouds/date/internal/SimpleDateFormatDateServiceTest.java +++ b/core/src/test/java/org/jclouds/date/internal/SimpleDateFormatDateServiceTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.date.internal; -import org.testng.annotations.Test; +import static org.testng.AssertJUnit.assertEquals; import java.util.Date; -import static org.testng.AssertJUnit.assertEquals; +import org.testng.annotations.Test; @Test(groups = "unit", testName = "SimpleDateFormatDateServiceTest") public class SimpleDateFormatDateServiceTest { diff --git a/core/src/test/java/org/jclouds/functions/CacheLearningTest.java b/core/src/test/java/org/jclouds/functions/CacheLearningTest.java index 851d0af535..24be4e5258 100644 --- a/core/src/test/java/org/jclouds/functions/CacheLearningTest.java +++ b/core/src/test/java/org/jclouds/functions/CacheLearningTest.java @@ -24,9 +24,9 @@ import java.util.concurrent.ExecutionException; import org.testng.annotations.Test; -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.util.concurrent.UncheckedExecutionException; /** diff --git a/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java b/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java index b3e48fa8c3..e0e3339cd7 100644 --- a/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java +++ b/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java @@ -20,7 +20,6 @@ package org.jclouds.functions; import static org.testng.Assert.assertEquals; -import org.jclouds.functions.JoinOnComma; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; diff --git a/core/src/test/java/org/jclouds/http/BaseHttpErrorHandlerTest.java b/core/src/test/java/org/jclouds/http/BaseHttpErrorHandlerTest.java index 2ff8e05dce..4d442e8cc6 100644 --- a/core/src/test/java/org/jclouds/http/BaseHttpErrorHandlerTest.java +++ b/core/src/test/java/org/jclouds/http/BaseHttpErrorHandlerTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.http; +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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.verify; import java.net.URI; diff --git a/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java b/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java index 4d9456ff8f..f856cc25d8 100644 --- a/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java +++ b/core/src/test/java/org/jclouds/http/functions/ParseSaxTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.http.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.jclouds.utils.TestUtils.NO_INVOCATIONS; import static org.jclouds.utils.TestUtils.SINGLE_NO_ARG_INVOCATION; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/jclouds/http/functions/ParseURIFromListOrLocationHeaderIf20xTest.java b/core/src/test/java/org/jclouds/http/functions/ParseURIFromListOrLocationHeaderIf20xTest.java index 904abe7a59..57fbfd4ef8 100644 --- a/core/src/test/java/org/jclouds/http/functions/ParseURIFromListOrLocationHeaderIf20xTest.java +++ b/core/src/test/java/org/jclouds/http/functions/ParseURIFromListOrLocationHeaderIf20xTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.http.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.io.IOException; diff --git a/core/src/test/java/org/jclouds/http/functions/ReturnStringIf200Test.java b/core/src/test/java/org/jclouds/http/functions/ReturnStringIf200Test.java index 582702fd2b..1a5af36c2e 100644 --- a/core/src/test/java/org/jclouds/http/functions/ReturnStringIf200Test.java +++ b/core/src/test/java/org/jclouds/http/functions/ReturnStringIf200Test.java @@ -18,10 +18,10 @@ */ package org.jclouds.http.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.io.IOException; diff --git a/core/src/test/java/org/jclouds/http/handlers/BaseHttpErrorHandlerTest.java b/core/src/test/java/org/jclouds/http/handlers/BaseHttpErrorHandlerTest.java index ff2e38533f..99648251da 100644 --- a/core/src/test/java/org/jclouds/http/handlers/BaseHttpErrorHandlerTest.java +++ b/core/src/test/java/org/jclouds/http/handlers/BaseHttpErrorHandlerTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.http.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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.verify; import java.net.URI; diff --git a/core/src/test/java/org/jclouds/http/handlers/RedirectionRetryHandlerTest.java b/core/src/test/java/org/jclouds/http/handlers/RedirectionRetryHandlerTest.java index 17d15e5f1b..707ef581fd 100644 --- a/core/src/test/java/org/jclouds/http/handlers/RedirectionRetryHandlerTest.java +++ b/core/src/test/java/org/jclouds/http/handlers/RedirectionRetryHandlerTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.http.handlers; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import java.net.URI; diff --git a/core/src/test/java/org/jclouds/http/utils/ModifyRequestTest.java b/core/src/test/java/org/jclouds/http/utils/ModifyRequestTest.java index 1c1e16f629..7fceb6bcc0 100644 --- a/core/src/test/java/org/jclouds/http/utils/ModifyRequestTest.java +++ b/core/src/test/java/org/jclouds/http/utils/ModifyRequestTest.java @@ -18,23 +18,25 @@ */ package org.jclouds.http.utils; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.LinkedListMultimap; -import com.google.common.collect.Multimap; +import static org.jclouds.http.utils.ModifyRequest.parseQueryToMap; +import static org.testng.Assert.assertEquals; + +import java.net.URI; +import java.util.Set; + +import javax.ws.rs.core.MediaType; + import org.jclouds.http.HttpRequest; import org.jclouds.io.Payload; import org.jclouds.io.Payloads; import org.jclouds.util.Strings2; import org.testng.annotations.Test; -import javax.ws.rs.core.MediaType; -import java.net.URI; -import java.util.Set; - -import static org.jclouds.http.utils.ModifyRequest.parseQueryToMap; -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.LinkedListMultimap; +import com.google.common.collect.Multimap; /** * @author Adrian Cole diff --git a/core/src/test/java/org/jclouds/io/payloads/MultipartFormTest.java b/core/src/test/java/org/jclouds/io/payloads/MultipartFormTest.java index 933bc3d1d5..71e3f11436 100644 --- a/core/src/test/java/org/jclouds/io/payloads/MultipartFormTest.java +++ b/core/src/test/java/org/jclouds/io/payloads/MultipartFormTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.io.payloads; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.File; diff --git a/core/src/test/java/org/jclouds/json/internal/NullHackJsonLiteralAdapterTest.java b/core/src/test/java/org/jclouds/json/internal/NullHackJsonLiteralAdapterTest.java index 1a236eebb0..f91965a4be 100644 --- a/core/src/test/java/org/jclouds/json/internal/NullHackJsonLiteralAdapterTest.java +++ b/core/src/test/java/org/jclouds/json/internal/NullHackJsonLiteralAdapterTest.java @@ -24,7 +24,6 @@ import static org.testng.Assert.assertEquals; import java.lang.reflect.Type; import java.util.Map; -import org.jclouds.json.internal.NullHackJsonLiteralAdapter; import org.jclouds.util.Patterns; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/jclouds/lifecycle/config/LifeCycleModuleTest.java b/core/src/test/java/org/jclouds/lifecycle/config/LifeCycleModuleTest.java index 7bdf751759..1bf0ea2858 100644 --- a/core/src/test/java/org/jclouds/lifecycle/config/LifeCycleModuleTest.java +++ b/core/src/test/java/org/jclouds/lifecycle/config/LifeCycleModuleTest.java @@ -27,16 +27,15 @@ import javax.inject.Named; import org.jclouds.Constants; import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.lifecycle.Closer; - -import com.google.common.util.concurrent.ExecutionList; -import com.google.inject.name.Names; import org.testng.annotations.Test; +import com.google.common.util.concurrent.ExecutionList; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Provides; +import com.google.inject.name.Names; /** * diff --git a/core/src/test/java/org/jclouds/location/config/ProvideIso3166CodesByLocationIdViaPropertiesTest.java b/core/src/test/java/org/jclouds/location/config/ProvideIso3166CodesByLocationIdViaPropertiesTest.java index 6f712d1e82..205d042763 100644 --- a/core/src/test/java/org/jclouds/location/config/ProvideIso3166CodesByLocationIdViaPropertiesTest.java +++ b/core/src/test/java/org/jclouds/location/config/ProvideIso3166CodesByLocationIdViaPropertiesTest.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Set; import org.jclouds.location.suppliers.LocationIdToIso3166CodesSupplier; -import org.jclouds.util.Suppliers2; import org.testng.annotations.Test; import com.google.common.base.Function; diff --git a/core/src/test/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstZoneTest.java b/core/src/test/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstZoneTest.java index 2928433fff..a5fcaed7b1 100644 --- a/core/src/test/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstZoneTest.java +++ b/core/src/test/java/org/jclouds/location/suppliers/implicit/OnlyLocationOrFirstZoneTest.java @@ -26,7 +26,6 @@ import java.util.Set; import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; import org.jclouds.domain.LocationScope; -import org.jclouds.location.suppliers.implicit.OnlyLocationOrFirstZone; import org.testng.annotations.Test; import com.google.common.base.Supplier; diff --git a/core/src/test/java/org/jclouds/logging/BufferLogger.java b/core/src/test/java/org/jclouds/logging/BufferLogger.java index 083b92b4b7..ffc9629ce3 100644 --- a/core/src/test/java/org/jclouds/logging/BufferLogger.java +++ b/core/src/test/java/org/jclouds/logging/BufferLogger.java @@ -25,8 +25,6 @@ import java.util.logging.Level; import junit.framework.AssertionFailedError; -import org.jclouds.logging.BaseLogger; - import com.google.common.base.Predicate; /** A logger implementation for use in testing; all log messages are remembered, \ diff --git a/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java b/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java index 3666cb0b19..9bcdb62070 100644 --- a/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java +++ b/core/src/test/java/org/jclouds/logging/config/BindLoggersAnnotatedWithResourceTest.java @@ -19,7 +19,7 @@ package org.jclouds.logging.config; import static com.google.inject.matcher.Matchers.any; -import static org.easymock.classextension.EasyMock.createMock; +import static org.easymock.EasyMock.createMock; import static org.testng.Assert.assertEquals; import java.lang.reflect.Field; diff --git a/core/src/test/java/org/jclouds/predicates/RetryablesTest.java b/core/src/test/java/org/jclouds/predicates/RetryablesTest.java index 5ba226fc3d..4e6da9cbc5 100644 --- a/core/src/test/java/org/jclouds/predicates/RetryablesTest.java +++ b/core/src/test/java/org/jclouds/predicates/RetryablesTest.java @@ -21,7 +21,12 @@ package org.jclouds.predicates; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.jclouds.predicates.Retryables.retry; import static org.jclouds.predicates.Retryables.retryGettingResultOrFailing; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java index b0e003afe7..471951e5f4 100644 --- a/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java +++ b/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java @@ -18,11 +18,11 @@ */ package org.jclouds.providers; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; +import com.google.common.collect.ImmutableSet; + /** * Implementation of @ link org.jclouds.types.ProviderMetadata} for testing. * diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java index 1b4e53927e..5a370e4833 100644 --- a/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java +++ b/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java @@ -18,11 +18,11 @@ */ package org.jclouds.providers; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; +import com.google.common.collect.ImmutableSet; + /** * Implementation of @ link org.jclouds.types.ProviderMetadata} for testing. * diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java index e21b6e7047..433b1ea5d5 100644 --- a/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java +++ b/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java @@ -18,11 +18,11 @@ */ package org.jclouds.providers; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; +import com.google.common.collect.ImmutableSet; + /** * Implementation of @ link org.jclouds.types.ProviderMetadata} for testing. * diff --git a/core/src/test/java/org/jclouds/providers/ProvidersTest.java b/core/src/test/java/org/jclouds/providers/ProvidersTest.java index e330198932..b3b84a3c4b 100644 --- a/core/src/test/java/org/jclouds/providers/ProvidersTest.java +++ b/core/src/test/java/org/jclouds/providers/ProvidersTest.java @@ -21,12 +21,12 @@ package org.jclouds.providers; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; -import com.google.common.collect.Iterables; - import java.util.NoSuchElementException; import org.testng.annotations.Test; +import com.google.common.collect.Iterables; + /** * The ProvidersTest tests the org.jclouds.providers.Providers class. * diff --git a/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java b/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java index f46002a17f..f81b69f282 100644 --- a/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java +++ b/core/src/test/java/org/jclouds/rest/BaseRestClientExpectTest.java @@ -30,8 +30,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Map.Entry; +import java.util.Properties; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; diff --git a/core/src/test/java/org/jclouds/rest/BaseRestClientTest.java b/core/src/test/java/org/jclouds/rest/BaseRestClientTest.java index b052b05c15..b6033a6673 100644 --- a/core/src/test/java/org/jclouds/rest/BaseRestClientTest.java +++ b/core/src/test/java/org/jclouds/rest/BaseRestClientTest.java @@ -20,7 +20,7 @@ package org.jclouds.rest; import static com.google.common.base.Throwables.propagate; import static com.google.inject.util.Types.newParameterizedType; -import static org.easymock.classextension.EasyMock.createMock; +import static org.easymock.EasyMock.createMock; import static org.eclipse.jetty.http.HttpHeaders.TRANSFER_ENCODING; import static org.jclouds.http.HttpUtils.sortAndConcatHeadersIntoString; import static org.testng.Assert.assertEquals; diff --git a/core/src/test/java/org/jclouds/rest/binders/BindToXMLPayloadTest.java b/core/src/test/java/org/jclouds/rest/binders/BindToXMLPayloadTest.java index 478fc83c99..48ce2325f3 100644 --- a/core/src/test/java/org/jclouds/rest/binders/BindToXMLPayloadTest.java +++ b/core/src/test/java/org/jclouds/rest/binders/BindToXMLPayloadTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.rest.binders; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; import java.net.URI; diff --git a/core/src/test/java/org/jclouds/rest/functions/MapHttp4xxCodesToExceptionsTest.java b/core/src/test/java/org/jclouds/rest/functions/MapHttp4xxCodesToExceptionsTest.java index 1531f2838a..710921c28d 100644 --- a/core/src/test/java/org/jclouds/rest/functions/MapHttp4xxCodesToExceptionsTest.java +++ b/core/src/test/java/org/jclouds/rest/functions/MapHttp4xxCodesToExceptionsTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.rest.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import org.jclouds.http.HttpResponse; diff --git a/core/src/test/java/org/jclouds/util/Strings2Test.java b/core/src/test/java/org/jclouds/util/Strings2Test.java index 4e0b32085b..bb6dfc1d67 100644 --- a/core/src/test/java/org/jclouds/util/Strings2Test.java +++ b/core/src/test/java/org/jclouds/util/Strings2Test.java @@ -18,13 +18,14 @@ */ package org.jclouds.util; -import com.google.common.collect.ImmutableMap; -import org.testng.annotations.Test; - import static org.jclouds.util.Strings2.urlDecode; import static org.jclouds.util.Strings2.urlEncode; import static org.testng.Assert.assertEquals; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableMap; + /** * @author Adrian Cole */ diff --git a/drivers/gae/src/test/java/org/jclouds/gae/ConvertToJcloudsResponseTest.java b/drivers/gae/src/test/java/org/jclouds/gae/ConvertToJcloudsResponseTest.java index 083d7389b1..1124f65f5f 100644 --- a/drivers/gae/src/test/java/org/jclouds/gae/ConvertToJcloudsResponseTest.java +++ b/drivers/gae/src/test/java/org/jclouds/gae/ConvertToJcloudsResponseTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.gae; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.IOException; diff --git a/drivers/joda/src/test/java/org/jclouds/date/joda/JodaDateServiceTest.java b/drivers/joda/src/test/java/org/jclouds/date/joda/JodaDateServiceTest.java index 22ad89655b..9efde59366 100644 --- a/drivers/joda/src/test/java/org/jclouds/date/joda/JodaDateServiceTest.java +++ b/drivers/joda/src/test/java/org/jclouds/date/joda/JodaDateServiceTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.date.joda; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; import java.util.Date; import java.util.concurrent.ExecutionException; diff --git a/drivers/log4j/src/test/java/org/jclouds/logging/log4j/config/Log4JLoggingModuleTest.java b/drivers/log4j/src/test/java/org/jclouds/logging/log4j/config/Log4JLoggingModuleTest.java index 1f52e35897..60186ab853 100644 --- a/drivers/log4j/src/test/java/org/jclouds/logging/log4j/config/Log4JLoggingModuleTest.java +++ b/drivers/log4j/src/test/java/org/jclouds/logging/log4j/config/Log4JLoggingModuleTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.logging.log4j.config; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; import javax.annotation.Resource; diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java index 2f20633651..6318db8270 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java @@ -47,8 +47,8 @@ import net.schmizz.sshj.common.IOUtils; import net.schmizz.sshj.connection.ConnectionException; import net.schmizz.sshj.connection.channel.direct.PTYMode; import net.schmizz.sshj.connection.channel.direct.Session; -import net.schmizz.sshj.connection.channel.direct.SessionChannel; import net.schmizz.sshj.connection.channel.direct.Session.Command; +import net.schmizz.sshj.connection.channel.direct.SessionChannel; import net.schmizz.sshj.sftp.SFTPClient; import net.schmizz.sshj.sftp.SFTPException; import net.schmizz.sshj.transport.TransportException; diff --git a/labs/elb/src/test/java/org/jclouds/elb/xml/DescribeLoadBalancerResponseHandlerTest.java b/labs/elb/src/test/java/org/jclouds/elb/xml/DescribeLoadBalancerResponseHandlerTest.java index d5b86937cd..6577a925bf 100644 --- a/labs/elb/src/test/java/org/jclouds/elb/xml/DescribeLoadBalancerResponseHandlerTest.java +++ b/labs/elb/src/test/java/org/jclouds/elb/xml/DescribeLoadBalancerResponseHandlerTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.elb.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSAsyncClient.java index 2249c4d641..76db187b4d 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSAsyncClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSAsyncClient.java @@ -18,7 +18,11 @@ */ package org.jclouds.glesys; -import org.jclouds.glesys.features.*; +import org.jclouds.glesys.features.ArchiveAsyncClient; +import org.jclouds.glesys.features.DomainAsyncClient; +import org.jclouds.glesys.features.EmailAsyncClient; +import org.jclouds.glesys.features.IpAsyncClient; +import org.jclouds.glesys.features.ServerAsyncClient; import org.jclouds.rest.annotations.Delegate; /** diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSClient.java index 65e0d61d46..9be6c09821 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSClient.java @@ -18,12 +18,16 @@ */ package org.jclouds.glesys; -import org.jclouds.concurrent.Timeout; -import org.jclouds.glesys.features.*; -import org.jclouds.rest.annotations.Delegate; - import java.util.concurrent.TimeUnit; +import org.jclouds.concurrent.Timeout; +import org.jclouds.glesys.features.ArchiveClient; +import org.jclouds.glesys.features.DomainClient; +import org.jclouds.glesys.features.EmailClient; +import org.jclouds.glesys.features.IpClient; +import org.jclouds.glesys.features.ServerClient; +import org.jclouds.rest.annotations.Delegate; + /** * Provides synchronous access to GleSYS. *

diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java index bae37e4008..31019e1973 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java @@ -21,14 +21,14 @@ package org.jclouds.glesys; import static org.jclouds.Constants.PROPERTY_API_VERSION; import static org.jclouds.Constants.PROPERTY_ENDPOINT; import static org.jclouds.Constants.PROPERTY_ISO3166_CODES; +import static org.jclouds.glesys.reference.GleSYSConstants.PROPERTY_GLESYS_DEFAULT_DC; import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES; import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE; +import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES; import java.util.Properties; import org.jclouds.PropertiesBuilder; -import static org.jclouds.glesys.reference.GleSYSConstants.PROPERTY_GLESYS_DEFAULT_DC; -import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES; /** * Builds properties used in GleSYS Clients diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java index dd3eee7508..e8eb3b6c31 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.glesys; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@ link org.jclouds.types.ProviderMetadata} for GleSYS. * diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java index 3815ddef8f..8a10df36e7 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java @@ -26,8 +26,8 @@ import javax.inject.Singleton; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.ImageBuilder; import org.jclouds.compute.domain.OperatingSystem; -import org.jclouds.compute.domain.OsFamilyVersion64Bit; import org.jclouds.compute.domain.OperatingSystem.Builder; +import org.jclouds.compute.domain.OsFamilyVersion64Bit; import org.jclouds.glesys.domain.OSTemplate; import com.google.common.base.Function; diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java index 2def35f826..8cdb47bdde 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java @@ -18,14 +18,14 @@ */ package org.jclouds.glesys.domain; -import com.google.common.base.Joiner; -import com.google.common.base.Objects; -import com.google.gson.annotations.SerializedName; +import static com.google.common.base.Preconditions.checkArgument; import java.util.Arrays; import java.util.List; -import static com.google.common.base.Preconditions.checkArgument; +import com.google.common.base.Joiner; +import com.google.common.base.Objects; +import com.google.gson.annotations.SerializedName; /** * The allowed arguments for archive manipulation, such as archivesize diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java index 08da121d17..8f5af3ce41 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java @@ -18,11 +18,11 @@ */ package org.jclouds.glesys.domain; +import static com.google.common.base.Preconditions.checkNotNull; + import com.google.common.base.Objects; import com.google.gson.annotations.SerializedName; -import static com.google.common.base.Preconditions.checkNotNull; - /** * The Cost class contains information about the cost of a server * diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java index 7d322f3c80..3335c2730a 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java @@ -18,11 +18,11 @@ */ package org.jclouds.glesys.domain; +import java.util.Date; + import com.google.common.base.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Date; - /** * Domain data for a Glesys account. * diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java index 52dd83b685..54472a02c4 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java @@ -18,11 +18,11 @@ */ package org.jclouds.glesys.domain; +import java.util.Date; + import com.google.common.base.Objects; import com.google.gson.annotations.SerializedName; -import java.util.Date; - /** * Detailed information on an Email Account * diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java index 9b023769ab..785f386330 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java @@ -18,13 +18,13 @@ */ package org.jclouds.glesys.domain; +import java.util.Set; + import com.google.common.annotations.Beta; import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; -import java.util.Set; - /** * Structure containing all information about e-mail addresses for a GleSYS account * diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java index 6774568b70..c16d18d5f1 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java @@ -19,12 +19,13 @@ package org.jclouds.glesys.domain; -import com.google.gson.annotations.SerializedName; -import org.jclouds.javax.annotation.Nullable; - import java.util.Arrays; import java.util.List; +import org.jclouds.javax.annotation.Nullable; + +import com.google.gson.annotations.SerializedName; + /** * Represents detailed information about an IP address. */ diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/domain/Server.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Server.java index d70db141eb..c4cfe3ca7b 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/domain/Server.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Server.java @@ -18,12 +18,12 @@ */ package org.jclouds.glesys.domain; +import static com.google.common.base.Preconditions.checkNotNull; + import com.google.common.base.CaseFormat; import com.google.common.base.Objects; import com.google.gson.annotations.SerializedName; -import static com.google.common.base.Preconditions.checkNotNull; - /** * Listing of a server. * diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveAsyncClient.java index f79a77f383..a5af736daa 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveAsyncClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveAsyncClient.java @@ -18,7 +18,15 @@ */ package org.jclouds.glesys.features; -import com.google.common.util.concurrent.ListenableFuture; +import java.util.Set; + +import javax.ws.rs.Consumes; +import javax.ws.rs.FormParam; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.core.MediaType; + import org.jclouds.glesys.domain.Archive; import org.jclouds.glesys.domain.ArchiveAllowedArguments; import org.jclouds.glesys.domain.ArchiveDetails; @@ -29,9 +37,7 @@ import org.jclouds.rest.annotations.SelectJson; import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import java.util.Set; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to Archive data via the Glesys REST API. diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveClient.java index 5180763cde..5b75a217fb 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveClient.java @@ -18,14 +18,14 @@ */ package org.jclouds.glesys.features; +import java.util.Set; +import java.util.concurrent.TimeUnit; + import org.jclouds.concurrent.Timeout; import org.jclouds.glesys.domain.Archive; import org.jclouds.glesys.domain.ArchiveAllowedArguments; import org.jclouds.glesys.domain.ArchiveDetails; -import java.util.Set; -import java.util.concurrent.TimeUnit; - /** * Provides synchronous access to Archive requests. *

diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/features/DomainAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/DomainAsyncClient.java index 9cbf479c27..1bc6b375a7 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/features/DomainAsyncClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/features/DomainAsyncClient.java @@ -18,12 +18,19 @@ */ package org.jclouds.glesys.features; -import com.google.common.util.concurrent.ListenableFuture; +import java.util.Set; + +import javax.ws.rs.Consumes; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.core.MediaType; + import org.jclouds.glesys.domain.Domain; import org.jclouds.glesys.domain.DomainRecord; import org.jclouds.glesys.options.AddDomainOptions; -import org.jclouds.glesys.options.DomainOptions; import org.jclouds.glesys.options.AddRecordOptions; +import org.jclouds.glesys.options.DomainOptions; import org.jclouds.glesys.options.EditRecordOptions; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.annotations.ExceptionParser; @@ -31,12 +38,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 javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import java.util.Set; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to Domain (DNS) data via the Glesys REST API. diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/features/DomainClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/DomainClient.java index 07ee3cb626..571f6d61cd 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/features/DomainClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/features/DomainClient.java @@ -18,17 +18,17 @@ */ package org.jclouds.glesys.features; +import java.util.Set; +import java.util.concurrent.TimeUnit; + import org.jclouds.concurrent.Timeout; import org.jclouds.glesys.domain.Domain; import org.jclouds.glesys.domain.DomainRecord; import org.jclouds.glesys.options.AddDomainOptions; -import org.jclouds.glesys.options.DomainOptions; import org.jclouds.glesys.options.AddRecordOptions; +import org.jclouds.glesys.options.DomainOptions; import org.jclouds.glesys.options.EditRecordOptions; -import java.util.Set; -import java.util.concurrent.TimeUnit; - /** * Provides synchronous access to Domain requests. *

diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/features/EmailAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/EmailAsyncClient.java index 4cabcb5531..b418d48f2d 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/features/EmailAsyncClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/features/EmailAsyncClient.java @@ -35,9 +35,9 @@ import org.jclouds.rest.annotations.ExceptionParser; 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 com.google.common.util.concurrent.ListenableFuture; -import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; /** * Provides asynchronous access to E-Mail data via the Glesys REST API. diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/features/IpAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/IpAsyncClient.java index ab8f2c32f3..d61f84a59a 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/features/IpAsyncClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/features/IpAsyncClient.java @@ -18,7 +18,16 @@ */ package org.jclouds.glesys.features; -import com.google.common.util.concurrent.ListenableFuture; +import java.util.Set; + +import javax.ws.rs.Consumes; +import javax.ws.rs.FormParam; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.core.MediaType; + import org.jclouds.glesys.domain.IpDetails; import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.annotations.ExceptionParser; @@ -27,9 +36,7 @@ import org.jclouds.rest.annotations.SelectJson; import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import java.util.Set; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to IP Addresses via their REST API. diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/features/IpClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/IpClient.java index 0ada33d7b0..4335c87845 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/features/IpClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/features/IpClient.java @@ -18,12 +18,12 @@ */ package org.jclouds.glesys.features; -import org.jclouds.concurrent.Timeout; -import org.jclouds.glesys.domain.IpDetails; - import java.util.Set; import java.util.concurrent.TimeUnit; +import org.jclouds.concurrent.Timeout; +import org.jclouds.glesys.domain.IpDetails; + /** * Provides synchronous access to IP Addresses. *

diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerAsyncClient.java index 546277f57c..bb6942ce0c 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerAsyncClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerAsyncClient.java @@ -31,12 +31,12 @@ import javax.ws.rs.core.MediaType; import org.jclouds.glesys.domain.AllowedArgumentsForCreateServer; import org.jclouds.glesys.domain.Console; +import org.jclouds.glesys.domain.OSTemplate; import org.jclouds.glesys.domain.Server; import org.jclouds.glesys.domain.ServerDetails; import org.jclouds.glesys.domain.ServerLimit; import org.jclouds.glesys.domain.ServerSpec; import org.jclouds.glesys.domain.ServerStatus; -import org.jclouds.glesys.domain.OSTemplate; import org.jclouds.glesys.functions.ParseTemplatesFromHttpResponse; import org.jclouds.glesys.options.CloneServerOptions; import org.jclouds.glesys.options.CreateServerOptions; diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerClient.java index fe7c523fb8..aa21075ca0 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerClient.java @@ -25,12 +25,12 @@ import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.glesys.domain.AllowedArgumentsForCreateServer; import org.jclouds.glesys.domain.Console; +import org.jclouds.glesys.domain.OSTemplate; import org.jclouds.glesys.domain.Server; import org.jclouds.glesys.domain.ServerDetails; import org.jclouds.glesys.domain.ServerLimit; import org.jclouds.glesys.domain.ServerSpec; import org.jclouds.glesys.domain.ServerStatus; -import org.jclouds.glesys.domain.OSTemplate; import org.jclouds.glesys.options.CloneServerOptions; import org.jclouds.glesys.options.CreateServerOptions; import org.jclouds.glesys.options.DestroyServerOptions; diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/functions/internal/GlesysDateAdapter.java b/labs/glesys/src/main/java/org/jclouds/glesys/functions/internal/GlesysDateAdapter.java index c1c5e7b005..281b3e847c 100644 --- a/labs/glesys/src/main/java/org/jclouds/glesys/functions/internal/GlesysDateAdapter.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/functions/internal/GlesysDateAdapter.java @@ -26,13 +26,13 @@ import java.util.Date; import javax.inject.Singleton; -import com.google.inject.Inject; import org.jclouds.date.DateService; import org.jclouds.json.config.GsonModule; import com.google.common.base.Throwables; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; +import com.google.inject.Inject; /** * Parser for Glesys Date formats diff --git a/labs/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientExpectTest.java index c0e48753c6..48d9799e66 100644 --- a/labs/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientExpectTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientExpectTest.java @@ -18,8 +18,14 @@ */ package org.jclouds.glesys.features; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMultimap; +import static org.jclouds.io.Payloads.newUrlEncodedFormPayload; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; + +import java.net.URI; +import java.util.List; + import org.jclouds.glesys.GleSYSClient; import org.jclouds.glesys.domain.Archive; import org.jclouds.glesys.domain.ArchiveAllowedArguments; @@ -31,11 +37,8 @@ import org.jclouds.rest.BaseRestClientExpectTest; import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; -import java.net.URI; -import java.util.List; - -import static org.jclouds.io.Payloads.newUrlEncodedFormPayload; -import static org.testng.Assert.*; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMultimap; /** * Tests parsing of {@code ArchiveAsyncClient} diff --git a/labs/glesys/src/test/java/org/jclouds/glesys/features/IpClientExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/IpClientExpectTest.java index 1f82c6c9fb..743afb1e7e 100644 --- a/labs/glesys/src/test/java/org/jclouds/glesys/features/IpClientExpectTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/features/IpClientExpectTest.java @@ -18,7 +18,16 @@ */ package org.jclouds.glesys.features; -import com.google.common.collect.ImmutableMultimap; +import static java.util.Arrays.asList; +import static java.util.Collections.emptySet; +import static org.jclouds.io.Payloads.newUrlEncodedFormPayload; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.fail; +import static org.testng.collections.Sets.newHashSet; + +import java.net.URI; +import java.util.Set; + import org.jclouds.glesys.GleSYSClient; import org.jclouds.glesys.domain.IpDetails; import org.jclouds.http.HttpRequest; @@ -27,15 +36,7 @@ import org.jclouds.http.HttpResponseException; import org.jclouds.rest.BaseRestClientExpectTest; import org.testng.annotations.Test; -import java.net.URI; -import java.util.Set; - -import static java.util.Arrays.asList; -import static java.util.Collections.emptySet; -import static org.jclouds.io.Payloads.newUrlEncodedFormPayload; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.fail; -import static org.testng.collections.Sets.newHashSet; +import com.google.common.collect.ImmutableMultimap; /** * Allows us to test a client via its side effects. diff --git a/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java index d381f08314..0fdfd17159 100644 --- a/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java @@ -18,11 +18,32 @@ */ package org.jclouds.glesys.features; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; +import static org.jclouds.io.Payloads.newUrlEncodedFormPayload; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; + +import java.net.URI; +import java.util.LinkedHashMap; +import java.util.Map; + import org.jclouds.glesys.GleSYSClient; -import org.jclouds.glesys.domain.*; -import org.jclouds.glesys.options.*; +import org.jclouds.glesys.domain.AllowedArgumentsForCreateServer; +import org.jclouds.glesys.domain.Console; +import org.jclouds.glesys.domain.Cost; +import org.jclouds.glesys.domain.Ip; +import org.jclouds.glesys.domain.OSTemplate; +import org.jclouds.glesys.domain.ResourceUsage; +import org.jclouds.glesys.domain.Server; +import org.jclouds.glesys.domain.ServerDetails; +import org.jclouds.glesys.domain.ServerSpec; +import org.jclouds.glesys.domain.ServerStatus; +import org.jclouds.glesys.domain.ServerUptime; +import org.jclouds.glesys.options.CloneServerOptions; +import org.jclouds.glesys.options.CreateServerOptions; +import org.jclouds.glesys.options.DestroyServerOptions; +import org.jclouds.glesys.options.EditServerOptions; +import org.jclouds.glesys.options.ServerStatusOptions; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.rest.AuthorizationException; @@ -30,12 +51,8 @@ import org.jclouds.rest.BaseRestClientExpectTest; import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; -import java.net.URI; -import java.util.LinkedHashMap; -import java.util.Map; - -import static org.jclouds.io.Payloads.newUrlEncodedFormPayload; -import static org.testng.Assert.*; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSet; /** * Tests annotation parsing of {@code ServerAsyncClient} diff --git a/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientLiveTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientLiveTest.java index 78ab4e1667..999578762f 100644 --- a/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientLiveTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientLiveTest.java @@ -26,14 +26,14 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import org.jclouds.glesys.domain.AllowedArgumentsForCreateServer; import org.jclouds.glesys.domain.Console; +import org.jclouds.glesys.domain.OSTemplate; import org.jclouds.glesys.domain.ResourceUsage; import org.jclouds.glesys.domain.Server; -import org.jclouds.glesys.domain.AllowedArgumentsForCreateServer; import org.jclouds.glesys.domain.ServerDetails; import org.jclouds.glesys.domain.ServerLimit; import org.jclouds.glesys.domain.ServerStatus; -import org.jclouds.glesys.domain.OSTemplate; import org.jclouds.glesys.internal.BaseGleSYSClientLiveTest; import org.jclouds.glesys.options.CloneServerOptions; import org.jclouds.glesys.options.DestroyServerOptions; diff --git a/labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java index a9dc7a9fac..81c7b8619b 100644 --- a/labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java @@ -19,16 +19,17 @@ package org.jclouds.glesys.parse; -import com.google.inject.Guice; -import com.google.inject.Injector; +import javax.ws.rs.Consumes; +import javax.ws.rs.core.MediaType; + import org.jclouds.glesys.config.GleSYSParserModule; import org.jclouds.glesys.domain.IpDetails; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; import org.jclouds.rest.annotations.SelectJson; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import com.google.inject.Guice; +import com.google.inject.Injector; public class ParseFullIpDetailsTest extends BaseItemParserTest { diff --git a/labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java index 8284e9caa4..6ad2e03f03 100644 --- a/labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java @@ -18,20 +18,22 @@ */ package org.jclouds.glesys.parse; -import com.google.inject.Guice; -import com.google.inject.Injector; +import static java.util.Arrays.asList; + +import java.util.HashSet; +import java.util.Set; + +import javax.ws.rs.Consumes; +import javax.ws.rs.core.MediaType; + import org.jclouds.glesys.config.GleSYSParserModule; import org.jclouds.json.BaseSetParserTest; import org.jclouds.json.config.GsonModule; import org.jclouds.rest.annotations.SelectJson; import org.testng.annotations.Test; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; -import java.util.HashSet; -import java.util.Set; - -import static java.util.Arrays.asList; +import com.google.inject.Guice; +import com.google.inject.Injector; @Test(groups = "unit", testName = "ParseIpAddressFromResponseTest") public class ParseIpAddressFromResponseTest extends BaseSetParserTest { diff --git a/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersAsyncClient.java b/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersAsyncClient.java index 2b07e18972..400450fc46 100644 --- a/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersAsyncClient.java +++ b/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersAsyncClient.java @@ -18,6 +18,7 @@ */ package org.jclouds.opsource.servers; +import org.jclouds.opsource.servers.domain.Account; import org.jclouds.opsource.servers.features.AccountAsyncClient; import org.jclouds.rest.annotations.Delegate; diff --git a/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersClient.java b/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersClient.java index 16822419ff..1291e59a81 100644 --- a/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersClient.java +++ b/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersClient.java @@ -21,6 +21,7 @@ package org.jclouds.opsource.servers; import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; +import org.jclouds.opsource.servers.domain.Account; import org.jclouds.opsource.servers.features.AccountClient; import org.jclouds.rest.annotations.Delegate; diff --git a/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersContextBuilder.java b/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersContextBuilder.java index 5c8cf97d26..c174722015 100644 --- a/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersContextBuilder.java +++ b/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersContextBuilder.java @@ -21,8 +21,8 @@ package org.jclouds.opsource.servers; import java.util.List; import java.util.Properties; -import org.jclouds.rest.RestContextBuilder; import org.jclouds.opsource.servers.config.OpSourceServersRestClientModule; +import org.jclouds.rest.RestContextBuilder; import com.google.inject.Module; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java index 342d59fa9c..3e2271f9e0 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CaptureVAppParams.java @@ -32,6 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import org.jclouds.vcloud.director.v1_5.domain.ovf.SectionType; +import org.jclouds.vcloud.director.v1_5.domain.ovf.StartupSection; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java index 036c622e53..c50176d85f 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/InstantiationParams.java @@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import org.jclouds.vcloud.director.v1_5.domain.ovf.SectionType; +import org.jclouds.vcloud.director.v1_5.domain.ovf.StartupSection; import com.google.common.base.Objects; import com.google.common.collect.Sets; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java index f47bbf9a1d..2df6c38c0e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java @@ -22,6 +22,7 @@ import static com.google.common.base.Objects.equal; import java.util.Set; +import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java index 2ccca7f212..7d8e3781f4 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java @@ -30,6 +30,7 @@ import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlRootElement; import org.jclouds.vcloud.director.v1_5.domain.ovf.SectionType; +import org.jclouds.vcloud.director.v1_5.domain.ovf.StartupSection; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimAnySimpleType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimAnySimpleType.java index f773533593..d527e3e76e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimAnySimpleType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimAnySimpleType.java @@ -18,7 +18,7 @@ */ package org.jclouds.vcloud.director.v1_5.domain.cim; -import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.*; +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_CIM_NS; import java.util.HashMap; import java.util.Map; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimBoolean.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimBoolean.java index 3bda081e85..7ca5cceb1a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimBoolean.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimBoolean.java @@ -18,7 +18,7 @@ */ package org.jclouds.vcloud.director.v1_5.domain.cim; -import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.*; +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_CIM_NS; import java.util.HashMap; import java.util.Map; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimReference.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimReference.java index d0f25dd43e..8c90b242e9 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimReference.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimReference.java @@ -18,7 +18,7 @@ */ package org.jclouds.vcloud.director.v1_5.domain.cim; -import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.*; +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_CIM_NS; import java.util.ArrayList; import java.util.HashMap; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimUnsignedInt.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimUnsignedInt.java index f3cf2a200e..e78d7f1c88 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimUnsignedInt.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimUnsignedInt.java @@ -21,8 +21,6 @@ package org.jclouds.vcloud.director.v1_5.domain.cim; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAnyAttribute; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimUnsignedLong.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimUnsignedLong.java index 98b754843d..d920852b6e 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimUnsignedLong.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/CimUnsignedLong.java @@ -21,8 +21,7 @@ package org.jclouds.vcloud.director.v1_5.domain.cim; import java.math.BigInteger; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; + import javax.xml.bind.annotation.XmlAnyAttribute; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/package-info.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/package-info.java index f0e64b476d..eab73abaf2 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/package-info.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/cim/package-info.java @@ -29,8 +29,8 @@ package org.jclouds.vcloud.director.v1_5.domain.cim; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_CIM_NS; -import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_CIM_VSSD_NS; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_CIM_RASD_NS; +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_CIM_VSSD_NS; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_OVF_NS; import javax.xml.bind.annotation.XmlAccessType; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/OperatingSystemSection.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/OperatingSystemSection.java index 1806af04aa..a7c8dc35e5 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/OperatingSystemSection.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/OperatingSystemSection.java @@ -25,7 +25,6 @@ import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_OV import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_VMW_NS; import java.net.URI; -import java.util.Collections; import java.util.Set; import javax.xml.bind.annotation.XmlAttribute; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/SectionType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/SectionType.java index 0b239f2021..ed058d489c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/SectionType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/SectionType.java @@ -19,13 +19,8 @@ package org.jclouds.vcloud.director.v1_5.domain.ovf; import static com.google.common.base.Objects.equal; -import static com.google.common.base.Preconditions.checkNotNull; -import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_OVF_NS; -import java.util.Collections; -import java.util.Set; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; @@ -34,14 +29,11 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.vcloud.director.v1_5.domain.CustomizationSection; import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; import org.jclouds.vcloud.director.v1_5.domain.LeaseSettingsSection; -import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; import org.jclouds.vcloud.director.v1_5.domain.RuntimeInfoSection; import com.google.common.base.Objects; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; /** * Metadata about a virtual machine or grouping of them. diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/environment/SectionType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/environment/SectionType.java index 3bd4f188c8..2da26a0076 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/environment/SectionType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/environment/SectionType.java @@ -18,7 +18,6 @@ */ package org.jclouds.vcloud.director.v1_5.domain.ovf.environment; -import java.util.HashMap; import java.util.Map; import javax.xml.bind.annotation.XmlAnyAttribute; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/environment/package-info.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/environment/package-info.java index f3d73d95cc..b7217a07d6 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/environment/package-info.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ovf/environment/package-info.java @@ -27,8 +27,8 @@ package org.jclouds.vcloud.director.v1_5.domain.ovf.environment; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_CIM_NS; -import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_OVF_NS; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_OVF_ENV_NS; +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_OVF_NS; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/package-info.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/package-info.java index ef3043546f..58514959d2 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/package-info.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/package-info.java @@ -31,8 +31,8 @@ package org.jclouds.vcloud.director.v1_5.domain.query; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_1_5_NS; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_CIM_NS; -import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_OVF_NS; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_OVF_ENV_NS; +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorConstants.VCLOUD_OVF_NS; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClient.java index 8c64647aae..ef0737437c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminOrgClient.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; import org.jclouds.vcloud.director.v1_5.domain.AdminOrg; +import org.jclouds.vcloud.director.v1_5.domain.Org; import org.jclouds.vcloud.director.v1_5.domain.OrgEmailSettings; import org.jclouds.vcloud.director.v1_5.domain.OrgGeneralSettings; import org.jclouds.vcloud.director.v1_5.domain.OrgLdapSettings; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClient.java index 2b6c4982a1..72b5644411 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClient.java @@ -25,10 +25,10 @@ import javax.management.relation.Role; import org.jclouds.concurrent.Timeout; import org.jclouds.vcloud.director.v1_5.domain.Group; import org.jclouds.vcloud.director.v1_5.domain.Org; +import org.jclouds.vcloud.director.v1_5.domain.RoleReference; import org.jclouds.vcloud.director.v1_5.domain.RoleReferences; import org.jclouds.vcloud.director.v1_5.domain.User; import org.jclouds.vcloud.director.v1_5.domain.Vdc; -import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecordType; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; /** diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryAsyncClient.java index 4374619fcf..875e5a126a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryAsyncClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryAsyncClient.java @@ -30,6 +30,7 @@ import org.jclouds.rest.annotations.QueryParams; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.SkipEncoding; import org.jclouds.vcloud.director.v1_5.domain.Entity; +import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.query.CatalogReferences; import org.jclouds.vcloud.director.v1_5.domain.query.QueryList; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryClient.java index 106ebf6100..a5de4047a4 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryClient.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/QueryClient.java @@ -21,7 +21,11 @@ package org.jclouds.vcloud.director.v1_5.features; import java.util.concurrent.TimeUnit; import org.jclouds.concurrent.Timeout; +import org.jclouds.vcloud.director.v1_5.domain.CatalogReference; import org.jclouds.vcloud.director.v1_5.domain.Entity; +import org.jclouds.vcloud.director.v1_5.domain.VApp; +import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; +import org.jclouds.vcloud.director.v1_5.domain.Vm; import org.jclouds.vcloud.director.v1_5.domain.query.CatalogReferences; import org.jclouds.vcloud.director.v1_5.domain.query.QueryList; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicates.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicates.java index 60339ee333..e46dc365bd 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicates.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/ReferencePredicates.java @@ -20,6 +20,7 @@ package org.jclouds.vcloud.director.v1_5.predicates; import static com.google.common.base.Preconditions.checkNotNull; +import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Reference; import com.google.common.base.Predicate; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/NonClientOperationsLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/NonClientOperationsLiveTest.java index 60a08918a2..e669d61180 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/NonClientOperationsLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/NonClientOperationsLiveTest.java @@ -25,7 +25,6 @@ import static org.testng.Assert.assertTrue; import java.io.IOException; import java.net.URI; -import java.net.URLEncoder; import org.jclouds.crypto.CryptoStreams; import org.jclouds.http.HttpRequest; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AbstractVAppClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AbstractVAppClientLiveTest.java index fdc34fcc20..6cb5114f9f 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AbstractVAppClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AbstractVAppClientLiveTest.java @@ -32,19 +32,18 @@ import java.io.IOException; import java.math.BigInteger; import java.net.URI; import java.util.List; -import java.util.Map; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.GuestCustomizationSection; import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; import org.jclouds.vcloud.director.v1_5.domain.RasdItemsList; import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.VApp; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; import org.jclouds.vcloud.director.v1_5.domain.Vdc; import org.jclouds.vcloud.director.v1_5.domain.Vm; -import org.jclouds.vcloud.director.v1_5.domain.ResourceEntityType.Status; import org.jclouds.vcloud.director.v1_5.domain.cim.CimBoolean; import org.jclouds.vcloud.director.v1_5.domain.cim.CimString; import org.jclouds.vcloud.director.v1_5.domain.cim.CimUnsignedInt; @@ -55,7 +54,6 @@ import org.jclouds.vcloud.director.v1_5.predicates.ReferencePredicates; import org.jclouds.xml.internal.JAXBParser; import org.testng.Assert; import org.testng.annotations.AfterClass; -import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeClass; import com.google.common.base.Function; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java index 89c007bf35..8bde2a3f8d 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/AdminQueryClientExpectTest.java @@ -27,7 +27,6 @@ import org.jclouds.http.HttpResponse; import org.jclouds.vcloud.director.v1_5.VCloudDirectorClient; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Link; -import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecordType; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRoleRecord; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java index 868835c668..20093ed0ae 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/CatalogClientLiveTest.java @@ -24,7 +24,11 @@ import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.C import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.OBJ_REQ_LIVE; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.REF_REQ_LIVE; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.TASK_COMPLETE_TIMELY; -import static org.jclouds.vcloud.director.v1_5.domain.Checks.*; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkCatalogItem; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkError; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadata; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadataValue; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkTask; import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.relEquals; import static org.jclouds.vcloud.director.v1_5.predicates.LinkPredicates.typeEquals; import static org.testng.Assert.assertEquals; @@ -34,8 +38,19 @@ import static org.testng.Assert.fail; import org.jclouds.vcloud.director.v1_5.VCloudDirectorException; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; -import org.jclouds.vcloud.director.v1_5.domain.*; +import org.jclouds.vcloud.director.v1_5.domain.AdminCatalog; +import org.jclouds.vcloud.director.v1_5.domain.CatalogItem; +import org.jclouds.vcloud.director.v1_5.domain.CatalogType; +import org.jclouds.vcloud.director.v1_5.domain.Checks; import org.jclouds.vcloud.director.v1_5.domain.Error; +import org.jclouds.vcloud.director.v1_5.domain.Link; +import org.jclouds.vcloud.director.v1_5.domain.Media; +import org.jclouds.vcloud.director.v1_5.domain.Metadata; +import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; +import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; +import org.jclouds.vcloud.director.v1_5.domain.Reference; +import org.jclouds.vcloud.director.v1_5.domain.Task; +import org.jclouds.vcloud.director.v1_5.domain.Vdc; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorClientLiveTest; import org.testng.annotations.AfterClass; import org.testng.annotations.Test; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java index bc8f918a09..e553203590 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/OrgClientLiveTest.java @@ -21,11 +21,11 @@ package org.jclouds.vcloud.director.v1_5.features; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.CONDITION_FMT; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.CORRECT_VALUE_OBJECT_FMT; import static org.jclouds.vcloud.director.v1_5.VCloudDirectorLiveTestConstants.NOT_EMPTY_OBJECT_FMT; +import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkControlAccessParams; import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadata; import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkMetadataValue; import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkOrg; import static org.jclouds.vcloud.director.v1_5.domain.Checks.checkReferenceType; -import static org.jclouds.vcloud.director.v1_5.domain.Checks.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java index 9bbbb4d5a2..b5f6f6e75f 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/QueryClientExpectTest.java @@ -30,7 +30,6 @@ import org.jclouds.vcloud.director.v1_5.domain.CatalogReference; import org.jclouds.vcloud.director.v1_5.domain.Link; import org.jclouds.vcloud.director.v1_5.domain.query.CatalogReferences; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultCatalogRecord; -import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecordType; import org.jclouds.vcloud.director.v1_5.domain.query.QueryResultRecords; import org.jclouds.vcloud.director.v1_5.internal.BaseVCloudDirectorRestClientExpectTest; import org.testng.annotations.Test; diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java index 4e30f4bd91..a6bd4ffe15 100644 --- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java +++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VAppTemplateClientLiveTest.java @@ -53,6 +53,7 @@ import org.jclouds.vcloud.director.v1_5.domain.MetadataEntry; import org.jclouds.vcloud.director.v1_5.domain.MetadataValue; import org.jclouds.vcloud.director.v1_5.domain.NetworkConfigSection; import org.jclouds.vcloud.director.v1_5.domain.NetworkConnection; +import org.jclouds.vcloud.director.v1_5.domain.NetworkConnection.IpAddressAllocationMode; import org.jclouds.vcloud.director.v1_5.domain.NetworkConnectionSection; import org.jclouds.vcloud.director.v1_5.domain.Owner; import org.jclouds.vcloud.director.v1_5.domain.ProductSectionList; @@ -61,7 +62,6 @@ import org.jclouds.vcloud.director.v1_5.domain.References; import org.jclouds.vcloud.director.v1_5.domain.RelocateParams; import org.jclouds.vcloud.director.v1_5.domain.Task; import org.jclouds.vcloud.director.v1_5.domain.VAppTemplate; -import org.jclouds.vcloud.director.v1_5.domain.NetworkConnection.IpAddressAllocationMode; import org.jclouds.vcloud.director.v1_5.domain.ovf.Envelope; import org.jclouds.vcloud.director.v1_5.domain.ovf.NetworkSection; import org.testng.annotations.Test; diff --git a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToNodeMetadata.java b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToNodeMetadata.java index dae1df8a04..7096aa01c0 100644 --- a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToNodeMetadata.java +++ b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToNodeMetadata.java @@ -22,7 +22,8 @@ package org.jclouds.virtualbox.functions; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static org.jclouds.virtualbox.config.VirtualBoxComputeServiceContextModule.machineToNodeState; -import static org.jclouds.virtualbox.config.VirtualBoxConstants.*; +import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_NODE_NAME_SEPARATOR; +import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_NODE_PREFIX; import javax.annotation.Resource; import javax.inject.Named; diff --git a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java index bef7f792c7..e94645327d 100644 --- a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java +++ b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java @@ -37,7 +37,6 @@ import org.jclouds.compute.options.RunScriptOptions; import org.jclouds.domain.LoginCredentials; import org.jclouds.virtualbox.config.VirtualBoxComputeServiceContextModule; import org.jclouds.virtualbox.domain.CloneSpec; -import org.jclouds.virtualbox.domain.ExecutionType; import org.jclouds.virtualbox.domain.Master; import org.jclouds.virtualbox.domain.NetworkAdapter; import org.jclouds.virtualbox.domain.NetworkInterfaceCard; diff --git a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/StartJettyIfNotAlreadyRunning.java b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/StartJettyIfNotAlreadyRunning.java index c917276a22..f43f398f05 100644 --- a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/StartJettyIfNotAlreadyRunning.java +++ b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/admin/StartJettyIfNotAlreadyRunning.java @@ -34,14 +34,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; -import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.AbstractHandler; -import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.server.handler.DefaultHandler; -import org.eclipse.jetty.server.handler.HandlerList; -import org.eclipse.jetty.server.handler.ResourceHandler; import org.eclipse.jetty.util.resource.Resource; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.logging.Logger; diff --git a/labs/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CreateAndInstallVmLiveTest.java b/labs/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CreateAndInstallVmLiveTest.java index 114e23d83e..d70ab876e3 100644 --- a/labs/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CreateAndInstallVmLiveTest.java +++ b/labs/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CreateAndInstallVmLiveTest.java @@ -51,7 +51,6 @@ import org.testng.annotations.Test; import org.virtualbox_4_1.CleanupMode; import org.virtualbox_4_1.IMachine; import org.virtualbox_4_1.ISession; -import org.virtualbox_4_1.LockType; import org.virtualbox_4_1.NetworkAttachmentType; import org.virtualbox_4_1.StorageBus; diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerService.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerService.java index ec4aa93976..bbc6a1a9f5 100644 --- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerService.java +++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerService.java @@ -20,10 +20,9 @@ package org.jclouds.loadbalancer; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.domain.Location; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.loadbalancer.domain.LoadBalancerMetadata; import org.jclouds.loadbalancer.internal.BaseLoadBalancerService; diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceAdapter.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceAdapter.java index cc494c6c09..ede4b33866 100644 --- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceAdapter.java +++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceAdapter.java @@ -18,10 +18,9 @@ */ package org.jclouds.loadbalancer; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.domain.Location; +import org.jclouds.javax.annotation.Nullable; /** * A means of specifying the interface between the {@link LoadBalancerService LoadBalancerServices} diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceContextFactory.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceContextFactory.java index 507951ff93..40ac3c05e1 100644 --- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceContextFactory.java +++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceContextFactory.java @@ -24,7 +24,6 @@ import static org.jclouds.util.Throwables2.propagateAuthorizationOrOriginalExcep import java.util.Properties; import org.jclouds.javax.annotation.Nullable; - import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextSpec; diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java index a4eba9816b..1083898581 100644 --- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java +++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/BaseLoadBalancerService.java @@ -27,7 +27,6 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; @@ -35,6 +34,7 @@ import javax.inject.Singleton; import org.jclouds.collect.Memoized; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.domain.Location; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.loadbalancer.LoadBalancerService; import org.jclouds.loadbalancer.LoadBalancerServiceContext; import org.jclouds.loadbalancer.domain.LoadBalancerMetadata; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java index af2712f634..b77d829f0b 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.aws.ec2; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@ link org.jclouds.types.ProviderMetadata} for Amazon's * Elastic Compute Cloud (EC2) provider. diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindTagFiltersToIndexedFormParams.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindTagFiltersToIndexedFormParams.java index 55d0d85e64..bfcdb73deb 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindTagFiltersToIndexedFormParams.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindTagFiltersToIndexedFormParams.java @@ -18,7 +18,8 @@ */ package org.jclouds.aws.ec2.binders; -import static com.google.common.base.Preconditions.*; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParams.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParams.java index 7dd8069b2b..0e2eee2f6e 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParams.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParams.java @@ -18,7 +18,8 @@ */ package org.jclouds.aws.ec2.binders; -import static com.google.common.base.Preconditions.*; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java index c3aeedcd11..3d715eea7b 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.Set; import org.jclouds.aws.ec2.options.RequestSpotInstancesOptions; -import org.jclouds.cloudwatch.CloudWatchClient; import org.jclouds.compute.options.TemplateOptions; import org.jclouds.domain.LoginCredentials; import org.jclouds.ec2.compute.options.EC2TemplateOptions; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java index f67e0c2e46..07c634a8c5 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModule.java @@ -66,8 +66,8 @@ import org.jclouds.rest.suppliers.SetAndThrowAuthorizationExceptionSupplier; import com.google.common.base.Supplier; import com.google.common.base.Suppliers; import com.google.common.base.Throwables; -import com.google.common.cache.LoadingCache; import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; import com.google.inject.Injector; import com.google.inject.Key; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java index 2428a3955a..ac6beb452c 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2HardwareSupplier.java @@ -24,8 +24,8 @@ import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.cc1_4xlarge; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.cc2_8xlarge; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.cg1_4xlarge; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_large; -import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_small; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_medium; +import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_small; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m1_xlarge; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m2_2xlarge; import static org.jclouds.ec2.compute.domain.EC2HardwareBuilder.m2_4xlarge; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java index 49a23b4a15..b2c85c4719 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/AWSEC2ImageSupplier.java @@ -34,7 +34,6 @@ import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; -import com.google.common.collect.ForwardingSet; import org.jclouds.Constants; import org.jclouds.aws.ec2.compute.config.ClusterCompute; import org.jclouds.compute.domain.Image; @@ -49,6 +48,7 @@ import com.google.common.base.Splitter; import com.google.common.base.Supplier; import com.google.common.base.Throwables; import com.google.common.cache.LoadingCache; +import com.google.common.collect.ForwardingSet; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java index ad09946a76..04adf718a3 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/suppliers/CallForImages.java @@ -39,9 +39,9 @@ import org.jclouds.logging.Logger; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; -import com.google.common.collect.ImmutableMap.Builder; import com.google.inject.assistedinject.Assisted; /** diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java index 4119a6f9c2..e4c7513dec 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java @@ -24,12 +24,11 @@ import java.util.Arrays; import java.util.Map; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.ec2.domain.BlockDeviceMapping; import org.jclouds.ec2.domain.BlockDeviceMapping.MapEBSSnapshotToDevice; import org.jclouds.ec2.domain.BlockDeviceMapping.MapEphemeralDeviceToDevice; import org.jclouds.ec2.domain.BlockDeviceMapping.MapNewVolumeToDevice; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/Tag.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/Tag.java index 0951ece527..2552715cd9 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/Tag.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/Tag.java @@ -18,7 +18,7 @@ */ package org.jclouds.aws.ec2.domain; -import static com.google.common.base.Preconditions.*; +import static com.google.common.base.Preconditions.checkNotNull; import org.jclouds.aws.ec2.util.TagFilters.ResourceType; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSAMIAsyncClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSAMIAsyncClient.java index cbde32d523..cdcc825ae0 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSAMIAsyncClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSAMIAsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -34,6 +33,7 @@ import org.jclouds.aws.filters.FormSigner; import org.jclouds.ec2.binders.BindProductCodesToIndexedFormParams; import org.jclouds.ec2.services.AMIAsyncClient; import org.jclouds.ec2.services.AMIClient; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSAMIClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSAMIClient.java index dc43450f4b..a10ac4010b 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSAMIClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSAMIClient.java @@ -21,11 +21,10 @@ package org.jclouds.aws.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.options.DescribeImagesOptions; import org.jclouds.ec2.services.AMIClient; +import org.jclouds.javax.annotation.Nullable; /** * Provides access to EC2 via their REST API. diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSInstanceAsyncClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSInstanceAsyncClient.java index 82675c5d3e..3162e5b87b 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSInstanceAsyncClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSInstanceAsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -38,6 +37,7 @@ import org.jclouds.ec2.binders.IfNotNullBindAvailabilityZoneToFormParam; import org.jclouds.ec2.domain.Reservation; import org.jclouds.ec2.options.RunInstancesOptions; import org.jclouds.ec2.services.InstanceAsyncClient; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSInstanceClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSInstanceClient.java index b81cd7f594..a50133079a 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSInstanceClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSInstanceClient.java @@ -21,13 +21,12 @@ package org.jclouds.aws.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.aws.ec2.domain.AWSRunningInstance; import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.Reservation; import org.jclouds.ec2.options.RunInstancesOptions; import org.jclouds.ec2.services.InstanceClient; +import org.jclouds.javax.annotation.Nullable; /** * Provides access to EC2 via their REST API. diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairAsyncClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairAsyncClient.java index 8fffe14464..fc03d3d547 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairAsyncClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairAsyncClient.java @@ -21,7 +21,6 @@ package org.jclouds.aws.ec2.services; import static org.jclouds.aws.reference.FormParameters.ACTION; import static org.jclouds.aws.reference.FormParameters.VERSION; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -33,6 +32,7 @@ import org.jclouds.ec2.domain.KeyPair; import org.jclouds.ec2.services.KeyPairAsyncClient; import org.jclouds.ec2.services.KeyPairClient; import org.jclouds.ec2.xml.KeyPairResponseHandler; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.FormParams; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairClient.java index 9655f5ee25..44b7ba5564 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSKeyPairClient.java @@ -20,11 +20,10 @@ package org.jclouds.aws.ec2.services; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.KeyPair; import org.jclouds.ec2.services.KeyPairClient; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClient.java index 8c94b54522..217ff12ddc 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -39,6 +38,7 @@ import org.jclouds.ec2.domain.IpPermission; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.services.SecurityGroupAsyncClient; import org.jclouds.ec2.xml.DescribeSecurityGroupsResponseHandler; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClient.java index 6a8c3e7f62..8c8d4d9aa6 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClient.java @@ -21,13 +21,12 @@ package org.jclouds.aws.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.aws.ec2.options.CreateSecurityGroupOptions; import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.IpPermission; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.services.SecurityGroupClient; +import org.jclouds.javax.annotation.Nullable; import com.google.common.annotations.Beta; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/MonitoringAsyncClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/MonitoringAsyncClient.java index 6ba3228982..d2964787e5 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/MonitoringAsyncClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/MonitoringAsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Map; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -33,6 +32,7 @@ import org.jclouds.aws.ec2.domain.MonitoringState; import org.jclouds.aws.ec2.xml.MonitoringStateHandler; import org.jclouds.aws.filters.FormSigner; import org.jclouds.ec2.binders.BindInstanceIdsToIndexedFormParams; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/MonitoringClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/MonitoringClient.java index 25b0e4864e..b21383a982 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/MonitoringClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/MonitoringClient.java @@ -21,11 +21,10 @@ package org.jclouds.aws.ec2.services; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - -import org.jclouds.ec2.services.InstanceClient; import org.jclouds.aws.ec2.domain.MonitoringState; import org.jclouds.concurrent.Timeout; +import org.jclouds.ec2.services.InstanceClient; +import org.jclouds.javax.annotation.Nullable; /** * Provides monitoring services for EC2. For more information, refer to the Amazon CloudWatch diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/PlacementGroupAsyncClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/PlacementGroupAsyncClient.java index 9e49e1080d..2383e8d9e5 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/PlacementGroupAsyncClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/PlacementGroupAsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -33,6 +32,7 @@ import org.jclouds.aws.ec2.domain.PlacementGroup; import org.jclouds.aws.ec2.xml.DescribePlacementGroupsResponseHandler; import org.jclouds.aws.filters.FormSigner; import org.jclouds.ec2.binders.BindGroupNamesToIndexedFormParams; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/PlacementGroupClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/PlacementGroupClient.java index 39423eab63..e865f6275e 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/PlacementGroupClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/PlacementGroupClient.java @@ -21,10 +21,9 @@ package org.jclouds.aws.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.aws.ec2.domain.PlacementGroup; import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; /** * Provides Placement Group services for EC2. For more information, refer to the Amazon EC2 diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/SpotInstanceAsyncClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/SpotInstanceAsyncClient.java index 8d089e9f43..fc8a919dbb 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/SpotInstanceAsyncClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/SpotInstanceAsyncClient.java @@ -23,7 +23,6 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -40,6 +39,7 @@ import org.jclouds.aws.ec2.xml.DescribeSpotPriceHistoryResponseHandler; import org.jclouds.aws.ec2.xml.SpotInstanceHandler; import org.jclouds.aws.ec2.xml.SpotInstancesHandler; import org.jclouds.aws.filters.FormSigner; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/SpotInstanceClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/SpotInstanceClient.java index ceda2ad833..89450950b6 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/SpotInstanceClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/SpotInstanceClient.java @@ -21,14 +21,13 @@ package org.jclouds.aws.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.aws.ec2.domain.LaunchSpecification; import org.jclouds.aws.ec2.domain.Spot; import org.jclouds.aws.ec2.domain.SpotInstanceRequest; import org.jclouds.aws.ec2.options.DescribeSpotPriceHistoryOptions; import org.jclouds.aws.ec2.options.RequestSpotInstancesOptions; import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; /** * Provides Spot Instance services for EC2. For more information, refer to the Amazon EC2 Developer diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/TagAsyncClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/TagAsyncClient.java index bba53f1ff7..49ceee9498 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/TagAsyncClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/TagAsyncClient.java @@ -18,7 +18,8 @@ */ package org.jclouds.aws.ec2.services; -import static org.jclouds.aws.reference.FormParameters.*; +import static org.jclouds.aws.reference.FormParameters.ACTION; +import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Map; import java.util.Set; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/TagSetHandler.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/TagSetHandler.java index df91616a9b..a718e2fad3 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/TagSetHandler.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/xml/TagSetHandler.java @@ -18,7 +18,8 @@ */ package org.jclouds.aws.ec2.xml; -import static org.jclouds.util.SaxUtils.*; +import static org.jclouds.util.SaxUtils.currentOrNull; +import static org.jclouds.util.SaxUtils.equalsOrSuffix; import java.util.Map; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/AWSEC2ProviderTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/AWSEC2ProviderTest.java index 83280f0559..61ecca37a6 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/AWSEC2ProviderTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/AWSEC2ProviderTest.java @@ -18,7 +18,6 @@ */ package org.jclouds.aws.ec2; -import org.jclouds.aws.ec2.AWSEC2ProviderMetadata; import org.jclouds.providers.BaseProviderMetadataTest; import org.jclouds.providers.ProviderMetadata; import org.testng.annotations.Test; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagFiltersToIndexedFormParamsTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagFiltersToIndexedFormParamsTest.java index c8e7b4e7a0..c357624e24 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagFiltersToIndexedFormParamsTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagFiltersToIndexedFormParamsTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.aws.ec2.binders; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; import java.io.File; import java.net.URI; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParamsTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParamsTest.java index 1e32845f76..9652fe89c8 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParamsTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParamsTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.aws.ec2.binders; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; import java.io.File; import java.net.URI; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java index 6c09e33d6c..f2e28c3776 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java @@ -18,11 +18,15 @@ */ package org.jclouds.aws.ec2.compute; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.inject.Module; +import static org.jclouds.compute.util.ComputeServiceUtils.getCores; +import static org.jclouds.http.internal.TrackingJavaUrlHttpCommandExecutorService.getJavaMethodForRequestAtIndex; +import static org.testng.Assert.assertEquals; + +import java.io.IOException; +import java.util.List; +import java.util.Properties; +import java.util.Set; + import org.jclouds.aws.domain.Region; import org.jclouds.aws.ec2.reference.AWSEC2Constants; import org.jclouds.compute.ComputeServiceContext; @@ -44,14 +48,11 @@ import org.jclouds.location.reference.LocationConstants; import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.testng.annotations.Test; -import java.io.IOException; -import java.util.List; -import java.util.Properties; -import java.util.Set; - -import static org.jclouds.compute.util.ComputeServiceUtils.getCores; -import static org.jclouds.http.internal.TrackingJavaUrlHttpCommandExecutorService.getJavaMethodForRequestAtIndex; -import static org.testng.Assert.assertEquals; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.inject.Module; /** * diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModuleTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModuleTest.java index ac6612dde1..ed9db18648 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModuleTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/config/AWSEC2ComputeServiceContextModuleTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.aws.ec2.compute.config; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.fail; import org.jclouds.compute.domain.Image; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/functions/AWSRunningInstanceToNodeMetadataTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/functions/AWSRunningInstanceToNodeMetadataTest.java index d305b71515..00a0c7e2fc 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/functions/AWSRunningInstanceToNodeMetadataTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/functions/AWSRunningInstanceToNodeMetadataTest.java @@ -47,9 +47,9 @@ import org.testng.annotations.Test; 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.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ImageParserTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ImageParserTest.java index e21dbd8d01..4893990d11 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ImageParserTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ImageParserTest.java @@ -18,14 +18,11 @@ */ package org.jclouds.aws.ec2.compute.strategy; -import com.google.common.base.Predicates; -import com.google.common.base.Suppliers; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; -import com.google.gson.Gson; -import com.google.inject.Guice; +import static org.testng.Assert.assertEquals; + +import java.util.Map; +import java.util.Set; + import org.jclouds.compute.config.BaseComputeServiceContextModule; import org.jclouds.compute.domain.ImageBuilder; import org.jclouds.compute.domain.OperatingSystem; @@ -43,10 +40,14 @@ import org.jclouds.json.Json; import org.jclouds.json.config.GsonModule; import org.testng.annotations.Test; -import java.util.Map; -import java.util.Set; - -import static org.testng.Assert.assertEquals; +import com.google.common.base.Predicates; +import com.google.common.base.Suppliers; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; +import com.google.gson.Gson; +import com.google.inject.Guice; /** * @author Adrian Cole diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImageTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImageTest.java index cb123c4092..c85cf1f944 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImageTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/strategy/AWSEC2ReviseParsedImageTest.java @@ -18,7 +18,11 @@ */ package org.jclouds.aws.ec2.compute.strategy; -import com.google.inject.Guice; +import static org.testng.Assert.assertEquals; + +import java.util.Collections; +import java.util.Map; + import org.jclouds.compute.config.BaseComputeServiceContextModule; import org.jclouds.compute.domain.ImageBuilder; import org.jclouds.compute.domain.OperatingSystem; @@ -34,10 +38,7 @@ import org.jclouds.json.config.GsonModule; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import java.util.Collections; -import java.util.Map; - -import static org.testng.Assert.assertEquals; +import com.google.inject.Guice; public class AWSEC2ReviseParsedImageTest { private Map> osVersionMap; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypairTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypairTest.java index e1c0a082cd..14a0fd4e28 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypairTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/functions/ImportOrReturnExistingKeypairTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.aws.ec2.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.jclouds.crypto.SshKeys.fingerprintPublicKey; import static org.testng.Assert.assertEquals; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java index 8d41a2600c..2c9ecfbf96 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AMIClientLiveTest.java @@ -42,11 +42,11 @@ import org.jclouds.ec2.EC2AsyncClient; import org.jclouds.ec2.EC2Client; import org.jclouds.ec2.domain.BlockDevice; import org.jclouds.ec2.domain.Image; +import org.jclouds.ec2.domain.Image.ImageType; import org.jclouds.ec2.domain.Reservation; import org.jclouds.ec2.domain.RootDeviceType; import org.jclouds.ec2.domain.RunningInstance; import org.jclouds.ec2.domain.Snapshot; -import org.jclouds.ec2.domain.Image.ImageType; import org.jclouds.ec2.services.AMIClient; import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.jclouds.rest.RestContext; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSAMIClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSAMIClientLiveTest.java index 689f0f44c5..4c536fd7a0 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSAMIClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSAMIClientLiveTest.java @@ -33,8 +33,8 @@ import org.jclouds.aws.ec2.AWSEC2Client; import org.jclouds.compute.BaseVersionedServiceLiveTest; import org.jclouds.compute.ComputeServiceContextFactory; import org.jclouds.ec2.domain.Image; -import org.jclouds.ec2.domain.RootDeviceType; import org.jclouds.ec2.domain.Image.ImageType; +import org.jclouds.ec2.domain.RootDeviceType; import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.jclouds.rest.RestContext; import org.testng.annotations.AfterTest; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/DescribePlacementGroupsResponseHandlerTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/DescribePlacementGroupsResponseHandlerTest.java index 45935c1d63..2623425797 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/DescribePlacementGroupsResponseHandlerTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/DescribePlacementGroupsResponseHandlerTest.java @@ -18,15 +18,14 @@ */ package org.jclouds.aws.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; import org.jclouds.aws.ec2.domain.PlacementGroup; -import org.jclouds.aws.ec2.xml.DescribePlacementGroupsResponseHandler; import org.jclouds.ec2.xml.BaseEC2HandlerTest; import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.internal.GeneratedHttpRequest; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/DescribeReservedInstancesOfferingResponseHandlerTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/DescribeReservedInstancesOfferingResponseHandlerTest.java index ffa1f47a4f..891a29d11d 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/DescribeReservedInstancesOfferingResponseHandlerTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/DescribeReservedInstancesOfferingResponseHandlerTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.aws.ec2.xml; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.testng.Assert.assertEquals; import java.io.InputStream; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/MonitoringStateHandlerTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/MonitoringStateHandlerTest.java index ada8756b4a..c58e517887 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/MonitoringStateHandlerTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/MonitoringStateHandlerTest.java @@ -24,7 +24,6 @@ import java.io.InputStream; import java.util.Map; import org.jclouds.aws.ec2.domain.MonitoringState; -import org.jclouds.aws.ec2.xml.MonitoringStateHandler; import org.jclouds.http.functions.BaseHandlerTest; import org.testng.annotations.Test; diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/ProductCodesHandlerTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/ProductCodesHandlerTest.java index 657a58bab7..4a0712ee5b 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/ProductCodesHandlerTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/xml/ProductCodesHandlerTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; import java.util.Set; -import org.jclouds.aws.ec2.xml.ProductCodesHandler; import org.jclouds.http.functions.BaseHandlerTest; import org.testng.annotations.Test; diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3AsyncClient.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3AsyncClient.java index fc193341b7..9f6e5d9ce3 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3AsyncClient.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3AsyncClient.java @@ -22,8 +22,6 @@ import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER; import java.util.Map; -import org.jclouds.aws.s3.blobstore.options.AWSS3PutObjectOptions; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -40,6 +38,7 @@ import org.jclouds.aws.s3.functions.UploadIdFromHttpResponseViaRegex; import org.jclouds.blobstore.attr.BlobScope; import org.jclouds.http.functions.ParseETagHeader; import org.jclouds.io.Payload; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.Endpoint; import org.jclouds.rest.annotations.ExceptionParser; @@ -55,12 +54,9 @@ import org.jclouds.s3.Bucket; import org.jclouds.s3.S3AsyncClient; import org.jclouds.s3.S3Client; import org.jclouds.s3.binders.BindAsHostPrefixIfConfigured; -import org.jclouds.s3.binders.BindS3ObjectMetadataToRequest; import org.jclouds.s3.domain.ObjectMetadata; -import org.jclouds.s3.domain.S3Object; import org.jclouds.s3.filters.RequestAuthorizeSignature; import org.jclouds.s3.functions.BindRegionToXmlPayload; -import org.jclouds.s3.functions.ObjectKey; import org.jclouds.s3.functions.ReturnFalseIfBucketAlreadyOwnedByYouOrIllegalState; import org.jclouds.s3.options.PutBucketOptions; import org.jclouds.s3.options.PutObjectOptions; diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3Client.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3Client.java index 11decd9f61..ea1ae6548c 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3Client.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3Client.java @@ -21,12 +21,10 @@ package org.jclouds.aws.s3; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.jclouds.aws.s3.blobstore.options.AWSS3PutObjectOptions; import org.jclouds.concurrent.Timeout; import org.jclouds.io.Payload; import org.jclouds.s3.S3Client; import org.jclouds.s3.domain.ObjectMetadata; -import org.jclouds.s3.domain.S3Object; import org.jclouds.s3.options.PutObjectOptions; /** diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java index 577791429b..57c8a7dfea 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.aws.s3; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.providers.ProviderMetadata} for Amazon's Simple Storage Service * (S3) provider. diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3AsyncBlobStore.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3AsyncBlobStore.java index 02d72315cb..bc5e5b15f6 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3AsyncBlobStore.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3AsyncBlobStore.java @@ -18,6 +18,8 @@ */ package org.jclouds.aws.s3.blobstore; +import static org.jclouds.s3.domain.ObjectMetadata.StorageClass.REDUCED_REDUNDANCY; + import java.util.Set; import java.util.concurrent.ExecutorService; @@ -25,7 +27,6 @@ import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; -import com.google.common.cache.CacheLoader; import org.jclouds.Constants; import org.jclouds.aws.s3.AWSS3AsyncClient; import org.jclouds.aws.s3.AWSS3Client; @@ -41,7 +42,6 @@ import org.jclouds.blobstore.util.BlobUtils; import org.jclouds.collect.Memoized; import org.jclouds.domain.Location; import org.jclouds.s3.S3AsyncClient; -import org.jclouds.s3.S3Client; import org.jclouds.s3.blobstore.S3AsyncBlobStore; import org.jclouds.s3.blobstore.functions.BlobToObject; import org.jclouds.s3.blobstore.functions.BucketToResourceList; @@ -50,14 +50,13 @@ import org.jclouds.s3.blobstore.functions.ContainerToBucketListOptions; import org.jclouds.s3.blobstore.functions.ObjectToBlob; import org.jclouds.s3.blobstore.functions.ObjectToBlobMetadata; import org.jclouds.s3.domain.AccessControlList; - -import com.google.common.base.Supplier; -import com.google.common.cache.LoadingCache; -import com.google.common.util.concurrent.ListenableFuture; import org.jclouds.s3.domain.CannedAccessPolicy; import org.jclouds.s3.domain.ObjectMetadata; -import static org.jclouds.s3.domain.ObjectMetadata.StorageClass.REDUCED_REDUNDANCY; +import com.google.common.base.Supplier; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; +import com.google.common.util.concurrent.ListenableFuture; /** * diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java index f981c3c85a..ba641fcc04 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/AWSS3BlobStore.java @@ -18,12 +18,13 @@ */ package org.jclouds.aws.s3.blobstore; +import static org.jclouds.s3.domain.ObjectMetadata.StorageClass.REDUCED_REDUNDANCY; + import java.util.Set; import javax.inject.Inject; import javax.inject.Provider; -import com.google.common.cache.CacheLoader; import org.jclouds.aws.s3.AWSS3Client; import org.jclouds.aws.s3.blobstore.options.AWSS3PutObjectOptions; import org.jclouds.aws.s3.blobstore.options.AWSS3PutOptions; @@ -45,14 +46,12 @@ import org.jclouds.s3.blobstore.functions.ContainerToBucketListOptions; import org.jclouds.s3.blobstore.functions.ObjectToBlob; import org.jclouds.s3.blobstore.functions.ObjectToBlobMetadata; import org.jclouds.s3.domain.AccessControlList; - -import com.google.common.base.Supplier; -import com.google.common.cache.LoadingCache; import org.jclouds.s3.domain.CannedAccessPolicy; import org.jclouds.s3.domain.ObjectMetadata; -import org.jclouds.s3.options.PutObjectOptions; -import static org.jclouds.s3.domain.ObjectMetadata.StorageClass.REDUCED_REDUNDANCY; +import com.google.common.base.Supplier; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; /** * Provide AWS S3 specific extensions. diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/config/AWSS3BlobStoreContextModule.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/config/AWSS3BlobStoreContextModule.java index 89db15892c..71c85e2eec 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/config/AWSS3BlobStoreContextModule.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/config/AWSS3BlobStoreContextModule.java @@ -28,7 +28,6 @@ import org.jclouds.aws.s3.blobstore.strategy.internal.ParallelMultipartUploadStr import org.jclouds.aws.s3.blobstore.strategy.internal.SequentialMultipartUploadStrategy; import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.internal.BlobStoreContextImpl; -import org.jclouds.blobstore.options.PutOptions; import org.jclouds.s3.blobstore.S3AsyncBlobStore; import org.jclouds.s3.blobstore.S3BlobStore; import org.jclouds.s3.blobstore.config.S3BlobStoreContextModule; diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/AsyncMultipartUploadStrategy.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/AsyncMultipartUploadStrategy.java index 49535f6e77..abde385d78 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/AsyncMultipartUploadStrategy.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/AsyncMultipartUploadStrategy.java @@ -20,10 +20,10 @@ package org.jclouds.aws.s3.blobstore.strategy; import org.jclouds.aws.s3.blobstore.strategy.internal.ParallelMultipartUploadStrategy; import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.options.PutOptions; import com.google.common.util.concurrent.ListenableFuture; import com.google.inject.ImplementedBy; -import org.jclouds.blobstore.options.PutOptions; /** * @see AWS Documentation diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/MultipartUploadStrategy.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/MultipartUploadStrategy.java index 9a01890bef..a511ffb7ae 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/MultipartUploadStrategy.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/MultipartUploadStrategy.java @@ -20,9 +20,9 @@ package org.jclouds.aws.s3.blobstore.strategy; import org.jclouds.aws.s3.blobstore.strategy.internal.SequentialMultipartUploadStrategy; import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.options.PutOptions; import com.google.inject.ImplementedBy; -import org.jclouds.blobstore.options.PutOptions; /** * @see AWS Documentation diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java index e4ffc25a27..b7bd47030a 100644 --- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java +++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategy.java @@ -20,7 +20,6 @@ package org.jclouds.aws.s3.blobstore.strategy.internal; import static com.google.common.base.Preconditions.checkNotNull; - import java.util.SortedMap; import javax.annotation.Resource; diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientExpectTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientExpectTest.java index 63055cb45f..746c3d0ac8 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientExpectTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientExpectTest.java @@ -18,19 +18,20 @@ */ package org.jclouds.aws.s3; -import com.google.common.collect.ImmutableMultimap; +import static org.jclouds.aws.s3.blobstore.options.AWSS3PutObjectOptions.Builder.storageClass; + +import java.net.URI; + import org.jclouds.aws.s3.internal.BaseAWSS3ClientExpectTest; import org.jclouds.blobstore.domain.Blob; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.io.payloads.StringPayload; import org.jclouds.s3.blobstore.functions.BlobToObject; +import org.jclouds.s3.domain.ObjectMetadata.StorageClass; import org.testng.annotations.Test; -import java.net.URI; - -import static org.jclouds.aws.s3.blobstore.options.AWSS3PutObjectOptions.Builder.storageClass; -import static org.jclouds.s3.domain.ObjectMetadata.StorageClass; +import com.google.common.collect.ImmutableMultimap; /** * @author Andrei Savu diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientLiveTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientLiveTest.java index 8588c88d29..6769524ae9 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientLiveTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientLiveTest.java @@ -44,9 +44,9 @@ import org.jclouds.s3.S3Client; import org.jclouds.s3.S3ClientLiveTest; import org.jclouds.s3.domain.ListBucketResponse; import org.jclouds.s3.domain.ObjectMetadata; +import org.jclouds.s3.domain.ObjectMetadata.StorageClass; import org.jclouds.s3.domain.ObjectMetadataBuilder; import org.jclouds.s3.domain.S3Object; -import org.jclouds.s3.domain.ObjectMetadata.StorageClass; import org.testng.ITestContext; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -54,7 +54,6 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteStreams; import com.google.common.io.InputSupplier; -import com.google.inject.Module; /** * Tests behavior of {@code S3Client} diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyTest.java index 78a4cc6710..2ef31b4819 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.aws.s3.blobstore.strategy.internal; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.fail; import java.util.SortedMap; diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/internal/BaseAWSS3ClientExpectTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/internal/BaseAWSS3ClientExpectTest.java index 169b5d5962..c049a12d77 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/internal/BaseAWSS3ClientExpectTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/internal/BaseAWSS3ClientExpectTest.java @@ -18,10 +18,8 @@ */ package org.jclouds.aws.s3.internal; -import com.google.common.base.Function; -import com.google.common.base.Supplier; -import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; +import java.util.Properties; + import org.jclouds.aws.s3.AWSS3Client; import org.jclouds.aws.s3.config.AWSS3RestClientModule; import org.jclouds.blobstore.BlobStore; @@ -35,7 +33,10 @@ import org.jclouds.logging.config.NullLoggingModule; import org.jclouds.rest.BaseRestClientExpectTest; import org.jclouds.rest.ConfiguresRestClient; -import java.util.Properties; +import com.google.common.base.Function; +import com.google.common.base.Supplier; +import com.google.common.collect.ImmutableSet; +import com.google.inject.Module; /** * Base class for writing Expect tests for AWS-S3 diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java index 05aa2f0bd2..8838e280c7 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.azureblob; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Microsoft Azure Blob Service. * diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/AzureBlob.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/AzureBlob.java index cb9a622b97..1405d3cb97 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/AzureBlob.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/AzureBlob.java @@ -18,9 +18,8 @@ */ package org.jclouds.azureblob.domain; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.io.PayloadEnclosing; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.Multimap; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/BlobPropertiesImpl.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/BlobPropertiesImpl.java index acc3487795..e824a01f03 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/BlobPropertiesImpl.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/BlobPropertiesImpl.java @@ -25,13 +25,12 @@ import java.net.URI; import java.util.Date; import java.util.Map; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.azureblob.domain.BlobProperties; import org.jclouds.azureblob.domain.BlobType; import org.jclouds.azureblob.domain.LeaseStatus; import org.jclouds.io.ContentMetadata; import org.jclouds.io.payloads.BaseImmutableContentMetadata; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.Maps; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/HashSetListBlobsResponse.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/HashSetListBlobsResponse.java index d9a0f7e758..1c176580cf 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/HashSetListBlobsResponse.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/HashSetListBlobsResponse.java @@ -21,9 +21,9 @@ package org.jclouds.azureblob.domain.internal; import java.net.URI; import java.util.Set; +import org.jclouds.azure.storage.domain.internal.BoundedHashSet; import org.jclouds.azureblob.domain.BlobProperties; import org.jclouds.azureblob.domain.ListBlobsResponse; -import org.jclouds.azure.storage.domain.internal.BoundedHashSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandler.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandler.java index a31e22ba57..fe0985550f 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandler.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandler.java @@ -25,10 +25,10 @@ import java.util.SortedSet; import javax.inject.Inject; -import org.jclouds.azureblob.domain.ContainerProperties; -import org.jclouds.azureblob.domain.internal.ContainerPropertiesImpl; import org.jclouds.azure.storage.domain.BoundedSet; import org.jclouds.azure.storage.domain.internal.BoundedHashSet; +import org.jclouds.azureblob.domain.ContainerProperties; +import org.jclouds.azureblob.domain.internal.ContainerPropertiesImpl; import org.jclouds.date.DateService; import org.jclouds.http.functions.ParseSax; import org.xml.sax.Attributes; diff --git a/providers/azureblob/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureBlobErrorFromXmlContentTest.java b/providers/azureblob/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureBlobErrorFromXmlContentTest.java index 151f9a2e62..8673c005b5 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureBlobErrorFromXmlContentTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azure/storage/handlers/ParseAzureBlobErrorFromXmlContentTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.azure.storage.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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.verify; import java.net.URI; diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreModuleTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreModuleTest.java index c466420ff0..be2cd4eb41 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreModuleTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/config/AzureBlobStoreModuleTest.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; diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/predicates/validators/ContainerNameValidatorTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/predicates/validators/ContainerNameValidatorTest.java index a7ed96f0c8..230135a2d3 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/predicates/validators/ContainerNameValidatorTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/predicates/validators/ContainerNameValidatorTest.java @@ -19,7 +19,6 @@ package org.jclouds.azureblob.predicates.validators; import org.testng.annotations.Test; -import org.jclouds.azureblob.predicates.validators.ContainerNameValidator; public class ContainerNameValidatorTest { diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandlerTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandlerTest.java index 2de8b55492..d4fd03822d 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandlerTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/xml/AccountNameEnumerationResultsHandlerTest.java @@ -24,10 +24,10 @@ import java.io.InputStream; import java.net.URI; import java.util.SortedSet; -import org.jclouds.azureblob.domain.ContainerProperties; -import org.jclouds.azureblob.domain.internal.ContainerPropertiesImpl; import org.jclouds.azure.storage.domain.BoundedSet; import org.jclouds.azure.storage.domain.internal.BoundedHashSet; +import org.jclouds.azureblob.domain.ContainerProperties; +import org.jclouds.azureblob.domain.internal.ContainerPropertiesImpl; import org.jclouds.date.DateService; import org.jclouds.http.functions.BaseHandlerTest; import org.testng.annotations.BeforeTest; diff --git a/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ContextBuilder.java b/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ContextBuilder.java index 73b49044fe..31881dcb78 100644 --- a/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ContextBuilder.java +++ b/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ContextBuilder.java @@ -21,10 +21,10 @@ package org.jclouds.bluelock.vcloud.zone01; import java.util.List; import java.util.Properties; +import org.jclouds.bluelock.vcloud.zone01.config.BluelockVCloudZone01RestClientModule; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; import org.jclouds.logging.jdk.config.JDKLoggingModule; import org.jclouds.vcloud.VCloudContextBuilder; -import org.jclouds.bluelock.vcloud.zone01.config.BluelockVCloudZone01RestClientModule; import org.jclouds.vcloud.compute.config.VCloudComputeServiceContextModule; import com.google.inject.Injector; diff --git a/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01PropertiesBuilder.java b/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01PropertiesBuilder.java index cb50a54487..f7a089870f 100644 --- a/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01PropertiesBuilder.java +++ b/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01PropertiesBuilder.java @@ -18,7 +18,8 @@ */ package org.jclouds.bluelock.vcloud.zone01; -import static org.jclouds.Constants.*; +import static org.jclouds.Constants.PROPERTY_BUILD_VERSION; +import static org.jclouds.Constants.PROPERTY_ENDPOINT; import static org.jclouds.Constants.PROPERTY_ISO3166_CODES; import static org.jclouds.vcloud.reference.VCloudConstants.PROPERTY_VCLOUD_DEFAULT_NETWORK; diff --git a/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java b/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java index 9f70228789..5124d84ee4 100644 --- a/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java +++ b/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.bluelock.vcloud.zone01; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Bluelock vCloud Zone 1. * diff --git a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java b/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java index b364f0239e..e4833ddf43 100644 --- a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java +++ b/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java @@ -18,13 +18,13 @@ */ package org.jclouds.rackspace.cloudfiles; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.cloudfiles.CloudFilesProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud Files in US. diff --git a/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderTest.java b/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderTest.java index b7673b6aac..6d303f464a 100644 --- a/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderTest.java +++ b/providers/cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderTest.java @@ -20,7 +20,6 @@ package org.jclouds.rackspace.cloudloadbalancers; import org.jclouds.providers.BaseProviderMetadataTest; import org.jclouds.providers.ProviderMetadata; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersUKProviderMetadata; import org.testng.annotations.Test; /** diff --git a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderTest.java b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderTest.java index b8f63276f7..9c28808057 100644 --- a/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderTest.java +++ b/providers/cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderTest.java @@ -20,7 +20,6 @@ package org.jclouds.rackspace.cloudloadbalancers; import org.jclouds.providers.BaseProviderMetadataTest; import org.jclouds.providers.ProviderMetadata; -import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersUSProviderMetadata; import org.testng.annotations.Test; /** diff --git a/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java b/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java index f4d23341a3..4704760290 100644 --- a/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java +++ b/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java @@ -18,13 +18,13 @@ */ package org.jclouds.cloudonestorage; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@ link org.jclouds.types.ProviderMetadata} for PEER1's * CloudOne Storage provider. diff --git a/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java b/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java index 1866ae61a2..2ae4c622ab 100644 --- a/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java +++ b/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java @@ -18,13 +18,13 @@ */ package org.jclouds.rackspace.cloudservers; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.cloudservers.CloudServersProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud Servers in US. diff --git a/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java b/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java index 7b65ecae0a..b2e7509a06 100644 --- a/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java +++ b/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.cloudsigma; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for CloudSigma LasVegas. * diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java index 8f809eea34..f4ee3f11c8 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.cloudsigma; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for CloudSigma Zurich. * diff --git a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichComputeServiceLiveTest.java b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichComputeServiceLiveTest.java index fd25db453e..ab32b70988 100644 --- a/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichComputeServiceLiveTest.java +++ b/providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichComputeServiceLiveTest.java @@ -18,6 +18,14 @@ */ package org.jclouds.cloudsigma.compute; +import static com.google.common.collect.Iterables.contains; +import static com.google.common.collect.Iterables.get; +import static org.jclouds.cloudsigma.compute.options.CloudSigmaTemplateOptions.Builder.diskDriveAffinity; +import static org.jclouds.compute.predicates.NodePredicates.inGroup; +import static org.testng.Assert.assertTrue; + +import java.util.Set; + import org.jclouds.cloudsigma.CloudSigmaClient; import org.jclouds.cloudsigma.compute.options.CloudSigmaTemplateOptions; import org.jclouds.cloudsigma.domain.AffinityType; @@ -30,14 +38,6 @@ import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.TemplateBuilder; import org.testng.annotations.Test; -import java.util.Set; - -import static com.google.common.collect.Iterables.contains; -import static com.google.common.collect.Iterables.get; -import static org.jclouds.cloudsigma.compute.options.CloudSigmaTemplateOptions.Builder.diskDriveAffinity; -import static org.jclouds.compute.predicates.NodePredicates.inGroup; -import static org.testng.Assert.assertTrue; - /** * * @author Adrian Cole diff --git a/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesPropertiesBuilder.java b/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesPropertiesBuilder.java index 89cab71919..3a34dab879 100644 --- a/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesPropertiesBuilder.java +++ b/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesPropertiesBuilder.java @@ -18,11 +18,13 @@ */ package org.jclouds.elastichosts; -import org.jclouds.elasticstack.ElasticStackPropertiesBuilder; +import static org.jclouds.Constants.PROPERTY_API_VERSION; +import static org.jclouds.Constants.PROPERTY_ENDPOINT; +import static org.jclouds.Constants.PROPERTY_ISO3166_CODES; import java.util.Properties; -import static org.jclouds.Constants.*; +import org.jclouds.elasticstack.ElasticStackPropertiesBuilder; /** * diff --git a/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java b/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java index 82a277c28f..0f08edcd26 100644 --- a/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java +++ b/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java @@ -18,12 +18,13 @@ */ package org.jclouds.elastichosts; -import com.google.common.collect.ImmutableSet; +import java.net.URI; +import java.util.Set; + import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; -import java.net.URI; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts Toronto Peer 1. diff --git a/providers/elastichosts-lax-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LosAngelesTemplateBuilderLiveTest.java b/providers/elastichosts-lax-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LosAngelesTemplateBuilderLiveTest.java index ef3a59f41d..b147769ba1 100644 --- a/providers/elastichosts-lax-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LosAngelesTemplateBuilderLiveTest.java +++ b/providers/elastichosts-lax-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LosAngelesTemplateBuilderLiveTest.java @@ -18,19 +18,20 @@ */ package org.jclouds.elastichosts.compute; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableSet; +import static org.jclouds.compute.util.ComputeServiceUtils.getCores; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + import org.jclouds.compute.BaseTemplateBuilderLiveTest; import org.jclouds.compute.domain.OsFamily; import org.jclouds.compute.domain.OsFamilyVersion64Bit; import org.jclouds.compute.domain.Template; import org.testng.annotations.Test; -import java.util.Set; - -import static org.jclouds.compute.util.ComputeServiceUtils.getCores; -import static org.testng.Assert.assertEquals; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableSet; /** * diff --git a/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java b/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java index 631c64471e..ca6c702052 100644 --- a/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java +++ b/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.elastichosts; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts London BlueSquare. * diff --git a/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java b/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java index 192349e1db..c98bf03eb3 100644 --- a/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java +++ b/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.elastichosts; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts London Peer 1. * diff --git a/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java b/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java index 40f253b6dd..1f84bc3c47 100644 --- a/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java +++ b/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.elastichosts; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts San Antonio Peer 1. * diff --git a/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoPropertiesBuilder.java b/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoPropertiesBuilder.java index d61ce4ac5f..a9f8b0f74c 100644 --- a/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoPropertiesBuilder.java +++ b/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoPropertiesBuilder.java @@ -18,11 +18,13 @@ */ package org.jclouds.elastichosts; -import org.jclouds.elasticstack.ElasticStackPropertiesBuilder; +import static org.jclouds.Constants.PROPERTY_API_VERSION; +import static org.jclouds.Constants.PROPERTY_ENDPOINT; +import static org.jclouds.Constants.PROPERTY_ISO3166_CODES; import java.util.Properties; -import static org.jclouds.Constants.*; +import org.jclouds.elasticstack.ElasticStackPropertiesBuilder; /** * diff --git a/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java b/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java index 97a3743af9..9a0000f47b 100644 --- a/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java +++ b/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java @@ -18,12 +18,13 @@ */ package org.jclouds.elastichosts; -import com.google.common.collect.ImmutableSet; +import java.net.URI; +import java.util.Set; + import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; -import java.net.URI; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts Toronto Peer 1. diff --git a/providers/elastichosts-tor-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1TorontoTemplateBuilderLiveTest.java b/providers/elastichosts-tor-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1TorontoTemplateBuilderLiveTest.java index 1974f1b7f5..103b0ec4ef 100644 --- a/providers/elastichosts-tor-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1TorontoTemplateBuilderLiveTest.java +++ b/providers/elastichosts-tor-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1TorontoTemplateBuilderLiveTest.java @@ -18,19 +18,20 @@ */ package org.jclouds.elastichosts.compute; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableSet; +import static org.jclouds.compute.util.ComputeServiceUtils.getCores; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + import org.jclouds.compute.BaseTemplateBuilderLiveTest; import org.jclouds.compute.domain.OsFamily; import org.jclouds.compute.domain.OsFamilyVersion64Bit; import org.jclouds.compute.domain.Template; import org.testng.annotations.Test; -import java.util.Set; - -import static org.jclouds.compute.util.ComputeServiceUtils.getCores; -import static org.testng.Assert.assertEquals; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableSet; /** * diff --git a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java index 1f9e8036d8..f40b42dd08 100644 --- a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java +++ b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java @@ -18,13 +18,13 @@ */ package org.jclouds.epc; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@ link org.jclouds.types.ProviderMetadata} for Eucalpytus' * Partner Cloud EC2 provider. diff --git a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java index ee788b392e..ba0b1c7df5 100644 --- a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java +++ b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java @@ -18,13 +18,13 @@ */ package org.jclouds.epc; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@ link org.jclouds.types.ProviderMetadata} for Eucalpytus' * Partner Cloud S3 provider. diff --git a/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java b/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java index 419d487bdd..4afca17c06 100644 --- a/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java +++ b/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java @@ -18,13 +18,13 @@ */ package org.jclouds.go2cloud; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Go2Cloud's * Johannesburg1 provider. diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java index 86b8a9da54..1d74d7c0ca 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.gogrid; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of @ link org.jclouds.types.ProviderMetadata} for GoGrid. * diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridResponseException.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridResponseException.java index 6b74fd7dc7..c61c6275c0 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridResponseException.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridResponseException.java @@ -18,15 +18,15 @@ */ package org.jclouds.gogrid; +import static java.lang.String.format; + +import java.util.Set; + import org.jclouds.gogrid.domain.internal.ErrorResponse; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponseException; -import java.util.Set; - -import static java.lang.String.format; - /** * @author Oleksiy Yarmula */ diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpState.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpState.java index 1ab1296859..864b12c23d 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpState.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpState.java @@ -18,10 +18,10 @@ */ package org.jclouds.gogrid.domain; -import com.google.common.base.CaseFormat; - import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.CaseFormat; + /** * @author Oleksiy Yarmula */ diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java index 321a82ba30..f0fa3fcace 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java @@ -18,11 +18,11 @@ */ package org.jclouds.gogrid.domain; +import java.util.Date; + import com.google.common.primitives.Longs; import com.google.gson.annotations.SerializedName; -import java.util.Date; - /** * State of a job. * diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancerState.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancerState.java index b4eff004f0..48291b00ec 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancerState.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancerState.java @@ -18,10 +18,10 @@ */ package org.jclouds.gogrid.domain; -import com.google.common.base.CaseFormat; - import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.CaseFormat; + /** * @author Oleksiy Yarmula */ diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ObjectType.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ObjectType.java index 87b33af655..47f0d60628 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ObjectType.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ObjectType.java @@ -18,10 +18,10 @@ */ package org.jclouds.gogrid.domain; -import com.google.common.base.CaseFormat; - import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.CaseFormat; + /** * @author Oleksiy Yarmula */ diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/options/AddLoadBalancerOptions.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/options/AddLoadBalancerOptions.java index 6025995285..3f8aff7b88 100644 --- a/providers/gogrid/src/main/java/org/jclouds/gogrid/options/AddLoadBalancerOptions.java +++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/options/AddLoadBalancerOptions.java @@ -18,13 +18,15 @@ */ package org.jclouds.gogrid.options; +import static com.google.common.base.Preconditions.checkState; +import static org.jclouds.gogrid.reference.GoGridQueryParams.DESCRIPTION_KEY; +import static org.jclouds.gogrid.reference.GoGridQueryParams.LOAD_BALANCER_PERSISTENCE_TYPE_KEY; +import static org.jclouds.gogrid.reference.GoGridQueryParams.LOAD_BALANCER_TYPE_KEY; + import org.jclouds.gogrid.domain.LoadBalancerPersistenceType; import org.jclouds.gogrid.domain.LoadBalancerType; import org.jclouds.http.options.BaseHttpRequestOptions; -import static com.google.common.base.Preconditions.checkState; -import static org.jclouds.gogrid.reference.GoGridQueryParams.*; - /** * Optional parameters for adding a load balancer. * diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java index 962891d560..7c3cc171cf 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java @@ -53,7 +53,6 @@ import org.jclouds.gogrid.options.AddServerOptions; import org.jclouds.gogrid.options.GetImageListOptions; import org.jclouds.gogrid.predicates.LoadBalancerLatestJobCompleted; import org.jclouds.gogrid.predicates.ServerLatestJobCompleted; -import org.jclouds.http.handlers.BackoffLimitedRetryHandler; import org.jclouds.javax.annotation.Nullable; import org.jclouds.logging.log4j.config.Log4JLoggingModule; import org.jclouds.net.IPSocket; @@ -61,7 +60,6 @@ import org.jclouds.predicates.InetSocketAddressConnect; import org.jclouds.predicates.RetryablePredicate; import org.jclouds.rest.RestContext; import org.jclouds.ssh.SshClient; -import org.jclouds.sshj.SshjSshClient; import org.testng.SkipException; import org.testng.TestException; import org.testng.annotations.AfterTest; diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadataTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadataTest.java index a8645416e7..788cfb0297 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadataTest.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadataTest.java @@ -18,10 +18,10 @@ */ package org.jclouds.gogrid.compute.functions; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.testng.Assert.assertEquals; import java.util.Map; diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/options/GoGridTemplateOptionsTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/options/GoGridTemplateOptionsTest.java index cdfe773d5c..895fd0f50a 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/options/GoGridTemplateOptionsTest.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/options/GoGridTemplateOptionsTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.gogrid.compute.options; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; import org.jclouds.compute.options.TemplateOptions; import org.testng.annotations.Test; diff --git a/providers/gogrid/src/test/java/org/jclouds/gogrid/predicates/ServerLatestJobCompletedTest.java b/providers/gogrid/src/test/java/org/jclouds/gogrid/predicates/ServerLatestJobCompletedTest.java index ede106e93c..e4e3cb9695 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/predicates/ServerLatestJobCompletedTest.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/predicates/ServerLatestJobCompletedTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.gogrid.predicates; +import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; -import static org.easymock.classextension.EasyMock.createMock; -import static org.easymock.classextension.EasyMock.replay; +import static org.easymock.EasyMock.replay; import static org.jclouds.gogrid.options.GetJobListOptions.Builder.latestJobForObjectByName; import static org.testng.Assert.assertTrue; diff --git a/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java b/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java index c3e89eadc2..6c088f055c 100644 --- a/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java +++ b/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.greenhousedata.element.vcloud; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Green House Data Element vCloud * diff --git a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeServiceAdapter.java b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeServiceAdapter.java index 9294505187..14abba655a 100644 --- a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeServiceAdapter.java +++ b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeServiceAdapter.java @@ -4,18 +4,18 @@ import java.util.Set; import javax.inject.Inject; -import com.google.common.cache.LoadingCache; import org.jclouds.location.Zone; import org.jclouds.openstack.nova.v1_1.NovaClient; import org.jclouds.openstack.nova.v1_1.compute.NovaComputeServiceAdapter; import org.jclouds.openstack.nova.v1_1.compute.functions.RemoveFloatingIpFromNodeAndDeallocate; import org.jclouds.openstack.nova.v1_1.domain.KeyPair; import org.jclouds.openstack.nova.v1_1.domain.zonescoped.ImageInZone; +import org.jclouds.openstack.nova.v1_1.domain.zonescoped.ZoneAndName; import com.google.common.base.Predicate; import com.google.common.base.Supplier; +import com.google.common.cache.LoadingCache; import com.google.common.collect.Iterables; -import org.jclouds.openstack.nova.v1_1.domain.zonescoped.ZoneAndName; /** * diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageContextBuilder.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageContextBuilder.java index 79d8d76d48..5653544c81 100644 --- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageContextBuilder.java +++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageContextBuilder.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Properties; import org.jclouds.blobstore.BlobStoreContextBuilder; +import org.jclouds.hpcloud.objectstorage.blobstore.HPCloudObjectStorageBlobStore; import org.jclouds.hpcloud.objectstorage.blobstore.config.HPCloudObjectStorageBlobStoreContextModule; import org.jclouds.hpcloud.objectstorage.config.HPCloudObjectStorageRestClientModule; import org.jclouds.http.config.JavaUrlHttpCommandExecutorServiceModule; diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java index 056cbb7b42..6693af3f47 100644 --- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java +++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.hpcloud.objectstorage; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.providers.ProviderMetadata} for HP Cloud Services Object Storage * diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java index 158f58c9b5..28cbcdfd5d 100644 --- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java +++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/blobstore/config/HPCloudObjectStorageBlobStoreContextModule.java @@ -35,6 +35,7 @@ import org.jclouds.hpcloud.objectstorage.blobstore.functions.HPCloudObjectStorag import org.jclouds.hpcloud.objectstorage.domain.ContainerCDNMetadata; import org.jclouds.hpcloud.objectstorage.extensions.HPCloudCDNClient; import org.jclouds.http.HttpResponseException; +import org.jclouds.logging.Logger; import org.jclouds.openstack.swift.blobstore.SwiftAsyncBlobStore; import org.jclouds.openstack.swift.blobstore.SwiftBlobStore; import org.jclouds.openstack.swift.blobstore.config.SwiftBlobStoreContextModule; @@ -47,8 +48,6 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.inject.Provides; -import org.jclouds.logging.Logger; - /** * * @author Adrian Cole diff --git a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/KeystoneFixture.java b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/KeystoneFixture.java index 3811ea6a9c..45a5f393f8 100644 --- a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/KeystoneFixture.java +++ b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/KeystoneFixture.java @@ -18,19 +18,20 @@ */ package org.jclouds.hpcloud.objectstorage.internal; -import com.google.common.base.Throwables; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.net.HttpHeaders; +import static java.lang.String.format; +import static org.jclouds.rest.BaseRestClientExpectTest.payloadFromStringWithContentType; + +import java.io.IOException; +import java.net.URI; + import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; import org.jclouds.io.Payload; import org.jclouds.util.Strings2; -import java.io.IOException; -import java.net.URI; - -import static java.lang.String.format; -import static org.jclouds.rest.BaseRestClientExpectTest.payloadFromStringWithContentType; +import com.google.common.base.Throwables; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.net.HttpHeaders; /** * Base class for writing HP Cloud Object Storage Rest Client Expect tests diff --git a/providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java b/providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java index 3ad6c360ae..c7cbc4ecd8 100644 --- a/providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java +++ b/providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java @@ -18,13 +18,13 @@ */ package org.jclouds.ninefold.compute; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Ninefold * Compute. diff --git a/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java b/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java index fe9a2a95eb..5658f5be07 100644 --- a/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java +++ b/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java @@ -18,13 +18,13 @@ */ package org.jclouds.ninefold.storage; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Ninefold's * Storage provider. diff --git a/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java b/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java index aae3250faf..fabc13cb88 100644 --- a/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java +++ b/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java @@ -18,13 +18,13 @@ */ package org.jclouds.openhosting; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for OpenHosting's * East1 provider. diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingProviderMetadata.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingProviderMetadata.java index a9eb6cb1b8..7c62d4c890 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingProviderMetadata.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.rimuhosting.miro; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for RimuHosting. * diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CreateOptions.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CreateOptions.java index 1a8a392c9e..3d3fd34ce5 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CreateOptions.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/CreateOptions.java @@ -18,9 +18,10 @@ */ package org.jclouds.rimuhosting.miro.data; -import com.google.gson.annotations.SerializedName; import org.jclouds.rimuhosting.miro.domain.Image; +import com.google.gson.annotations.SerializedName; + /** * Some options we need to create a new server/VPS. * diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java index 260affa969..762cdb8152 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/data/NewServerData.java @@ -20,11 +20,11 @@ package org.jclouds.rimuhosting.miro.data; import java.util.List; -import com.google.gson.annotations.SerializedName; - import org.jclouds.rimuhosting.miro.domain.MetaData; -import org.jclouds.rimuhosting.miro.domain.ServerParameters; import org.jclouds.rimuhosting.miro.domain.PricingPlan; +import org.jclouds.rimuhosting.miro.domain.ServerParameters; + +import com.google.gson.annotations.SerializedName; /** * This structure defines the VPS to be setup. diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/BillingData.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/BillingData.java index d826a8cd22..86d5013358 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/BillingData.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/BillingData.java @@ -18,10 +18,10 @@ */ package org.jclouds.rimuhosting.miro.domain; -import com.google.gson.annotations.SerializedName; - import java.sql.Timestamp; +import com.google.gson.annotations.SerializedName; + /** * Billing data. Need to make it inteface with jclouds. * TODO: test diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/IpAddresses.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/IpAddresses.java index 253ff7f579..a5c4cf16b8 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/IpAddresses.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/IpAddresses.java @@ -18,10 +18,10 @@ */ package org.jclouds.rimuhosting.miro.domain; -import com.google.gson.annotations.SerializedName; - import java.util.SortedSet; +import com.google.gson.annotations.SerializedName; + /** * IpAddresses assigned to an Interface. Not rimuhosting doesnt have private IPs. * diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/NewServerResponse.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/NewServerResponse.java index 93442f5158..b3600fd835 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/NewServerResponse.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/NewServerResponse.java @@ -18,9 +18,10 @@ */ package org.jclouds.rimuhosting.miro.domain; -import com.google.gson.annotations.SerializedName; import org.jclouds.rimuhosting.miro.data.NewServerData; +import com.google.gson.annotations.SerializedName; + /** * Wrapper object to get back all data from a Instance create. The Password has been populated the NewInstance * object. diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/PricingPlan.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/PricingPlan.java index ebe84dc004..8cda738b90 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/PricingPlan.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/PricingPlan.java @@ -18,9 +18,10 @@ */ package org.jclouds.rimuhosting.miro.domain; -import com.google.gson.annotations.SerializedName; import org.jclouds.rimuhosting.miro.domain.internal.ServerType; +import com.google.gson.annotations.SerializedName; + /** * @author Ivan Meredith */ diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java index cd99e2bdb0..a8e47892fc 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ResizeResult.java @@ -18,10 +18,10 @@ */ package org.jclouds.rimuhosting.miro.domain; -import com.google.gson.annotations.SerializedName; - import java.util.List; +import com.google.gson.annotations.SerializedName; + /** * Information about a resource change. */ diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Server.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Server.java index d350c6af0f..a5cf1f6b40 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Server.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/Server.java @@ -20,10 +20,11 @@ package org.jclouds.rimuhosting.miro.domain; import java.util.List; -import com.google.gson.annotations.SerializedName; import org.jclouds.rimuhosting.miro.data.NewServerData; import org.jclouds.rimuhosting.miro.domain.internal.RunningState; +import com.google.gson.annotations.SerializedName; + /** * Instance Object. * TODO: javadoc diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerInfo.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerInfo.java index f50ba8a1c4..95d4bcbfc7 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerInfo.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerInfo.java @@ -18,10 +18,11 @@ */ package org.jclouds.rimuhosting.miro.domain; -import com.google.gson.annotations.SerializedName; import org.jclouds.rimuhosting.miro.domain.internal.RimuHostingTimestamp; import org.jclouds.rimuhosting.miro.domain.internal.RunningState; +import com.google.gson.annotations.SerializedName; + /** * @author Ivan Meredith */ diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerParameters.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerParameters.java index 9b7da57ac8..3743856b26 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerParameters.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/domain/ServerParameters.java @@ -18,9 +18,10 @@ */ package org.jclouds.rimuhosting.miro.domain; -import com.google.gson.annotations.SerializedName; import org.jclouds.rimuhosting.miro.data.PostData; +import com.google.gson.annotations.SerializedName; + /** * Attributes about a running VPS.  Implicit with any changes to * these attributes on a VPS is that we'd need to restart the VPS for diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/location/RimuHostingLocationSupplier.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/location/RimuHostingLocationSupplier.java index dd10add093..f2b8b3c1c6 100644 --- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/location/RimuHostingLocationSupplier.java +++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/location/RimuHostingLocationSupplier.java @@ -42,8 +42,8 @@ import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.common.collect.ImmutableSet.Builder; +import com.google.common.collect.Iterables; /** * diff --git a/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java b/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java index 0f8ebfdbd8..d92ef04d27 100644 --- a/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java +++ b/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.serverlove; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Serverlove Manchester. * diff --git a/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java b/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java index c6d9423c0b..34563dc11f 100644 --- a/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java +++ b/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.skalicloud; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for SkaliCloud Malaysia. * diff --git a/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java index 03aa1b41c7..d6b7ad4b13 100644 --- a/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java +++ b/providers/slicehost/src/main/java/org/jclouds/slicehost/xml/SliceHandler.java @@ -20,9 +20,8 @@ package org.jclouds.slicehost.xml; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.http.functions.ParseSax; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.slicehost.domain.Slice; import org.jclouds.slicehost.domain.Slice.Status; import org.xml.sax.SAXException; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java index 7afeec1a51..46c7377f2c 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.softlayer; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@ link org.jclouds.types.ProviderMetadata} for SoftLayer. * diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java index 19fa5b3b33..57a447670b 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java @@ -18,11 +18,12 @@ */ package org.jclouds.softlayer.binders; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.util.Set; + +import javax.inject.Inject; + import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; import org.jclouds.rest.Binder; @@ -30,10 +31,11 @@ import org.jclouds.softlayer.domain.ProductItemPrice; import org.jclouds.softlayer.domain.ProductOrder; import org.jclouds.softlayer.domain.VirtualGuest; -import javax.inject.Inject; -import java.util.Set; - -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; /** * Converts a ProductOrder into a json string valid for placing an order via the softlayer api The diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java index c7ee4fbb93..fcb5b1f740 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/DatacenterToLocation.java @@ -19,10 +19,10 @@ package org.jclouds.softlayer.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Strings.nullToEmpty; import javax.inject.Inject; -import static com.google.common.base.Strings.nullToEmpty; import org.jclouds.domain.Location; import org.jclouds.domain.LocationBuilder; import org.jclouds.domain.LocationScope; diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItems.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItems.java index da9546c27a..64baedcc1c 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItems.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItems.java @@ -18,14 +18,15 @@ */ package org.jclouds.softlayer.compute.functions; -import com.google.common.base.Function; -import com.google.common.collect.Iterables; +import java.util.NoSuchElementException; +import java.util.Set; + import org.jclouds.softlayer.domain.ProductItem; import org.jclouds.softlayer.domain.ProductItemCategory; import org.jclouds.softlayer.domain.ProductItemPrice; -import java.util.NoSuchElementException; -import java.util.Set; +import com.google.common.base.Function; +import com.google.common.collect.Iterables; public class ProductItems { diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java index ce53178ea1..2994cf1a53 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java @@ -18,8 +18,8 @@ */ package org.jclouds.softlayer.domain; -import static com.google.common.base.Strings.emptyToNull; import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Strings.emptyToNull; /** * diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java index 496516712b..c35d3726fd 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java @@ -18,12 +18,12 @@ */ package org.jclouds.softlayer.domain; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; /** * diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java index 0b10bee531..00a5927b86 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java @@ -18,12 +18,12 @@ */ package org.jclouds.softlayer.domain; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; /** * Extends the SoftLayer_Software_Component data type to include operating system specific properties. diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java index 36684b95cf..a6bb0b907a 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java @@ -18,13 +18,14 @@ */ package org.jclouds.softlayer.domain; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; -import org.jclouds.javax.annotation.Nullable; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; +import org.jclouds.javax.annotation.Nullable; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; /** * The SoftLayer_Product_Item data type contains general information relating to diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java index 33f736d560..36ae4b12c1 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java @@ -18,13 +18,14 @@ */ package org.jclouds.softlayer.domain; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; -import org.jclouds.javax.annotation.Nullable; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; +import org.jclouds.javax.annotation.Nullable; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; /** * The SoftLayer_Product_Item_Price data type contains general information diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductPackage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductPackage.java index c9ff9d4068..f44ac60436 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductPackage.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductPackage.java @@ -18,12 +18,12 @@ */ package org.jclouds.softlayer.domain; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; /** * The SoftLayer_Product_Package data type contains information about packages diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java index f44233f64b..a35a2098a1 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java @@ -18,12 +18,12 @@ */ package org.jclouds.softlayer.domain; -import com.google.common.base.CaseFormat; -import com.google.gson.annotations.SerializedName; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.CaseFormat; +import com.google.gson.annotations.SerializedName; /** * The virtual guest data type presents the structure in which all virtual guests will be presented. diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java index 13e9562503..96be276b4f 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountAsyncClient.java @@ -18,18 +18,20 @@ */ package org.jclouds.softlayer.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.Path; +import javax.ws.rs.core.MediaType; + import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.softlayer.domain.ProductPackage; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import java.util.Set; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to Account via their REST API. diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java index 4d367f818a..8933ca0dec 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountClient.java @@ -18,12 +18,12 @@ */ package org.jclouds.softlayer.features; -import org.jclouds.concurrent.Timeout; -import org.jclouds.softlayer.domain.ProductPackage; - import java.util.Set; import java.util.concurrent.TimeUnit; +import org.jclouds.concurrent.Timeout; +import org.jclouds.softlayer.domain.ProductPackage; + /** * Provides synchronous access to Account. *

diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java index 363cba9589..25157578b4 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/ProductPackageAsyncClient.java @@ -18,7 +18,12 @@ */ package org.jclouds.softlayer.features; -import com.google.common.util.concurrent.ListenableFuture; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.core.MediaType; + import org.jclouds.http.filters.BasicAuthentication; import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.QueryParams; @@ -26,11 +31,7 @@ import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.softlayer.domain.ProductPackage; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.MediaType; +import com.google.common.util.concurrent.ListenableFuture; /** * Provides asynchronous access to ProductPackage via their REST API. diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java index 928bdb3850..bbd5e40f08 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/VirtualGuestClient.java @@ -18,14 +18,14 @@ */ package org.jclouds.softlayer.features; +import java.util.Set; +import java.util.concurrent.TimeUnit; + import org.jclouds.concurrent.Timeout; import org.jclouds.softlayer.domain.ProductOrder; import org.jclouds.softlayer.domain.ProductOrderReceipt; import org.jclouds.softlayer.domain.VirtualGuest; -import java.util.Set; -import java.util.concurrent.TimeUnit; - /** * Provides synchronous access to VirtualGuest. *

diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductItemPredicates.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductItemPredicates.java index 23850557b6..c453e25d6c 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductItemPredicates.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductItemPredicates.java @@ -18,13 +18,14 @@ */ package org.jclouds.softlayer.predicates; -import com.google.common.base.Predicate; -import org.jclouds.softlayer.domain.ProductItem; -import org.jclouds.softlayer.domain.ProductItemCategory; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.regex.Pattern; -import static com.google.common.base.Preconditions.checkNotNull; +import org.jclouds.softlayer.domain.ProductItem; +import org.jclouds.softlayer.domain.ProductItemCategory; + +import com.google.common.base.Predicate; public class ProductItemPredicates { diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductPackagePredicates.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductPackagePredicates.java index e97a3b2df9..d2056aab87 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductPackagePredicates.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/predicates/ProductPackagePredicates.java @@ -18,10 +18,11 @@ */ package org.jclouds.softlayer.predicates; -import com.google.common.base.Predicate; +import static com.google.common.base.Preconditions.checkNotNull; + import org.jclouds.softlayer.domain.ProductPackage; -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.Predicate; public class ProductPackagePredicates { diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/binders/ProductOrderToJsonTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/binders/ProductOrderToJsonTest.java index e847b0b7ce..6754594921 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/binders/ProductOrderToJsonTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/binders/ProductOrderToJsonTest.java @@ -18,8 +18,10 @@ */ package org.jclouds.softlayer.binders; -import com.google.common.collect.ImmutableSet; -import com.google.gson.Gson; +import static org.testng.Assert.assertEquals; + +import java.net.URI; + import org.jclouds.http.HttpRequest; import org.jclouds.json.Json; import org.jclouds.json.internal.GsonWrapper; @@ -30,9 +32,8 @@ import org.jclouds.softlayer.domain.VirtualGuest; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -import java.net.URI; - -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableSet; +import com.google.gson.Gson; /** * Tests behavior of {@code ProductOrderToJsonTest} diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemToImageTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemToImageTest.java index 17c9fcb009..94bd1f4550 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemToImageTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemToImageTest.java @@ -18,7 +18,19 @@ */ package org.jclouds.softlayer.compute.functions; -import com.google.common.collect.ImmutableSet; +import static org.jclouds.softlayer.compute.functions.ProductItemToImage.imageId; +import static org.jclouds.softlayer.compute.functions.ProductItemToImage.osBits; +import static org.jclouds.softlayer.compute.functions.ProductItemToImage.osFamily; +import static org.jclouds.softlayer.compute.functions.ProductItemToImage.osVersion; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertNotNull; +import static org.testng.AssertJUnit.assertTrue; + +import java.util.Arrays; +import java.util.List; +import java.util.NoSuchElementException; + import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.OperatingSystem; import org.jclouds.compute.domain.OsFamily; @@ -26,12 +38,7 @@ import org.jclouds.softlayer.domain.ProductItem; import org.jclouds.softlayer.domain.ProductItemPrice; import org.testng.annotations.Test; -import java.util.Arrays; -import java.util.List; -import java.util.NoSuchElementException; - -import static org.jclouds.softlayer.compute.functions.ProductItemToImage.*; -import static org.testng.AssertJUnit.*; +import com.google.common.collect.ImmutableSet; /** * Tests {@code ProductItemToImage} diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsTest.java index 85420df25d..98140bd700 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsTest.java @@ -18,18 +18,22 @@ */ package org.jclouds.softlayer.compute.functions; -import com.google.common.collect.ImmutableSet; +import static org.jclouds.softlayer.compute.functions.ProductItems.capacity; +import static org.jclouds.softlayer.compute.functions.ProductItems.description; +import static org.jclouds.softlayer.compute.functions.ProductItems.item; +import static org.jclouds.softlayer.compute.functions.ProductItems.price; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; + +import java.util.NoSuchElementException; + import org.jclouds.softlayer.domain.ProductItem; import org.jclouds.softlayer.domain.ProductItemCategory; import org.jclouds.softlayer.domain.ProductItemPrice; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.NoSuchElementException; - -import static org.jclouds.softlayer.compute.functions.ProductItems.*; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; +import com.google.common.collect.ImmutableSet; /** * Tests {@code ProductItems} diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java index 6e714b33b1..450ba1d802 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java @@ -18,10 +18,13 @@ */ package org.jclouds.softlayer.compute.functions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; +import static com.google.inject.name.Names.bindProperties; +import static org.jclouds.softlayer.compute.functions.ProductItemsToHardware.hardwareId; +import static org.testng.AssertJUnit.assertEquals; + +import java.util.List; +import java.util.Properties; + import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.Processor; import org.jclouds.compute.domain.Volume; @@ -32,12 +35,10 @@ import org.jclouds.softlayer.domain.ProductItemPrice; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.List; -import java.util.Properties; - -import static com.google.inject.name.Names.bindProperties; -import static org.jclouds.softlayer.compute.functions.ProductItemsToHardware.hardwareId; -import static org.testng.AssertJUnit.assertEquals; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; /** * Tests {@code ProductItemsToHardware} diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java index 94eb341b4d..63dd1472e0 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java @@ -18,7 +18,7 @@ */ package org.jclouds.softlayer.compute.functions; -import static org.easymock.classextension.EasyMock.createNiceMock; +import static org.easymock.EasyMock.createNiceMock; import static org.testng.Assert.assertEquals; import java.util.Set; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountAsyncClientTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountAsyncClientTest.java index 020d144dff..32cd272e7c 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountAsyncClientTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountAsyncClientTest.java @@ -18,15 +18,16 @@ */ package org.jclouds.softlayer.features; -import com.google.inject.TypeLiteral; +import java.io.IOException; +import java.lang.reflect.Method; + import org.jclouds.http.HttpRequest; import org.jclouds.http.functions.ParseJson; import org.jclouds.rest.functions.ReturnNullOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; +import com.google.inject.TypeLiteral; /** * Tests annotation parsing of {@code AccountAsyncClient} diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountClientLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountClientLiveTest.java index 389caa0e6a..10bf050c84 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountClientLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountClientLiveTest.java @@ -18,13 +18,13 @@ */ package org.jclouds.softlayer.features; -import org.jclouds.softlayer.domain.ProductPackage; -import org.testng.annotations.BeforeGroups; -import org.testng.annotations.Test; +import static org.testng.Assert.assertTrue; import java.util.Set; -import static org.testng.Assert.assertTrue; +import org.jclouds.softlayer.domain.ProductPackage; +import org.testng.annotations.BeforeGroups; +import org.testng.annotations.Test; /** * Tests behavior of {@code AccountClient} diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java index f238904f01..41db69da16 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestClientLiveTest.java @@ -42,9 +42,9 @@ import org.testng.annotations.Test; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import com.google.common.collect.ImmutableSet.Builder; import com.google.inject.Guice; import com.google.inject.Key; import com.google.inject.TypeLiteral; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandlerTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandlerTest.java index 1a083a51bf..2d13b0088b 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandlerTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandlerTest.java @@ -18,11 +18,11 @@ */ package org.jclouds.softlayer.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.classextension.EasyMock.replay; -import static org.easymock.classextension.EasyMock.verify; +import static org.easymock.EasyMock.verify; import java.net.URI; @@ -33,7 +33,6 @@ import org.jclouds.http.HttpResponse; import org.jclouds.io.Payloads; import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.ResourceNotFoundException; -import org.jclouds.softlayer.handlers.SoftLayerErrorHandler; import org.jclouds.util.Strings2; import org.testng.annotations.Test; diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestPausedTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestPausedTest.java index eef35087bc..6cfe06bc25 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestPausedTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/parse/ParseVirtualGuestPausedTest.java @@ -18,17 +18,22 @@ */ package org.jclouds.softlayer.parse; -import com.google.inject.Guice; -import com.google.inject.Injector; +import javax.ws.rs.Consumes; +import javax.ws.rs.core.MediaType; + import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.json.BaseItemParserTest; import org.jclouds.json.config.GsonModule; import org.jclouds.softlayer.config.SoftLayerParserModule; -import org.jclouds.softlayer.domain.*; +import org.jclouds.softlayer.domain.Datacenter; +import org.jclouds.softlayer.domain.OperatingSystem; +import org.jclouds.softlayer.domain.Password; +import org.jclouds.softlayer.domain.PowerState; +import org.jclouds.softlayer.domain.VirtualGuest; import org.testng.annotations.Test; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; +import com.google.inject.Guice; +import com.google.inject.Injector; /** * diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductPackagePredicatesTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductPackagePredicatesTest.java index 5f72ebbd2d..ed3772516b 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductPackagePredicatesTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/predicates/ProductPackagePredicatesTest.java @@ -18,10 +18,11 @@ */ package org.jclouds.softlayer.predicates; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + import org.jclouds.softlayer.domain.ProductPackage; import org.testng.annotations.Test; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertFalse; /** * Tests {@code ProductPackagePredicates} diff --git a/providers/stratogen-vcloud-mycloud/src/main/java/org/jclouds/stratogen/vcloud/mycloud/StratoGenVCloudMyCloudProviderMetadata.java b/providers/stratogen-vcloud-mycloud/src/main/java/org/jclouds/stratogen/vcloud/mycloud/StratoGenVCloudMyCloudProviderMetadata.java index 5b83327842..6ff8beb185 100644 --- a/providers/stratogen-vcloud-mycloud/src/main/java/org/jclouds/stratogen/vcloud/mycloud/StratoGenVCloudMyCloudProviderMetadata.java +++ b/providers/stratogen-vcloud-mycloud/src/main/java/org/jclouds/stratogen/vcloud/mycloud/StratoGenVCloudMyCloudProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.stratogen.vcloud.mycloud; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for StratoGen VMware hosting * diff --git a/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java b/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java index 080aeac93d..019c59d28b 100644 --- a/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java +++ b/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.synaptic.storage; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for AT&T's * Synaptic Storage provider. diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncClient.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncClient.java index 5d9c214366..c948182d42 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncClient.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudAsyncClient.java @@ -31,7 +31,6 @@ import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.ORG_XML; import java.net.URI; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -39,6 +38,7 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudClient.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudClient.java index ff5a32aa5d..91dbb63f08 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudClient.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudClient.java @@ -22,9 +22,8 @@ import java.net.URI; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.concurrent.Timeout; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.Delegate; import org.jclouds.trmk.ecloud.domain.ECloudOrg; import org.jclouds.trmk.ecloud.features.DataCenterOperationsClient; diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java index 612b282753..c69ce2766f 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.trmk.ecloud; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Terremark's Enterprise Cloud. * diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClient.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClient.java index 1843d15f71..765576cf27 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClient.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClient.java @@ -18,12 +18,14 @@ */ package org.jclouds.trmk.ecloud.features; +import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.DATACENTERSLIST_XML; + import java.net.URI; import java.util.Set; + import javax.ws.rs.Consumes; import javax.ws.rs.GET; -import com.google.common.util.concurrent.ListenableFuture; import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; @@ -36,7 +38,7 @@ import org.jclouds.trmk.vcloud_0_8.domain.KeyPair; import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie; import org.jclouds.trmk.vcloud_0_8.xml.DataCentersHandler; -import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.DATACENTERSLIST_XML; +import com.google.common.util.concurrent.ListenableFuture; /** * diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClient.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClient.java index 5a21819604..9672ff545c 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClient.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClient.java @@ -18,12 +18,14 @@ */ package org.jclouds.trmk.ecloud.features; +import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.TAGSLISTLIST_XML; + import java.net.URI; import java.util.Map; + import javax.ws.rs.Consumes; import javax.ws.rs.GET; -import com.google.common.util.concurrent.ListenableFuture; import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; @@ -34,7 +36,7 @@ import org.jclouds.trmk.ecloud.functions.OrgURIToTagsListEndpoint; import org.jclouds.trmk.ecloud.xml.TagNameToUsageCountHandler; import org.jclouds.trmk.vcloud_0_8.filters.SetVCloudTokenCookie; -import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.TAGSLISTLIST_XML; +import com.google.common.util.concurrent.ListenableFuture; /** * diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/suppliers/TerremarkECloudInternetServiceAndPublicIpAddressSupplier.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/suppliers/TerremarkECloudInternetServiceAndPublicIpAddressSupplier.java index c7472ccc7c..510e119355 100644 --- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/suppliers/TerremarkECloudInternetServiceAndPublicIpAddressSupplier.java +++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/suppliers/TerremarkECloudInternetServiceAndPublicIpAddressSupplier.java @@ -21,8 +21,8 @@ package org.jclouds.trmk.ecloud.suppliers; import static org.jclouds.trmk.vcloud_0_8.options.AddInternetServiceOptions.Builder.withDescription; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import javax.annotation.Resource; import javax.inject.Inject; diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientLiveTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientLiveTest.java index fcb7080b36..2baf7112a5 100644 --- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientLiveTest.java +++ b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientLiveTest.java @@ -18,8 +18,8 @@ */ package org.jclouds.trmk.ecloud; -import java.util.Properties; import java.util.Map.Entry; +import java.util.Properties; import org.jclouds.domain.LoginCredentials; import org.jclouds.net.IPSocket; diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderTest.java index 8ba1e55a6d..5b9b07b04b 100644 --- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderTest.java +++ b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderTest.java @@ -20,7 +20,6 @@ package org.jclouds.trmk.ecloud; import org.jclouds.providers.BaseProviderMetadataTest; import org.jclouds.providers.ProviderMetadata; -import org.jclouds.trmk.ecloud.TerremarkECloudProviderMetadata; import org.testng.annotations.Test; /** diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClientTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClientTest.java index bde7a0adcf..94449f783d 100644 --- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClientTest.java +++ b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/DataCenterOperationsAsyncClientTest.java @@ -27,7 +27,6 @@ import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.functions.ReturnEmptySetOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.jclouds.trmk.ecloud.BaseTerremarkECloudAsyncClientTest; -import org.jclouds.trmk.ecloud.features.DataCenterOperationsAsyncClient; import org.jclouds.trmk.vcloud_0_8.xml.DataCentersHandler; import org.testng.annotations.Test; diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClientTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClientTest.java index a2da786b10..5bd500d9a5 100644 --- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClientTest.java +++ b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/features/TagOperationsAsyncClientTest.java @@ -27,7 +27,6 @@ import org.jclouds.http.functions.ParseSax; import org.jclouds.rest.functions.ReturnEmptyMapOnNotFoundOr404; import org.jclouds.rest.internal.RestAnnotationProcessor; import org.jclouds.trmk.ecloud.BaseTerremarkECloudAsyncClientTest; -import org.jclouds.trmk.ecloud.features.TagOperationsAsyncClient; import org.jclouds.trmk.ecloud.xml.TagNameToUsageCountHandler; import org.testng.annotations.Test; diff --git a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandlerTest.java b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandlerTest.java index 6c3a5a11f6..3ac18c4204 100644 --- a/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandlerTest.java +++ b/providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/xml/TagNameToUsageCountHandlerTest.java @@ -28,7 +28,6 @@ import java.util.Properties; import org.jclouds.http.functions.BaseHandlerTest; import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.config.SaxParserModule; -import org.jclouds.trmk.ecloud.xml.TagNameToUsageCountHandler; import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudPropertiesBuilder; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncClient.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncClient.java index 1e36377c6f..7ba08725b2 100644 --- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncClient.java +++ b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressAsyncClient.java @@ -25,13 +25,13 @@ import static org.jclouds.trmk.vcloudexpress.TerremarkVCloudExpressMediaType.KEY import java.net.URI; import java.util.Set; -import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Produces; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.ExceptionParser; import org.jclouds.rest.annotations.MapBinder; diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java index 826b0ae8c3..8cc2cad297 100644 --- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java +++ b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java @@ -18,14 +18,14 @@ */ package org.jclouds.trmk.vcloudexpress; -import com.google.common.collect.ImmutableSet; - import java.net.URI; import java.util.Set; import org.jclouds.providers.BaseProviderMetadata; import org.jclouds.providers.ProviderMetadata; +import com.google.common.collect.ImmutableSet; + /** * Implementation of {@link org.jclouds.types.ProviderMetadata} for Terremark's vCloud Express. * diff --git a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderTest.java b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderTest.java index 44a6abfedb..8a396e8f51 100644 --- a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderTest.java +++ b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderTest.java @@ -20,7 +20,6 @@ package org.jclouds.trmk.vcloudexpress; import org.jclouds.providers.BaseProviderMetadataTest; import org.jclouds.providers.ProviderMetadata; -import org.jclouds.trmk.vcloudexpress.TerremarkVCloudExpressProviderMetadata; import org.testng.annotations.Test; /** diff --git a/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaContextBuilder.java b/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaContextBuilder.java index 2bc46278fa..55b8b77108 100644 --- a/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaContextBuilder.java +++ b/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaContextBuilder.java @@ -21,8 +21,8 @@ package org.jclouds.trystack.nova; import java.util.List; import java.util.Properties; -import org.jclouds.trystack.nova.config.TryStackNovaServiceContextModule; import org.jclouds.openstack.nova.v1_1.NovaContextBuilder; +import org.jclouds.trystack.nova.config.TryStackNovaServiceContextModule; import com.google.inject.Module; diff --git a/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaServiceAdapter.java b/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaServiceAdapter.java index 052e6997b7..7fe188d766 100644 --- a/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaServiceAdapter.java +++ b/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaServiceAdapter.java @@ -4,18 +4,18 @@ import java.util.Set; import javax.inject.Inject; -import com.google.common.cache.LoadingCache; import org.jclouds.location.Zone; import org.jclouds.openstack.nova.v1_1.NovaClient; import org.jclouds.openstack.nova.v1_1.compute.NovaComputeServiceAdapter; import org.jclouds.openstack.nova.v1_1.compute.functions.RemoveFloatingIpFromNodeAndDeallocate; import org.jclouds.openstack.nova.v1_1.domain.KeyPair; import org.jclouds.openstack.nova.v1_1.domain.zonescoped.ImageInZone; +import org.jclouds.openstack.nova.v1_1.domain.zonescoped.ZoneAndName; import com.google.common.base.Predicate; import com.google.common.base.Supplier; +import com.google.common.cache.LoadingCache; import com.google.common.collect.Iterables; -import org.jclouds.openstack.nova.v1_1.domain.zonescoped.ZoneAndName; /** * diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functions/CredentialsFromAdminAccess.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functions/CredentialsFromAdminAccess.java index 266685409b..33aff4f430 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functions/CredentialsFromAdminAccess.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functions/CredentialsFromAdminAccess.java @@ -20,9 +20,8 @@ package org.jclouds.scriptbuilder.functions; import java.util.concurrent.atomic.AtomicReference; -import org.jclouds.javax.annotation.Nullable; - import org.jclouds.domain.Credentials; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.scriptbuilder.domain.AcceptsStatementVisitor; import org.jclouds.scriptbuilder.domain.Statement; import org.jclouds.scriptbuilder.domain.StatementVisitor; diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/Sudoers.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/Sudoers.java index 6e2bab2ecf..12c9840235 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/Sudoers.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/Sudoers.java @@ -28,8 +28,8 @@ import org.jclouds.scriptbuilder.domain.StatementList; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableList.Builder; +import com.google.common.collect.ImmutableSet; /** * Control /etc/sudoers diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java index 6621263abd..20acff8053 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java @@ -22,10 +22,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; -import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import org.jclouds.crypto.Sha512Crypt; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.scriptbuilder.domain.OsFamily; import org.jclouds.scriptbuilder.domain.Statement; import org.jclouds.scriptbuilder.domain.StatementList; diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/util/Utils.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/util/Utils.java index 031e507ddd..4f11529088 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/util/Utils.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/util/Utils.java @@ -27,6 +27,7 @@ import java.util.regex.Pattern; import org.jclouds.scriptbuilder.domain.OsFamily; import org.jclouds.scriptbuilder.domain.ShellToken; +import org.jclouds.util.ClassLoadingUtils; import com.google.common.base.CaseFormat; import com.google.common.base.Charsets; @@ -36,7 +37,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.io.CharStreams; import com.google.common.io.Resources; -import org.jclouds.util.ClassLoadingUtils; /** * Utilities used to build init scripts. diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/EnvBuilderTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/EnvBuilderTest.java index 3cdd69559b..9b3b9bbd51 100644 --- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/EnvBuilderTest.java +++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/EnvBuilderTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.assertEquals; import java.io.IOException; import java.net.MalformedURLException; -import org.jclouds.scriptbuilder.EnvBuilder; import org.jclouds.scriptbuilder.domain.OsFamily; import org.jclouds.scriptbuilder.domain.ShellToken; import org.testng.annotations.Test; diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/CreateRunScriptTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/CreateRunScriptTest.java index f984e974be..46050e87c7 100644 --- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/CreateRunScriptTest.java +++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/CreateRunScriptTest.java @@ -18,9 +18,9 @@ */ package org.jclouds.scriptbuilder.domain; -import static org.jclouds.scriptbuilder.domain.Statements.exec; import static org.jclouds.scriptbuilder.domain.Statements.appendFile; import static org.jclouds.scriptbuilder.domain.Statements.createRunScript; +import static org.jclouds.scriptbuilder.domain.Statements.exec; import static org.testng.Assert.assertEquals; import java.io.IOException; diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/ShellTokenTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/ShellTokenTest.java index 5c7c6cbf6a..3233d77da2 100644 --- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/ShellTokenTest.java +++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/ShellTokenTest.java @@ -22,8 +22,6 @@ import static org.testng.Assert.assertEquals; import java.util.Map; -import org.jclouds.scriptbuilder.domain.OsFamily; -import org.jclouds.scriptbuilder.domain.ShellToken; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/StatementListTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/StatementListTest.java index 79c7e665b8..b9c762fe45 100644 --- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/StatementListTest.java +++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/StatementListTest.java @@ -18,7 +18,9 @@ */ package org.jclouds.scriptbuilder.domain; -import static org.jclouds.scriptbuilder.domain.Statements.*; +import static org.jclouds.scriptbuilder.domain.Statements.call; +import static org.jclouds.scriptbuilder.domain.Statements.interpret; +import static org.jclouds.scriptbuilder.domain.Statements.newStatementList; import static org.testng.Assert.assertEquals; import org.testng.annotations.Test; diff --git a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/SshStatementsTest.java b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/SshStatementsTest.java index bf9a628518..7e2ddb9c89 100644 --- a/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/SshStatementsTest.java +++ b/scriptbuilder/src/test/java/org/jclouds/scriptbuilder/statements/ssh/SshStatementsTest.java @@ -21,7 +21,6 @@ package org.jclouds.scriptbuilder.statements.ssh; import static org.testng.Assert.assertEquals; import org.jclouds.scriptbuilder.domain.OsFamily; -import org.jclouds.scriptbuilder.statements.ssh.SshStatements; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap;