From 87dd23551c4d9b727540d9bd333ffd9a1136e58a Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Fri, 16 Sep 2011 17:52:12 +0200 Subject: [PATCH] Avoid using a non official jsr and use our own annotations --- .../jclouds/tools/ant/taskdefs/compute/ComputeTask.java | 2 +- .../main/java/org/jclouds/atmos/domain/AtmosObject.java | 2 +- .../main/java/org/jclouds/atmos/domain/BoundedSet.java | 2 +- .../java/org/jclouds/atmos/domain/SystemMetadata.java | 2 +- .../atmos/domain/internal/BoundedLinkedHashSet.java | 2 +- .../atmos/functions/ReturnEndpointIfAlreadyExists.java | 2 +- .../cloudservers/options/CreateSharedIpGroupOptions.java | 2 +- .../main/java/org/jclouds/deltacloud/domain/Image.java | 2 +- .../main/java/org/jclouds/deltacloud/domain/Instance.java | 2 +- .../main/java/org/jclouds/deltacloud/domain/Realm.java | 2 +- .../jclouds/deltacloud/xml/HardwarePropertyHandler.java | 2 +- .../jclouds/ec2/compute/options/EC2TemplateOptions.java | 2 +- ...yPairAndSecurityGroupsAsNeededAndReturnRunOptions.java | 2 +- .../java/org/jclouds/ec2/domain/BlockDeviceMapping.java | 2 +- .../org/jclouds/ec2/domain/BundleInstanceS3Storage.java | 2 +- .../src/main/java/org/jclouds/ec2/domain/BundleTask.java | 2 +- apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java | 2 +- .../ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java | 2 +- .../org/jclouds/ec2/domain/PublicIpInstanceIdPair.java | 2 +- .../src/main/java/org/jclouds/ec2/domain/Reservation.java | 2 +- .../main/java/org/jclouds/ec2/domain/RunningInstance.java | 2 +- .../main/java/org/jclouds/ec2/domain/SecurityGroup.java | 6 +++--- apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java | 2 +- .../ec2/options/RegisterImageBackedByEbsOptions.java | 2 +- .../java/org/jclouds/ec2/services/AMIAsyncClient.java | 2 +- .../src/main/java/org/jclouds/ec2/services/AMIClient.java | 2 +- .../services/AvailabilityZoneAndRegionAsyncClient.java | 2 +- .../ec2/services/AvailabilityZoneAndRegionClient.java | 2 +- .../ec2/services/ElasticBlockStoreAsyncClient.java | 2 +- .../org/jclouds/ec2/services/ElasticBlockStoreClient.java | 2 +- .../jclouds/ec2/services/ElasticIPAddressAsyncClient.java | 2 +- .../org/jclouds/ec2/services/ElasticIPAddressClient.java | 2 +- .../org/jclouds/ec2/services/InstanceAsyncClient.java | 2 +- .../java/org/jclouds/ec2/services/InstanceClient.java | 2 +- .../java/org/jclouds/ec2/services/KeyPairAsyncClient.java | 2 +- .../main/java/org/jclouds/ec2/services/KeyPairClient.java | 2 +- .../jclouds/ec2/services/SecurityGroupAsyncClient.java | 8 ++++---- .../org/jclouds/ec2/services/SecurityGroupClient.java | 2 +- .../java/org/jclouds/ec2/services/WindowsAsyncClient.java | 2 +- .../main/java/org/jclouds/ec2/services/WindowsClient.java | 2 +- .../functions/RunningInstanceToNodeMetadataTest.java | 2 +- .../jclouds/elasticstack/domain/CreateDriveRequest.java | 2 +- .../main/java/org/jclouds/elasticstack/domain/Drive.java | 2 +- .../java/org/jclouds/elasticstack/domain/DriveData.java | 2 +- .../java/org/jclouds/elasticstack/domain/DriveInfo.java | 2 +- .../main/java/org/jclouds/elasticstack/domain/Item.java | 2 +- .../main/java/org/jclouds/elasticstack/domain/NIC.java | 2 +- .../main/java/org/jclouds/elasticstack/domain/Server.java | 2 +- .../java/org/jclouds/elasticstack/domain/ServerInfo.java | 2 +- .../main/java/org/jclouds/elasticstack/domain/VNC.java | 2 +- .../org/jclouds/filesystem/FilesystemAsyncBlobStore.java | 2 +- .../java/org/jclouds/openstack/nova/domain/Address.java | 3 +-- apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java | 2 +- apis/s3/src/main/java/org/jclouds/s3/S3Client.java | 2 +- .../java/org/jclouds/s3/config/S3RestClientModule.java | 2 +- apis/s3/src/main/java/org/jclouds/s3/domain/S3Object.java | 2 +- .../org/jclouds/s3/functions/BindRegionToXmlPayload.java | 2 +- .../java/org/jclouds/s3/internal/StubS3AsyncClient.java | 2 +- .../org/jclouds/openstack/swift/domain/SwiftObject.java | 2 +- .../main/java/org/jclouds/vcloud/VCloudAsyncClient.java | 2 +- .../src/main/java/org/jclouds/vcloud/VCloudClient.java | 2 +- .../BindInstantiateVAppTemplateParamsToXmlPayload.java | 2 +- .../src/main/java/org/jclouds/vcloud/domain/Catalog.java | 2 +- .../java/org/jclouds/vcloud/domain/NetworkConnection.java | 2 +- .../src/main/java/org/jclouds/vcloud/domain/Org.java | 2 +- .../src/main/java/org/jclouds/vcloud/domain/Task.java | 2 +- .../src/main/java/org/jclouds/vcloud/domain/VApp.java | 2 +- .../main/java/org/jclouds/vcloud/domain/VAppTemplate.java | 2 +- .../main/java/org/jclouds/vcloud/domain/VCloudError.java | 2 +- .../src/main/java/org/jclouds/vcloud/domain/VDC.java | 2 +- .../src/main/java/org/jclouds/vcloud/domain/Vm.java | 2 +- .../org/jclouds/vcloud/domain/internal/CatalogImpl.java | 2 +- .../jclouds/vcloud/domain/internal/CatalogItemImpl.java | 2 +- .../org/jclouds/vcloud/domain/internal/ErrorImpl.java | 2 +- .../java/org/jclouds/vcloud/domain/internal/OrgImpl.java | 2 +- .../java/org/jclouds/vcloud/domain/internal/TaskImpl.java | 2 +- .../java/org/jclouds/vcloud/domain/internal/VAppImpl.java | 2 +- .../jclouds/vcloud/domain/internal/VAppTemplateImpl.java | 2 +- .../java/org/jclouds/vcloud/domain/internal/VDCImpl.java | 2 +- .../java/org/jclouds/vcloud/domain/internal/VmImpl.java | 2 +- .../org/jclouds/vcloud/domain/network/DhcpService.java | 2 +- .../java/org/jclouds/vcloud/domain/network/Features.java | 2 +- .../jclouds/vcloud/domain/network/FirewallService.java | 2 +- .../java/org/jclouds/vcloud/domain/network/IpScope.java | 2 +- .../org/jclouds/vcloud/domain/network/NatService.java | 2 +- .../org/jclouds/vcloud/domain/network/NetworkConfig.java | 2 +- .../org/jclouds/vcloud/domain/network/OrgNetwork.java | 2 +- .../vcloud/domain/network/firewall/FirewallRule.java | 2 +- .../vcloud/domain/network/internal/OrgNetworkImpl.java | 2 +- .../org/jclouds/vcloud/domain/network/nat/NatRule.java | 2 +- .../vcloud/domain/network/nat/rules/OneToOneVmRule.java | 2 +- .../jclouds/vcloud/domain/network/nat/rules/VmRule.java | 2 +- .../vcloud/domain/ovf/VCloudOperatingSystemSection.java | 2 +- .../org/jclouds/vcloud/features/CatalogAsyncClient.java | 2 +- .../java/org/jclouds/vcloud/features/CatalogClient.java | 2 +- .../org/jclouds/vcloud/features/NetworkAsyncClient.java | 2 +- .../java/org/jclouds/vcloud/features/NetworkClient.java | 2 +- .../java/org/jclouds/vcloud/features/OrgAsyncClient.java | 2 +- .../main/java/org/jclouds/vcloud/features/OrgClient.java | 2 +- .../java/org/jclouds/vcloud/features/TaskAsyncClient.java | 2 +- .../java/org/jclouds/vcloud/features/VAppAsyncClient.java | 2 +- .../main/java/org/jclouds/vcloud/features/VAppClient.java | 2 +- .../jclouds/vcloud/features/VAppTemplateAsyncClient.java | 2 +- .../org/jclouds/vcloud/features/VAppTemplateClient.java | 2 +- .../java/org/jclouds/vcloud/features/VDCAsyncClient.java | 2 +- .../main/java/org/jclouds/blobstore/AsyncBlobStore.java | 2 +- .../src/main/java/org/jclouds/blobstore/BlobStore.java | 2 +- .../org/jclouds/blobstore/BlobStoreContextFactory.java | 2 +- .../org/jclouds/blobstore/TransientAsyncBlobStore.java | 2 +- .../src/main/java/org/jclouds/blobstore/domain/Blob.java | 2 +- .../java/org/jclouds/blobstore/domain/BlobMetadata.java | 2 +- .../org/jclouds/blobstore/domain/MutableBlobMetadata.java | 2 +- .../blobstore/domain/internal/BlobMetadataImpl.java | 2 +- .../jclouds/blobstore/domain/internal/PageSetImpl.java | 2 +- .../blobstore/domain/internal/StorageMetadataImpl.java | 2 +- .../blobstore/strategy/internal/FetchBlobMetadata.java | 2 +- .../java/org/jclouds/aws/config/AWSRestClientModule.java | 2 +- .../trmk/vcloud_0_8/TerremarkVCloudAsyncClient.java | 2 +- .../jclouds/trmk/vcloud_0_8/TerremarkVCloudClient.java | 2 +- .../BindInstantiateVAppTemplateParamsToXmlPayload.java | 2 +- .../vcloud_0_8/compute/TerremarkVCloudComputeClient.java | 2 +- .../java/org/jclouds/trmk/vcloud_0_8/domain/Catalog.java | 2 +- .../org/jclouds/trmk/vcloud_0_8/domain/IpAddress.java | 2 +- .../java/org/jclouds/trmk/vcloud_0_8/domain/KeyPair.java | 2 +- .../main/java/org/jclouds/trmk/vcloud_0_8/domain/Org.java | 2 +- .../java/org/jclouds/trmk/vcloud_0_8/domain/Task.java | 2 +- .../java/org/jclouds/trmk/vcloud_0_8/domain/VApp.java | 2 +- .../org/jclouds/trmk/vcloud_0_8/domain/VCloudError.java | 2 +- .../main/java/org/jclouds/trmk/vcloud_0_8/domain/VDC.java | 2 +- .../trmk/vcloud_0_8/domain/internal/CatalogImpl.java | 2 +- .../trmk/vcloud_0_8/domain/internal/ErrorImpl.java | 7 +++---- .../jclouds/trmk/vcloud_0_8/domain/internal/OrgImpl.java | 8 +++----- .../jclouds/trmk/vcloud_0_8/domain/internal/TaskImpl.java | 7 +++---- .../trmk/vcloud_0_8/domain/internal/VAppTemplateImpl.java | 2 +- .../jclouds/trmk/vcloud_0_8/domain/internal/VDCImpl.java | 8 +++----- .../options/InstantiateVAppTemplateOptions.java | 2 +- .../jclouds/trmk/vcloud_0_8/xml/IpAddressesHandler.java | 2 +- .../org/jclouds/compute/ComputeServiceContextFactory.java | 2 +- .../org/jclouds/compute/RunScriptOnNodesException.java | 2 +- compute/src/main/java/org/jclouds/compute/Utils.java | 2 +- .../compute/config/PersistNodeCredentialsModule.java | 2 +- .../org/jclouds/compute/domain/CIMOperatingSystem.java | 2 +- .../java/org/jclouds/compute/domain/ComputeMetadata.java | 2 +- .../src/main/java/org/jclouds/compute/domain/Image.java | 2 +- .../java/org/jclouds/compute/domain/ImageBuilder.java | 2 +- .../java/org/jclouds/compute/domain/NodeMetadata.java | 2 +- .../org/jclouds/compute/domain/NodeMetadataBuilder.java | 2 +- .../java/org/jclouds/compute/domain/OperatingSystem.java | 2 +- .../src/main/java/org/jclouds/compute/domain/Volume.java | 2 +- .../java/org/jclouds/compute/domain/VolumeBuilder.java | 2 +- .../org/jclouds/compute/domain/internal/HardwareImpl.java | 2 +- .../org/jclouds/compute/domain/internal/ImageImpl.java | 2 +- .../jclouds/compute/domain/internal/NodeMetadataImpl.java | 2 +- .../org/jclouds/compute/domain/internal/VolumeImpl.java | 2 +- .../jclouds/compute/internal/PersistNodeCredentials.java | 2 +- .../org/jclouds/compute/predicates/ImagePredicates.java | 2 +- ...tomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java | 2 +- .../main/java/org/jclouds/ovf/OperatingSystemSection.java | 2 +- compute/src/main/java/org/jclouds/ovf/Section.java | 2 +- core/pom.xml | 5 ----- core/src/main/java/org/jclouds/PropertiesBuilder.java | 2 +- .../main/java/org/jclouds/collect/AbstractMapEntry.java | 2 +- .../main/java/org/jclouds/concurrent/FutureIterables.java | 2 +- core/src/main/java/org/jclouds/crypto/Pems.java | 2 +- core/src/main/java/org/jclouds/crypto/Sha512Crypt.java | 2 +- .../java/org/jclouds/domain/internal/LocationImpl.java | 2 +- .../org/jclouds/domain/internal/ResourceMetadataImpl.java | 2 +- .../java/org/jclouds/encryption/internal/JCECrypto.java | 2 +- .../jclouds/functions/ExceptionToValueOrPropagate.java | 2 +- core/src/main/java/org/jclouds/http/HttpMessage.java | 2 +- core/src/main/java/org/jclouds/http/HttpRequest.java | 2 +- core/src/main/java/org/jclouds/http/HttpResponse.java | 2 +- .../main/java/org/jclouds/http/HttpResponseException.java | 2 +- .../org/jclouds/http/internal/PayloadEnclosingImpl.java | 2 +- .../main/java/org/jclouds/http/utils/ModifyRequest.java | 2 +- .../main/java/org/jclouds/internal/ClassMethodArgs.java | 2 +- core/src/main/java/org/jclouds/io/ContentMetadata.java | 2 +- .../main/java/org/jclouds/io/ContentMetadataBuilder.java | 2 +- .../main/java/org/jclouds/io/MutableContentMetadata.java | 2 +- core/src/main/java/org/jclouds/io/Payloads.java | 2 +- .../jclouds/io/payloads/BaseMutableContentMetadata.java | 2 +- core/src/main/java/org/jclouds/io/payloads/Part.java | 2 +- .../org/jclouds/io/payloads/UrlEncodedFormPayload.java | 2 +- .../main/java/org/jclouds/javax/annotation/Nullable.java | 6 ++++++ .../javax/annotation/concurrent/NotThreadSafe.java | 7 +++++++ .../functions/RegionToEndpointOrProviderIfNull.java | 2 +- .../org/jclouds/location/functions/ZoneToEndpoint.java | 2 +- core/src/main/java/org/jclouds/predicates/Validator.java | 2 +- .../predicates/validators/AllLowerCaseValidator.java | 3 +-- .../main/java/org/jclouds/providers/ProviderMetadata.java | 2 +- core/src/main/java/org/jclouds/rest/Providers.java | 2 +- .../main/java/org/jclouds/rest/RestContextFactory.java | 2 +- .../org/jclouds/rest/internal/GeneratedHttpRequest.java | 2 +- .../jclouds/rest/internal/RestAnnotationProcessor.java | 2 +- core/src/main/java/org/jclouds/util/CredentialUtils.java | 3 +-- core/src/main/java/org/jclouds/util/Utils.java | 2 +- .../test/java/org/jclouds/rest/BaseRestClientTest.java | 2 +- .../rest/internal/RestAnnotationProcessorTest.java | 2 +- .../org/jclouds/loadbalancer/LoadBalancerService.java | 2 +- .../jclouds/loadbalancer/LoadBalancerServiceAdapter.java | 2 +- .../loadbalancer/LoadBalancerServiceContextFactory.java | 2 +- .../loadbalancer/internal/BaseLoadBalancerService.java | 2 +- .../jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java | 2 +- .../org/jclouds/aws/ec2/domain/AWSRunningInstance.java | 2 +- .../org/jclouds/aws/ec2/domain/LaunchSpecification.java | 2 +- .../org/jclouds/aws/ec2/domain/SpotInstanceRequest.java | 7 +++---- .../org/jclouds/aws/ec2/services/AWSAMIAsyncClient.java | 2 +- .../java/org/jclouds/aws/ec2/services/AWSAMIClient.java | 2 +- .../jclouds/aws/ec2/services/AWSInstanceAsyncClient.java | 2 +- .../org/jclouds/aws/ec2/services/AWSInstanceClient.java | 2 +- .../jclouds/aws/ec2/services/AWSKeyPairAsyncClient.java | 2 +- .../org/jclouds/aws/ec2/services/AWSKeyPairClient.java | 2 +- .../aws/ec2/services/AWSSecurityGroupAsyncClient.java | 2 +- .../jclouds/aws/ec2/services/AWSSecurityGroupClient.java | 2 +- .../jclouds/aws/ec2/services/MonitoringAsyncClient.java | 2 +- .../org/jclouds/aws/ec2/services/MonitoringClient.java | 2 +- .../aws/ec2/services/PlacementGroupAsyncClient.java | 2 +- .../jclouds/aws/ec2/services/PlacementGroupClient.java | 2 +- .../jclouds/aws/ec2/services/SpotInstanceAsyncClient.java | 2 +- .../org/jclouds/aws/ec2/services/SpotInstanceClient.java | 2 +- .../main/java/org/jclouds/aws/s3/AWSS3AsyncClient.java | 2 +- .../main/java/org/jclouds/azureblob/domain/AzureBlob.java | 2 +- .../azureblob/domain/internal/BlobPropertiesImpl.java | 2 +- .../CloudLoadBalancersListLoadBalancersStrategy.java | 2 +- .../org/jclouds/cloudsigma/domain/CreateDriveRequest.java | 2 +- .../main/java/org/jclouds/cloudsigma/domain/Drive.java | 2 +- .../java/org/jclouds/cloudsigma/domain/DriveData.java | 2 +- .../java/org/jclouds/cloudsigma/domain/DriveInfo.java | 2 +- .../src/main/java/org/jclouds/cloudsigma/domain/Item.java | 2 +- .../src/main/java/org/jclouds/cloudsigma/domain/NIC.java | 2 +- .../main/java/org/jclouds/cloudsigma/domain/Server.java | 2 +- .../java/org/jclouds/cloudsigma/domain/ServerInfo.java | 2 +- .../java/org/jclouds/cloudsigma/domain/StaticIPInfo.java | 2 +- .../main/java/org/jclouds/cloudsigma/domain/VLANInfo.java | 2 +- .../src/main/java/org/jclouds/cloudsigma/domain/VNC.java | 2 +- .../java/org/jclouds/gogrid/GoGridLiveTestDisabled.java | 2 +- .../main/java/org/jclouds/savvis/vpdc/domain/Network.java | 2 +- .../src/main/java/org/jclouds/savvis/vpdc/domain/Org.java | 2 +- .../main/java/org/jclouds/savvis/vpdc/domain/Task.java | 2 +- .../java/org/jclouds/savvis/vpdc/domain/TaskError.java | 2 +- .../src/main/java/org/jclouds/savvis/vpdc/domain/VDC.java | 2 +- .../jclouds/savvis/vpdc/features/BrowsingAsyncClient.java | 2 +- .../org/jclouds/savvis/vpdc/features/BrowsingClient.java | 2 +- .../jclouds/savvis/vpdc/features/FirewallAsyncClient.java | 2 +- .../vpdc/features/ServiceManagementAsyncClient.java | 2 +- .../org/jclouds/savvis/vpdc/features/VMAsyncClient.java | 2 +- .../src/main/java/org/jclouds/slicehost/domain/Slice.java | 2 +- .../main/java/org/jclouds/slicehost/xml/SliceHandler.java | 2 +- .../jclouds/trmk/ecloud/TerremarkECloudAsyncClient.java | 2 +- .../org/jclouds/trmk/ecloud/TerremarkECloudClient.java | 2 +- .../ecloud/features/DataCenterOperationsAsyncClient.java | 8 +++----- .../trmk/ecloud/features/TagOperationsAsyncClient.java | 8 +++----- .../vcloudexpress/TerremarkVCloudExpressAsyncClient.java | 2 +- .../functions/CredentialsFromAdminAccess.java | 2 +- .../scriptbuilder/statements/login/AdminAccess.java | 2 +- .../jclouds/scriptbuilder/statements/login/UserAdd.java | 2 +- 256 files changed, 285 insertions(+), 291 deletions(-) create mode 100644 core/src/main/java/org/jclouds/javax/annotation/Nullable.java create mode 100644 core/src/main/java/org/jclouds/javax/annotation/concurrent/NotThreadSafe.java diff --git a/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java b/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java index f85a2081e2..7145b395ff 100644 --- a/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java +++ b/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.net.URI; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; 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 f3b0d93151..c200ba213c 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,7 +18,7 @@ */ package org.jclouds.atmos.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.atmos.domain.internal.AtmosObjectImpl.AtmosObjectFactory; import org.jclouds.io.PayloadEnclosing; 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 e96f23186c..b9ce32f4a4 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,7 +20,7 @@ package org.jclouds.atmos.domain; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.atmos.domain.internal.BoundedLinkedHashSet; diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/domain/SystemMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/domain/SystemMetadata.java index 66bfde3586..9c39644b90 100644 --- a/apis/atmos/src/main/java/org/jclouds/atmos/domain/SystemMetadata.java +++ b/apis/atmos/src/main/java/org/jclouds/atmos/domain/SystemMetadata.java @@ -20,7 +20,7 @@ package org.jclouds.atmos.domain; import java.util.Date; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * Metadata of a Atmos Online object 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 4269f0aca0..c3d9dd1a13 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,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.LinkedHashSet; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.atmos.domain.BoundedSet; 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 da70960e9a..a3205b6b27 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,7 +23,7 @@ import static org.jclouds.util.Throwables2.propagateOrNull; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.blobstore.KeyAlreadyExistsException; import org.jclouds.http.HttpRequest; 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 b9910e65b3..d6bec1b39d 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,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Inject; import org.jclouds.http.HttpRequest; diff --git a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java index c9d5f0f87e..c3c0756982 100644 --- a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java +++ b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * An image is a platonic form of a machine. Images are not directly executable, but are a template 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 33a82bf607..462d8d238e 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,7 +24,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.http.HttpRequest; diff --git a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java index 52c145cabd..4c9c3de174 100644 --- a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java +++ b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * Within a cloud provider a realm represents a boundary containing resources. The exact definition 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 6838764da4..58d62849fa 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,7 +23,7 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.deltacloud.domain.EnumHardwareProperty; import org.jclouds.deltacloud.domain.FixedHardwareProperty; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java index 1af1e95c49..1c0f32052e 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java @@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Arrays; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.options.TemplateOptions; import org.jclouds.domain.Credentials; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java index 4fdaceb6a2..a852aed562 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java index 2f764ff6d5..6779e2ad4a 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java @@ -21,7 +21,7 @@ package org.jclouds.ec2.domain; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.util.Preconditions2; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleInstanceS3Storage.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleInstanceS3Storage.java index f05321c640..77ada3fe5c 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleInstanceS3Storage.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleInstanceS3Storage.java @@ -20,7 +20,7 @@ package org.jclouds.ec2.domain; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java index de392e48db..235004493d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java index 1adee5e3d3..12a95d11cb 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java index db442ee851..42f48f8610 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java @@ -20,7 +20,7 @@ package org.jclouds.ec2.domain; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java index b49d106c30..8f03cab684 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java @@ -20,7 +20,7 @@ package org.jclouds.ec2.domain; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java index 9d8dfc1700..48f6d06190 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.LinkedHashSet; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java index dfb8190cf0..a6fed190cc 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java @@ -24,7 +24,7 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java index f3a42b167a..a0a6742b09 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java @@ -18,11 +18,11 @@ */ package org.jclouds.ec2.domain; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; + +import static com.google.common.base.Preconditions.checkNotNull; /** * diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java index 9c3d2dbe18..1221b7423d 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Date; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; import com.google.common.collect.Iterables; diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/options/RegisterImageBackedByEbsOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/options/RegisterImageBackedByEbsOptions.java index bf6c41af94..5b7355fbb4 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/options/RegisterImageBackedByEbsOptions.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/options/RegisterImageBackedByEbsOptions.java @@ -21,7 +21,7 @@ package org.jclouds.ec2.options; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ec2.domain.Image.Architecture; 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 c387a60986..3fb9277044 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 b70768222f..fc314782c4 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,7 +22,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.Image; 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 5e35c9f850..402a05b7a9 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,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 f5c3f41a5c..acfd3f2d0a 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,7 +23,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ec2.domain.AvailabilityZoneInfo; import org.jclouds.ec2.options.DescribeAvailabilityZonesOptions; 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 a85657c566..579eedb67e 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 1e1b8adddf..d58e3c4069 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,7 +21,7 @@ package org.jclouds.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ec2.domain.Attachment; import org.jclouds.ec2.domain.Permission; 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 7aa0eaa859..dcc22ace61 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 239d9e57b5..50c22df929 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,7 +21,7 @@ package org.jclouds.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.aws.AWSResponseException; import org.jclouds.concurrent.Timeout; 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 068d93bb99..1601dd17a6 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 84ffb68e35..c67b37357f 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,7 +22,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.BlockDevice; 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 e185f0ede9..f7827e8c3a 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 f40dd5ebbf..61ccacc2bb 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,7 +21,7 @@ package org.jclouds.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ec2.domain.KeyPair; import org.jclouds.concurrent.Timeout; 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 e25fbdbe37..39df7357de 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -93,7 +93,7 @@ public interface SecurityGroupAsyncClient { @BinderParam(BindGroupNamesToIndexedFormParams.class) String... securityGroupNames); /** - * @see SecurityGroupClient#authorizeSecurityGroupIngressInRegion(@Nullable Region, + * @see SecurityGroupClient#authorizeSecurityGroupIngressInRegion(@ org.jclouds.javax.annotation.Nullable Region, * String,UserIdGroupPair) */ @POST @@ -105,7 +105,7 @@ public interface SecurityGroupAsyncClient { @BinderParam(BindUserIdGroupPairToSourceSecurityGroupFormParams.class) UserIdGroupPair sourceSecurityGroup); /** - * @see SecurityGroupClient#authorizeSecurityGroupIngressInRegion(@Nullable Region, + * @see SecurityGroupClient#authorizeSecurityGroupIngressInRegion(@ org.jclouds.javax.annotation.Nullable Region, * String,IpProtocol,int,int,String) */ @POST @@ -129,7 +129,7 @@ public interface SecurityGroupAsyncClient { @BinderParam(BindUserIdGroupPairToSourceSecurityGroupFormParams.class) UserIdGroupPair sourceSecurityGroup); /** - * @see SecurityGroupClient#revokeSecurityGroupIngressInRegion(@Nullable Region, + * @see SecurityGroupClient#revokeSecurityGroupIngressInRegion(@ org.jclouds.javax.annotation.Nullable Region, * String,IpProtocol,int,int,String) */ @POST 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 f8369d4ffe..e6f412ca1e 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,7 +21,7 @@ package org.jclouds.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.SecurityGroup; 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 0a03149adc..5710656611 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,7 +23,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 40953a14b1..ae04093cea 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 @@ -21,7 +21,7 @@ package org.jclouds.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ec2.domain.BundleTask; import org.jclouds.ec2.options.BundleInstanceS3StorageOptions; 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 5c5c8d7ff2..a5c9ef37c8 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 @@ -25,7 +25,7 @@ import java.net.UnknownHostException; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.Image; 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 d58278c8c2..d2b0f9c8bb 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 @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +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 941f1f72b0..06aed35a16 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 @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/DriveData.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/DriveData.java index aeff5bd477..2c19d62047 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/DriveData.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/DriveData.java @@ -20,7 +20,7 @@ package org.jclouds.elasticstack.domain; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** 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 3a9ee4b9d4..a1c403081c 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 @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Item.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Item.java index c03c8a3546..fe8ce653d6 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Item.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Item.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/NIC.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/NIC.java index b25db67146..4af5ad0dd2 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/NIC.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/NIC.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Server.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Server.java index 7fc40f2bc1..e4d4bff4d2 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Server.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Server.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/ServerInfo.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/ServerInfo.java index 3b63a5ac44..d767216538 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/ServerInfo.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/ServerInfo.java @@ -21,7 +21,7 @@ package org.jclouds.elasticstack.domain; import java.util.Date; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/VNC.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/VNC.java index 076ae363cb..15a2ffade7 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/VNC.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/VNC.java @@ -18,7 +18,7 @@ */ package org.jclouds.elasticstack.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * 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 4ba166ca6f..6b78459951 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,7 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.concurrent.ExecutorService; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; 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 e4ecfa98f6..d637ea67da 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 @@ -20,8 +20,7 @@ package org.jclouds.openstack.nova.domain; import com.google.common.base.Function; import com.google.gson.annotations.SerializedName; - -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * @author Dmitri Babaev 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 355b585dd0..3bd477de58 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,7 @@ import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER; import java.util.Set; import java.util.concurrent.ExecutionException; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.HEAD; 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 cfc7933be6..68133874e3 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/S3Client.java +++ b/apis/s3/src/main/java/org/jclouds/s3/S3Client.java @@ -22,7 +22,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.s3.domain.AccessControlList; import org.jclouds.s3.domain.BucketLogging; diff --git a/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java b/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java index b8c2cf266d..5265f41abd 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java +++ b/apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java @@ -21,7 +21,7 @@ package org.jclouds.s3.config; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import javax.inject.Singleton; 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 c64e3144b6..15b7e8cc42 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,7 +18,7 @@ */ package org.jclouds.s3.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.io.PayloadEnclosing; diff --git a/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java b/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java index ab55def325..0f18d412d7 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java +++ b/apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Inject; import javax.inject.Singleton; 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 2e66ec5a92..e4619e2de8 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,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; 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 00b0edd8b1..42fb26d9ad 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,7 +18,7 @@ */ package org.jclouds.openstack.swift.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.io.PayloadEnclosing; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java index 38384e3568..f0d2a5c4b6 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java @@ -37,7 +37,7 @@ import java.io.InputStream; import java.net.URI; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java index 2800cb2d22..8f58afa4bd 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java @@ -23,7 +23,7 @@ import java.net.URI; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.ovf.Envelope; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java index d0bb33dae7..304ccc2dea 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; 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 30ecb12bae..2ffd7b40e7 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 @@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.internal.CatalogImpl; 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 8e26a8cd68..10962d590e 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 @@ -18,7 +18,7 @@ */ package org.jclouds.vcloud.domain; -import javax.annotation.Nullable; +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 278b7ca046..b4b30e5400 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 @@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.internal.OrgImpl; 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 c50b233aed..53accaf436 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 @@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain; import java.util.Date; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.internal.TaskImpl; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VApp.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VApp.java index 62414567f8..d66fd2c210 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VApp.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VApp.java @@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain; import java.util.List; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * A VApp is the result of instantiation of a {@link VAppTemplate}.

note

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 2851ebab17..0f6729e1a5 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 @@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain; import java.util.List; import java.util.Set; -import javax.annotation.Nullable; +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 196a65e016..b2e6318365 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 @@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.internal.ErrorImpl; 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 64a1f45d41..5bcb73187a 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 @@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.internal.VDCImpl; 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 402a4f86d4..f3a0728b9d 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 @@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain; import java.util.List; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.internal.VmImpl; import org.jclouds.vcloud.domain.ovf.VCloudOperatingSystemSection; 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 14f6d355f9..608d9938ad 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 @@ -25,7 +25,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.Catalog; import org.jclouds.vcloud.domain.ReferenceType; 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 244986285b..ba81422b9b 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 @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.VCloudMediaType; import org.jclouds.vcloud.domain.CatalogItem; 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 881c55739b..aa58ea2a24 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 @@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +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 566a2cac4a..cdd95ebc7a 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 @@ -24,7 +24,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Org; 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 88d7b50f01..a38dd71f13 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 @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Date; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.VCloudMediaType; import org.jclouds.vcloud.domain.ReferenceType; 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 d87d3ca7e7..5d1298d822 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 @@ -24,7 +24,7 @@ import java.net.URI; import java.util.List; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Status; 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 9776dfc356..9775634d16 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 @@ -24,7 +24,7 @@ import java.net.URI; import java.util.List; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Status; 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 2118d71e46..0fbe1c3d06 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 @@ -24,7 +24,7 @@ import java.net.URI; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.AllocationModel; import org.jclouds.vcloud.domain.Capacity; 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 94c5795022..5cacb0f7e9 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 @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.List; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.GuestCustomizationSection; import org.jclouds.vcloud.domain.NetworkConnectionSection; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java index 5fd3be046c..3279039c18 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java @@ -18,7 +18,7 @@ */ package org.jclouds.vcloud.domain.network; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * specifies the properties of the network’s DHCP service diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java index c7aa9aae9f..cee229f1c0 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java @@ -18,7 +18,7 @@ */ package org.jclouds.vcloud.domain.network; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * The Features element defines the DHCP and firewall features of a network. 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 21362585a2..31156a6d99 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 @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.network.firewall.FirewallRule; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java index 01119bc638..ef627f4a2d 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; 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 8e8aa00833..f682b0c288 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 @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.network.nat.NatPolicy; import org.jclouds.vcloud.domain.network.nat.NatRule; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NetworkConfig.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NetworkConfig.java index 49610b7a4c..c2fb6708c6 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NetworkConfig.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NetworkConfig.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * 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 0ffbceeffd..89b78ce14f 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 @@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain.network; import java.util.List; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Task; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java index b2a58c0a80..0eacfe6252 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java @@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain.network.firewall; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * The FirewallRule element defines a single firewall rule. 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 0b3ac883e3..d4be113638 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 @@ -24,7 +24,7 @@ import java.net.URI; import java.util.List; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.vcloud.domain.ReferenceType; import org.jclouds.vcloud.domain.Task; diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatRule.java index a10d619acd..b8d0ce1ac1 100644 --- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatRule.java +++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatRule.java @@ -18,7 +18,7 @@ */ package org.jclouds.vcloud.domain.network.nat; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * 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 a3479d4b27..397ee551ef 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 @@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain.network.nat.rules; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +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 a0cc2f85fa..aad3e42d15 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 @@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain.network.nat.rules; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +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 ee8516e4f8..f80b456db3 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 @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; -import javax.annotation.Nullable; +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 c3fa225642..6988e0bd3c 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,7 @@ import static org.jclouds.vcloud.VCloudMediaType.CATALOG_XML; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; 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 1edc619aa7..43c1374cc8 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,7 +22,7 @@ import java.net.URI; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.vcloud.domain.Catalog; 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 1fe24dda75..b6b1db4101 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,7 +22,7 @@ import static org.jclouds.vcloud.VCloudMediaType.NETWORK_XML; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.GET; 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 884089bd70..a7c1783e12 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,7 +21,7 @@ package org.jclouds.vcloud.features; import java.net.URI; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; 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 f0f94fbf81..fcb6893a70 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,7 +23,7 @@ import static org.jclouds.vcloud.VCloudMediaType.ORG_XML; import java.net.URI; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.GET; 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 987d0621ab..c7794f9e3b 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,7 +23,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.vcloud.domain.Org; 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 7b72b6139a..889599112e 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,7 +23,7 @@ import static org.jclouds.vcloud.VCloudMediaType.TASK_XML; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.POST; 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 3642471725..11d76287fc 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,7 @@ import static org.jclouds.vcloud.VCloudMediaType.VAPP_XML; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; 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 52fe559878..c600cb93f1 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,7 +21,7 @@ package org.jclouds.vcloud.features; import java.net.URI; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.vcloud.domain.Task; 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 762444d898..55bd81f31d 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,7 @@ import static org.jclouds.vcloud.VCloudMediaType.VAPP_XML; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; 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 556678e5eb..22159e1d5a 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,7 +22,7 @@ import java.net.URI; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.ovf.Envelope; 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 ee27625db8..731d86a7b9 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,7 +22,7 @@ import static org.jclouds.vcloud.VCloudMediaType.VDC_XML; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.GET; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/AsyncBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/AsyncBlobStore.java index 67e9d6e7e9..d117567593 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/AsyncBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/AsyncBlobStore.java @@ -20,7 +20,7 @@ package org.jclouds.blobstore; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobBuilder; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java index c457bbf345..266feefa93 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/BlobStore.java @@ -20,7 +20,7 @@ package org.jclouds.blobstore; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobBuilder; diff --git a/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java b/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java index 9348919f34..fcc7f1e8bc 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/BlobStoreContextFactory.java @@ -23,7 +23,7 @@ import static org.jclouds.util.Throwables2.propagateAuthorizationOrOriginalExcep import java.util.Properties; -import javax.annotation.Nullable; +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 755d2aecdb..4836f3d5d4 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java @@ -57,7 +57,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; 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 aa3ec06a60..261337dcb5 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/Blob.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/Blob.java @@ -18,7 +18,7 @@ */ package org.jclouds.blobstore.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.io.Payload; import org.jclouds.io.PayloadEnclosing; 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 64d1b00efe..107835e073 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/BlobMetadata.java @@ -20,7 +20,7 @@ package org.jclouds.blobstore.domain; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.blobstore.domain.internal.BlobMetadataImpl; import org.jclouds.io.ContentMetadata; 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 5a3446ac52..8b3a2cebcc 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/MutableBlobMetadata.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/MutableBlobMetadata.java @@ -20,7 +20,7 @@ package org.jclouds.blobstore.domain; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl; import org.jclouds.io.MutableContentMetadata; 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 0cc2dedb96..4d27d7eb6e 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,7 +25,7 @@ import java.net.URI; import java.util.Date; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobMetadata; 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 e4c61071f9..e63f3eb079 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,7 +20,7 @@ package org.jclouds.blobstore.domain.internal; import java.util.LinkedHashSet; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.blobstore.domain.PageSet; 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 d14f990b2b..5349397c45 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,7 +25,7 @@ import java.net.URI; import java.util.Date; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; 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 0bceba723b..01bf37b865 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,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import javax.annotation.Resource; -import javax.annotation.concurrent.NotThreadSafe; +import org.jclouds.javax.annotation.concurrent.NotThreadSafe; import javax.inject.Named; import org.jclouds.Constants; diff --git a/common/aws/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java b/common/aws/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java index 6fbf29cc3c..2d7cc3312c 100644 --- a/common/aws/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java +++ b/common/aws/src/main/java/org/jclouds/aws/config/AWSRestClientModule.java @@ -24,7 +24,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Singleton; import org.jclouds.aws.handlers.AWSClientErrorRetryHandler; 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 e38a0e85a9..2481f5a1d8 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,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; 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 62be2c53b4..584cdc290a 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,7 +24,7 @@ import java.util.NoSuchElementException; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.trmk.vcloud_0_8.domain.Catalog; 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 ef3767f851..ef0e72acad 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,7 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.SortedMap; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import javax.inject.Singleton; import javax.xml.parsers.FactoryConfigurationError; 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 e776f4bc53..0fd18a71fa 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 @@ -29,7 +29,7 @@ import java.util.Map.Entry; import java.util.NoSuchElementException; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; 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 ad8fd9b3e2..d739bfc52c 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 @@ -20,7 +20,7 @@ package org.jclouds.trmk.vcloud_0_8.domain; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.trmk.vcloud_0_8.domain.internal.CatalogImpl; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/IpAddress.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/IpAddress.java index 20ec2db240..0b4913431d 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/IpAddress.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/IpAddress.java @@ -20,7 +20,7 @@ package org.jclouds.trmk.vcloud_0_8.domain; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/KeyPair.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/KeyPair.java index 6dcef684e3..81fbdaf4dd 100644 --- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/KeyPair.java +++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/KeyPair.java @@ -20,7 +20,7 @@ package org.jclouds.trmk.vcloud_0_8.domain; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * an SSH keypair 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 0c539d3f99..49e8e12c1c 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 @@ -20,7 +20,7 @@ package org.jclouds.trmk.vcloud_0_8.domain; import java.util.Map; -import javax.annotation.Nullable; +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 fa2967e3bf..22d8b51b80 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 @@ -20,7 +20,7 @@ package org.jclouds.trmk.vcloud_0_8.domain; import java.util.Date; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.trmk.vcloud_0_8.domain.internal.TaskImpl; 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 44c4f93dca..1521ee2349 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,7 +20,7 @@ package org.jclouds.trmk.vcloud_0_8.domain; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.cim.ResourceAllocationSettingData; import org.jclouds.cim.VirtualSystemSettingData; 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 e0f655196a..24b7e8b3c6 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 @@ -20,7 +20,7 @@ package org.jclouds.trmk.vcloud_0_8.domain; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.trmk.vcloud_0_8.domain.internal.ErrorImpl; 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 f2cd442fb3..28de382783 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 @@ -20,7 +20,7 @@ package org.jclouds.trmk.vcloud_0_8.domain; import java.util.Map; -import javax.annotation.Nullable; +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; 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 5b618e6a36..6c50b35a47 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 @@ -24,7 +24,7 @@ import java.net.URI; import java.util.LinkedHashMap; import java.util.Map; -import javax.annotation.Nullable; +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 de6da4c353..9f3fd2e3b3 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,12 +18,11 @@ */ package org.jclouds.trmk.vcloud_0_8.domain.internal; -import static com.google.common.base.Preconditions.checkNotNull; - -import javax.annotation.Nullable; - +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/OrgImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/OrgImpl.java index 7153c9a46b..4859a1d4b7 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,17 +18,15 @@ */ 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 javax.annotation.Nullable; - +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 com.google.common.collect.ImmutableMap; +import static com.google.common.base.Preconditions.checkNotNull; /** * 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 747c9d134a..d5db58e1bc 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,19 +18,18 @@ */ 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; -import javax.annotation.Nullable; - +import org.jclouds.javax.annotation.Nullable; import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType; import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType; 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 54579d0409..ae3383bc0d 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 @@ -20,7 +20,7 @@ package org.jclouds.trmk.vcloud_0_8.domain.internal; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType; import org.jclouds.trmk.vcloud_0_8.domain.Status; 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 9831dd17db..3539045093 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,17 +18,15 @@ */ 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 javax.annotation.Nullable; - +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 com.google.common.collect.ImmutableMap; +import static com.google.common.base.Preconditions.checkNotNull; /** * Locations of resources in vCloud 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 c2d0930eef..9c7d45364c 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 @@ -25,7 +25,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +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 54b9139a03..2cbdf9cac1 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,7 +20,7 @@ package org.jclouds.trmk.vcloud_0_8.xml; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import org.jclouds.http.functions.ParseSax; diff --git a/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java b/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java index 9355a32936..5782f9a1d8 100644 --- a/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java +++ b/compute/src/main/java/org/jclouds/compute/ComputeServiceContextFactory.java @@ -23,7 +23,7 @@ import static org.jclouds.util.Throwables2.propagateAuthorizationOrOriginalExcep import java.util.Properties; -import javax.annotation.Nullable; +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 37eb937910..b9ae5c461b 100644 --- a/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java +++ b/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java @@ -23,7 +23,7 @@ import static org.jclouds.compute.util.ComputeServiceUtils.createNodeErrorMessag import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.ExecResponse; import org.jclouds.compute.domain.NodeMetadata; diff --git a/compute/src/main/java/org/jclouds/compute/Utils.java b/compute/src/main/java/org/jclouds/compute/Utils.java index 5aef5509d9..79d801e56f 100644 --- a/compute/src/main/java/org/jclouds/compute/Utils.java +++ b/compute/src/main/java/org/jclouds/compute/Utils.java @@ -18,7 +18,7 @@ */ package org.jclouds.compute; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.internal.UtilsImpl; diff --git a/compute/src/main/java/org/jclouds/compute/config/PersistNodeCredentialsModule.java b/compute/src/main/java/org/jclouds/compute/config/PersistNodeCredentialsModule.java index 361dad2471..db1cfd84da 100644 --- a/compute/src/main/java/org/jclouds/compute/config/PersistNodeCredentialsModule.java +++ b/compute/src/main/java/org/jclouds/compute/config/PersistNodeCredentialsModule.java @@ -20,7 +20,7 @@ package org.jclouds.compute.config; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.NodeMetadataBuilder; 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 311733b6de..51c2503fbf 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java +++ b/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java @@ -18,7 +18,7 @@ */ package org.jclouds.compute.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.cim.OSType; import org.jclouds.ovf.Envelope; 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 4740d7a82c..747eafc071 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java +++ b/compute/src/main/java/org/jclouds/compute/domain/ComputeMetadata.java @@ -20,7 +20,7 @@ package org.jclouds.compute.domain; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.internal.ComputeMetadataImpl; import org.jclouds.domain.ResourceMetadata; diff --git a/compute/src/main/java/org/jclouds/compute/domain/Image.java b/compute/src/main/java/org/jclouds/compute/domain/Image.java index 7a9165d725..820caee90d 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/Image.java +++ b/compute/src/main/java/org/jclouds/compute/domain/Image.java @@ -18,7 +18,7 @@ */ package org.jclouds.compute.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.internal.ImageImpl; import org.jclouds.domain.Credentials; diff --git a/compute/src/main/java/org/jclouds/compute/domain/ImageBuilder.java b/compute/src/main/java/org/jclouds/compute/domain/ImageBuilder.java index ff365ffe16..98135d08fe 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/ImageBuilder.java +++ b/compute/src/main/java/org/jclouds/compute/domain/ImageBuilder.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.internal.ImageImpl; import org.jclouds.domain.Credentials; 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 5b332ee8da..d95dcc1669 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/NodeMetadata.java +++ b/compute/src/main/java/org/jclouds/compute/domain/NodeMetadata.java @@ -20,7 +20,7 @@ package org.jclouds.compute.domain; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.internal.NodeMetadataImpl; import org.jclouds.domain.Credentials; 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 91c867e2ca..8a5f2bc7a7 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/NodeMetadataBuilder.java +++ b/compute/src/main/java/org/jclouds/compute/domain/NodeMetadataBuilder.java @@ -24,7 +24,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.internal.NodeMetadataImpl; import org.jclouds.domain.Credentials; diff --git a/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java b/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java index f54028303e..a5a02546d7 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java +++ b/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java @@ -20,7 +20,7 @@ package org.jclouds.compute.domain; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.annotations.Beta; 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 834c7935bb..d905b55abf 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/Volume.java +++ b/compute/src/main/java/org/jclouds/compute/domain/Volume.java @@ -18,7 +18,7 @@ */ package org.jclouds.compute.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.internal.VolumeImpl; 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 a34280e911..9fc270d083 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/VolumeBuilder.java +++ b/compute/src/main/java/org/jclouds/compute/domain/VolumeBuilder.java @@ -20,7 +20,7 @@ package org.jclouds.compute.domain; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.internal.VolumeImpl; 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 d6e1aadcba..3365b0329b 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,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.ComputeType; import org.jclouds.compute.domain.Hardware; diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java index 2f4edf427a..cfe5163800 100644 --- a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java +++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java @@ -24,7 +24,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.ComputeType; import org.jclouds.compute.domain.Image; 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 3161096a24..f4ad4620a9 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,7 +24,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.ComputeType; import org.jclouds.compute.domain.Hardware; 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 710c6cfbdd..baeac214e6 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,7 +20,7 @@ package org.jclouds.compute.domain.internal; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.Volume; 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 c012b472da..cc5eeff9c9 100644 --- a/compute/src/main/java/org/jclouds/compute/internal/PersistNodeCredentials.java +++ b/compute/src/main/java/org/jclouds/compute/internal/PersistNodeCredentials.java @@ -18,7 +18,7 @@ */ package org.jclouds.compute.internal; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import org.jclouds.compute.domain.NodeMetadata; 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 b459c9dde3..c3b49ec995 100644 --- a/compute/src/main/java/org/jclouds/compute/predicates/ImagePredicates.java +++ b/compute/src/main/java/org/jclouds/compute/predicates/ImagePredicates.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.Image; diff --git a/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java index 853a5e06db..dd788bd6f8 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/CustomizeNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Named; diff --git a/compute/src/main/java/org/jclouds/ovf/OperatingSystemSection.java b/compute/src/main/java/org/jclouds/ovf/OperatingSystemSection.java index ab9c7d2a3e..30fdc1d063 100644 --- a/compute/src/main/java/org/jclouds/ovf/OperatingSystemSection.java +++ b/compute/src/main/java/org/jclouds/ovf/OperatingSystemSection.java @@ -18,7 +18,7 @@ */ package org.jclouds.ovf; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.cim.OSType; diff --git a/compute/src/main/java/org/jclouds/ovf/Section.java b/compute/src/main/java/org/jclouds/ovf/Section.java index f9dbc9ce58..43f9fb928d 100644 --- a/compute/src/main/java/org/jclouds/ovf/Section.java +++ b/compute/src/main/java/org/jclouds/ovf/Section.java @@ -18,7 +18,7 @@ */ package org.jclouds.ovf; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * Metadata about a virtual machine or grouping of them diff --git a/core/pom.xml b/core/pom.xml index 5205f211f7..ab088d0e01 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -111,11 +111,6 @@ guava r09 - - com.google.code.findbugs - jsr305 - 1.3.9 - diff --git a/core/src/main/java/org/jclouds/PropertiesBuilder.java b/core/src/main/java/org/jclouds/PropertiesBuilder.java index 1bd43251a3..3029a68c9e 100644 --- a/core/src/main/java/org/jclouds/PropertiesBuilder.java +++ b/core/src/main/java/org/jclouds/PropertiesBuilder.java @@ -46,7 +46,7 @@ import static org.jclouds.Constants.PROPERTY_USER_THREADS; import java.util.Properties; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; diff --git a/core/src/main/java/org/jclouds/collect/AbstractMapEntry.java b/core/src/main/java/org/jclouds/collect/AbstractMapEntry.java index 32e9f4a299..78b2fedcbf 100644 --- a/core/src/main/java/org/jclouds/collect/AbstractMapEntry.java +++ b/core/src/main/java/org/jclouds/collect/AbstractMapEntry.java @@ -20,7 +20,7 @@ package org.jclouds.collect; import java.util.Map.Entry; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Objects; diff --git a/core/src/main/java/org/jclouds/concurrent/FutureIterables.java b/core/src/main/java/org/jclouds/concurrent/FutureIterables.java index 38c1dc6e5a..7392deac4d 100644 --- a/core/src/main/java/org/jclouds/concurrent/FutureIterables.java +++ b/core/src/main/java/org/jclouds/concurrent/FutureIterables.java @@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Named; diff --git a/core/src/main/java/org/jclouds/crypto/Pems.java b/core/src/main/java/org/jclouds/crypto/Pems.java index ee1f5a4798..df3c0ec1fa 100644 --- a/core/src/main/java/org/jclouds/crypto/Pems.java +++ b/core/src/main/java/org/jclouds/crypto/Pems.java @@ -38,7 +38,7 @@ import java.security.spec.RSAPrivateKeySpec; import java.security.spec.X509EncodedKeySpec; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import net.oauth.signature.pem.PEMReader; import net.oauth.signature.pem.PKCS1EncodedKeySpec; diff --git a/core/src/main/java/org/jclouds/crypto/Sha512Crypt.java b/core/src/main/java/org/jclouds/crypto/Sha512Crypt.java index fef4dc98c8..2df11d5357 100644 --- a/core/src/main/java/org/jclouds/crypto/Sha512Crypt.java +++ b/core/src/main/java/org/jclouds/crypto/Sha512Crypt.java @@ -66,7 +66,7 @@ package org.jclouds.crypto; import java.security.MessageDigest; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.encryption.internal.JCECrypto; 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 4af6f06230..e282ceb3fb 100644 --- a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java +++ b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java @@ -24,7 +24,7 @@ import java.io.Serializable; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.domain.Location; import org.jclouds.domain.LocationScope; 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 032ea51620..0c19c082b8 100644 --- a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java +++ b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java @@ -24,7 +24,7 @@ import java.io.Serializable; import java.net.URI; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.domain.Location; import org.jclouds.domain.ResourceMetadata; 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 a202729448..9b539b94ec 100644 --- a/core/src/main/java/org/jclouds/encryption/internal/JCECrypto.java +++ b/core/src/main/java/org/jclouds/encryption/internal/JCECrypto.java @@ -27,7 +27,7 @@ import java.security.Provider; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; import javax.inject.Inject; diff --git a/core/src/main/java/org/jclouds/functions/ExceptionToValueOrPropagate.java b/core/src/main/java/org/jclouds/functions/ExceptionToValueOrPropagate.java index a1192f514c..7e175c1d35 100644 --- a/core/src/main/java/org/jclouds/functions/ExceptionToValueOrPropagate.java +++ b/core/src/main/java/org/jclouds/functions/ExceptionToValueOrPropagate.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.util.Throwables2; diff --git a/core/src/main/java/org/jclouds/http/HttpMessage.java b/core/src/main/java/org/jclouds/http/HttpMessage.java index 0d3e056623..4845b42960 100644 --- a/core/src/main/java/org/jclouds/http/HttpMessage.java +++ b/core/src/main/java/org/jclouds/http/HttpMessage.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Collection; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.http.internal.PayloadEnclosingImpl; import org.jclouds.io.Payload; diff --git a/core/src/main/java/org/jclouds/http/HttpRequest.java b/core/src/main/java/org/jclouds/http/HttpRequest.java index 6cd97f9b2d..9f0dc5cd4a 100644 --- a/core/src/main/java/org/jclouds/http/HttpRequest.java +++ b/core/src/main/java/org/jclouds/http/HttpRequest.java @@ -25,7 +25,7 @@ import java.net.URI; import java.util.Arrays; import java.util.List; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.io.Payload; diff --git a/core/src/main/java/org/jclouds/http/HttpResponse.java b/core/src/main/java/org/jclouds/http/HttpResponse.java index 9da252efe1..b36c721e16 100644 --- a/core/src/main/java/org/jclouds/http/HttpResponse.java +++ b/core/src/main/java/org/jclouds/http/HttpResponse.java @@ -18,7 +18,7 @@ */ package org.jclouds.http; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.io.Payload; diff --git a/core/src/main/java/org/jclouds/http/HttpResponseException.java b/core/src/main/java/org/jclouds/http/HttpResponseException.java index 11c1950981..4cdcb9e26c 100644 --- a/core/src/main/java/org/jclouds/http/HttpResponseException.java +++ b/core/src/main/java/org/jclouds/http/HttpResponseException.java @@ -20,7 +20,7 @@ package org.jclouds.http; import java.io.IOException; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.io.payloads.StringPayload; import org.jclouds.util.Strings2; 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 a64e7311de..903cb6de3e 100644 --- a/core/src/main/java/org/jclouds/http/internal/PayloadEnclosingImpl.java +++ b/core/src/main/java/org/jclouds/http/internal/PayloadEnclosingImpl.java @@ -24,7 +24,7 @@ import static org.jclouds.io.Payloads.newPayload; import java.io.File; import java.io.InputStream; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.io.Payload; import org.jclouds.io.PayloadEnclosing; 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 f8bd9287a4..03b015bebb 100644 --- a/core/src/main/java/org/jclouds/http/utils/ModifyRequest.java +++ b/core/src/main/java/org/jclouds/http/utils/ModifyRequest.java @@ -26,7 +26,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.core.UriBuilder; import org.jclouds.http.HttpRequest; diff --git a/core/src/main/java/org/jclouds/internal/ClassMethodArgs.java b/core/src/main/java/org/jclouds/internal/ClassMethodArgs.java index 7144e13997..2a83622fae 100644 --- a/core/src/main/java/org/jclouds/internal/ClassMethodArgs.java +++ b/core/src/main/java/org/jclouds/internal/ClassMethodArgs.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.lang.reflect.Method; import java.util.Arrays; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/core/src/main/java/org/jclouds/io/ContentMetadata.java b/core/src/main/java/org/jclouds/io/ContentMetadata.java index 16cd7a46e2..836f31db0b 100644 --- a/core/src/main/java/org/jclouds/io/ContentMetadata.java +++ b/core/src/main/java/org/jclouds/io/ContentMetadata.java @@ -23,7 +23,7 @@ import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java b/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java index 82fc0d7e57..2b6dcbfb59 100644 --- a/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java +++ b/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java @@ -26,7 +26,7 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Map.Entry; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.crypto.CryptoStreams; import org.jclouds.io.payloads.BaseImmutableContentMetadata; diff --git a/core/src/main/java/org/jclouds/io/MutableContentMetadata.java b/core/src/main/java/org/jclouds/io/MutableContentMetadata.java index f221f7692f..d2de785d01 100644 --- a/core/src/main/java/org/jclouds/io/MutableContentMetadata.java +++ b/core/src/main/java/org/jclouds/io/MutableContentMetadata.java @@ -18,7 +18,7 @@ */ package org.jclouds.io; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; 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 71d9943c1a..9c3362e4e1 100644 --- a/core/src/main/java/org/jclouds/io/Payloads.java +++ b/core/src/main/java/org/jclouds/io/Payloads.java @@ -30,7 +30,7 @@ import java.security.NoSuchAlgorithmException; import java.util.Comparator; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.crypto.CryptoStreams; import org.jclouds.io.payloads.ByteArrayPayload; 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 a4b6b3596c..bd4624a705 100644 --- a/core/src/main/java/org/jclouds/io/payloads/BaseMutableContentMetadata.java +++ b/core/src/main/java/org/jclouds/io/payloads/BaseMutableContentMetadata.java @@ -20,7 +20,7 @@ package org.jclouds.io.payloads; import java.io.Serializable; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.io.ContentMetadata; import org.jclouds.io.ContentMetadataBuilder; 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 998d546c96..00e138fcdb 100644 --- a/core/src/main/java/org/jclouds/io/payloads/Part.java +++ b/core/src/main/java/org/jclouds/io/payloads/Part.java @@ -23,7 +23,7 @@ import static com.google.common.collect.Multimaps.forMap; import java.util.LinkedHashMap; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.core.HttpHeaders; import org.jclouds.io.Payload; 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 3384bcbdcb..3080f761f7 100644 --- a/core/src/main/java/org/jclouds/io/payloads/UrlEncodedFormPayload.java +++ b/core/src/main/java/org/jclouds/io/payloads/UrlEncodedFormPayload.java @@ -22,7 +22,7 @@ import java.io.InputStream; import java.util.Comparator; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.core.MediaType; import org.jclouds.http.utils.ModifyRequest; diff --git a/core/src/main/java/org/jclouds/javax/annotation/Nullable.java b/core/src/main/java/org/jclouds/javax/annotation/Nullable.java new file mode 100644 index 0000000000..d75f256572 --- /dev/null +++ b/core/src/main/java/org/jclouds/javax/annotation/Nullable.java @@ -0,0 +1,6 @@ +package org.jclouds.javax.annotation; + +@java.lang.annotation.Documented +@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) +public @interface Nullable { +} diff --git a/core/src/main/java/org/jclouds/javax/annotation/concurrent/NotThreadSafe.java b/core/src/main/java/org/jclouds/javax/annotation/concurrent/NotThreadSafe.java new file mode 100644 index 0000000000..47a4b15ed6 --- /dev/null +++ b/core/src/main/java/org/jclouds/javax/annotation/concurrent/NotThreadSafe.java @@ -0,0 +1,7 @@ +package org.jclouds.javax.annotation.concurrent; + +@java.lang.annotation.Documented +@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) +@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) +public @interface NotThreadSafe { +} diff --git a/core/src/main/java/org/jclouds/location/functions/RegionToEndpointOrProviderIfNull.java b/core/src/main/java/org/jclouds/location/functions/RegionToEndpointOrProviderIfNull.java index 581eab9a09..e001d5a863 100644 --- a/core/src/main/java/org/jclouds/location/functions/RegionToEndpointOrProviderIfNull.java +++ b/core/src/main/java/org/jclouds/location/functions/RegionToEndpointOrProviderIfNull.java @@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkState; import java.net.URI; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; 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 0593e14533..a650508719 100644 --- a/core/src/main/java/org/jclouds/location/functions/ZoneToEndpoint.java +++ b/core/src/main/java/org/jclouds/location/functions/ZoneToEndpoint.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkArgument; import java.net.URI; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; diff --git a/core/src/main/java/org/jclouds/predicates/Validator.java b/core/src/main/java/org/jclouds/predicates/Validator.java index 076edacd68..415142b1f2 100644 --- a/core/src/main/java/org/jclouds/predicates/Validator.java +++ b/core/src/main/java/org/jclouds/predicates/Validator.java @@ -20,7 +20,7 @@ package org.jclouds.predicates; import com.google.common.base.Predicate; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * Abstract class that creates a bridge between {@link com.google.common.base.Predicate} diff --git a/core/src/main/java/org/jclouds/predicates/validators/AllLowerCaseValidator.java b/core/src/main/java/org/jclouds/predicates/validators/AllLowerCaseValidator.java index e525f97271..467ffe782c 100644 --- a/core/src/main/java/org/jclouds/predicates/validators/AllLowerCaseValidator.java +++ b/core/src/main/java/org/jclouds/predicates/validators/AllLowerCaseValidator.java @@ -18,10 +18,9 @@ */ package org.jclouds.predicates.validators; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.predicates.Validator; -import javax.annotation.Nullable; - /** * Validates that the string paremeter doesn't have any uppercase letters. * diff --git a/core/src/main/java/org/jclouds/providers/ProviderMetadata.java b/core/src/main/java/org/jclouds/providers/ProviderMetadata.java index 9873566a62..98fde7499f 100644 --- a/core/src/main/java/org/jclouds/providers/ProviderMetadata.java +++ b/core/src/main/java/org/jclouds/providers/ProviderMetadata.java @@ -21,7 +21,7 @@ package org.jclouds.providers; import java.net.URI; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * The ProviderMetadata interface allows jclouds to provide a plugin framework for gathering cloud diff --git a/core/src/main/java/org/jclouds/rest/Providers.java b/core/src/main/java/org/jclouds/rest/Providers.java index 8a1e97fec3..cbb758cc81 100644 --- a/core/src/main/java/org/jclouds/rest/Providers.java +++ b/core/src/main/java/org/jclouds/rest/Providers.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Properties; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.PropertiesBuilder; import org.jclouds.util.SaxUtils; diff --git a/core/src/main/java/org/jclouds/rest/RestContextFactory.java b/core/src/main/java/org/jclouds/rest/RestContextFactory.java index 6f37f7681d..1bb10e9c58 100644 --- a/core/src/main/java/org/jclouds/rest/RestContextFactory.java +++ b/core/src/main/java/org/jclouds/rest/RestContextFactory.java @@ -30,7 +30,7 @@ import java.io.File; import java.io.IOException; import java.util.Properties; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Inject; import org.jclouds.PropertiesBuilder; 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 d45fc4f937..0f0ddaf66d 100644 --- a/core/src/main/java/org/jclouds/rest/internal/GeneratedHttpRequest.java +++ b/core/src/main/java/org/jclouds/rest/internal/GeneratedHttpRequest.java @@ -24,7 +24,7 @@ import java.lang.reflect.Method; import java.net.URI; import java.util.List; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequestFilter; diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java index 952b11401f..ace4d646c5 100644 --- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java +++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java @@ -51,7 +51,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.concurrent.ConcurrentMap; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Named; import javax.inject.Provider; diff --git a/core/src/main/java/org/jclouds/util/CredentialUtils.java b/core/src/main/java/org/jclouds/util/CredentialUtils.java index b1beae24da..f4e522cf6e 100644 --- a/core/src/main/java/org/jclouds/util/CredentialUtils.java +++ b/core/src/main/java/org/jclouds/util/CredentialUtils.java @@ -20,13 +20,12 @@ package org.jclouds.util; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.crypto.Pems; import org.jclouds.domain.Credentials; - /** * * diff --git a/core/src/main/java/org/jclouds/util/Utils.java b/core/src/main/java/org/jclouds/util/Utils.java index 2a30eb0b72..34ec109c04 100644 --- a/core/src/main/java/org/jclouds/util/Utils.java +++ b/core/src/main/java/org/jclouds/util/Utils.java @@ -29,7 +29,7 @@ import java.util.Properties; import java.util.Map.Entry; import java.util.regex.Pattern; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.PropertiesBuilder; import org.jclouds.domain.Credentials; diff --git a/core/src/test/java/org/jclouds/rest/BaseRestClientTest.java b/core/src/test/java/org/jclouds/rest/BaseRestClientTest.java index a4ad14d10c..f2a53bb0bf 100644 --- a/core/src/test/java/org/jclouds/rest/BaseRestClientTest.java +++ b/core/src/test/java/org/jclouds/rest/BaseRestClientTest.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.lang.reflect.Method; import java.util.concurrent.ExecutorService; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.Constants; import org.jclouds.concurrent.MoreExecutors; diff --git a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java index b69f6e77b9..31b301c971 100644 --- a/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java +++ b/core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java @@ -55,7 +55,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import javax.inject.Provider; import javax.inject.Qualifier; diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerService.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerService.java index 03e1158818..ec4aa93976 100644 --- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerService.java +++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerService.java @@ -20,7 +20,7 @@ package org.jclouds.loadbalancer; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.domain.Location; diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceAdapter.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceAdapter.java index eae0bc1f9e..cc494c6c09 100644 --- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceAdapter.java +++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceAdapter.java @@ -18,7 +18,7 @@ */ package org.jclouds.loadbalancer; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.domain.Location; diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceContextFactory.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceContextFactory.java index 3b6f95f301..507951ff93 100644 --- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceContextFactory.java +++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/LoadBalancerServiceContextFactory.java @@ -23,7 +23,7 @@ import static org.jclouds.util.Throwables2.propagateAuthorizationOrOriginalExcep import java.util.Properties; -import javax.annotation.Nullable; +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 f898412ccf..a4eba9816b 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,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Named; import javax.inject.Singleton; 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 64eab54395..6478de1332 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 @@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkState; import java.util.Arrays; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.aws.ec2.options.RequestSpotInstancesOptions; import org.jclouds.compute.options.TemplateOptions; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java index 102052fd78..c681012886 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java @@ -24,7 +24,7 @@ import java.util.Date; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ec2.domain.BlockDevice; import org.jclouds.ec2.domain.InstanceState; 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 0f7fc71910..4119a6f9c2 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,7 +24,7 @@ import java.util.Arrays; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ec2.domain.BlockDeviceMapping; import org.jclouds.ec2.domain.BlockDeviceMapping.MapEBSSnapshotToDevice; diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/SpotInstanceRequest.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/SpotInstanceRequest.java index 67788df4a0..be4b1d39ed 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/SpotInstanceRequest.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/SpotInstanceRequest.java @@ -18,13 +18,12 @@ */ package org.jclouds.aws.ec2.domain; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.Date; -import javax.annotation.Nullable; - import com.google.common.base.CaseFormat; +import org.jclouds.javax.annotation.Nullable; + +import static com.google.common.base.Preconditions.checkNotNull; /** * 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 9a2e9b1011..cbde32d523 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 e791fc08c2..dc43450f4b 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,7 +21,7 @@ package org.jclouds.aws.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.options.DescribeImagesOptions; 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 87ed2b3714..82675c5d3e 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 18f7452190..b81cd7f594 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,7 +21,7 @@ package org.jclouds.aws.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.aws.ec2.domain.AWSRunningInstance; import org.jclouds.concurrent.Timeout; 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 dd12c3c8de..8fffe14464 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,7 @@ package org.jclouds.aws.ec2.services; import static org.jclouds.aws.reference.FormParameters.ACTION; import static org.jclouds.aws.reference.FormParameters.VERSION; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 730862bc39..9655f5ee25 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,7 +20,7 @@ package org.jclouds.aws.ec2.services; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.ec2.domain.KeyPair; 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 d1c3519d59..8c94b54522 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 7d0ec974f0..6a8c3e7f62 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,7 +21,7 @@ package org.jclouds.aws.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.aws.ec2.options.CreateSecurityGroupOptions; import org.jclouds.concurrent.Timeout; 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 c7a11052be..6ba3228982 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 543ae3d3db..25b0e4864e 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,7 +21,7 @@ package org.jclouds.aws.ec2.services; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.ec2.services.InstanceClient; import org.jclouds.aws.ec2.domain.MonitoringState; 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 a1ea4758e6..9e49e1080d 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 2c3caf8b18..39423eab63 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,7 +21,7 @@ package org.jclouds.aws.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.aws.ec2.domain.PlacementGroup; import org.jclouds.concurrent.Timeout; 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 1c3b3d4cd6..8d089e9f43 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,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; 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 1f5859ce8c..ceda2ad833 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,7 +21,7 @@ package org.jclouds.aws.ec2.services; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.aws.ec2.domain.LaunchSpecification; import org.jclouds.aws.ec2.domain.Spot; 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 d79e0ff95e..53669f993b 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,7 +22,7 @@ import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; 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 078c8a609c..cb9a622b97 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,7 +18,7 @@ */ package org.jclouds.azureblob.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.io.PayloadEnclosing; 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 ca242f061d..acc3487795 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,7 +25,7 @@ import java.net.URI; import java.util.Date; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.azureblob.domain.BlobProperties; import org.jclouds.azureblob.domain.BlobType; diff --git a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java index 3d0408f5c1..b52e0d8769 100644 --- a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java +++ b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/CreateDriveRequest.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/CreateDriveRequest.java index 94bbf6ccb1..242973095d 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/CreateDriveRequest.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/CreateDriveRequest.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Drive.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Drive.java index f072ae0bba..ab53dab9ac 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Drive.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Drive.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/DriveData.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/DriveData.java index 3728319ec8..2fc808e118 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/DriveData.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/DriveData.java @@ -18,7 +18,7 @@ */ package org.jclouds.cloudsigma.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/DriveInfo.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/DriveInfo.java index bcaaa84a04..678de1d644 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/DriveInfo.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/DriveInfo.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Item.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Item.java index 47bdccb9f5..867c50eb5d 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Item.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Item.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/NIC.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/NIC.java index a48e6a4acf..277ad83a04 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/NIC.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/NIC.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Server.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Server.java index d813315ecd..8d8c9f9566 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Server.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/Server.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/ServerInfo.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/ServerInfo.java index 4db78e3a29..e853afdbb9 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/ServerInfo.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/ServerInfo.java @@ -21,7 +21,7 @@ package org.jclouds.cloudsigma.domain; import java.util.Date; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/StaticIPInfo.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/StaticIPInfo.java index 37c43e18bb..aa0998de86 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/StaticIPInfo.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/StaticIPInfo.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/VLANInfo.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/VLANInfo.java index 491d3e073e..69fff90f75 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/VLANInfo.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/VLANInfo.java @@ -20,7 +20,7 @@ package org.jclouds.cloudsigma.domain; import static com.google.common.base.Preconditions.checkNotNull; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/VNC.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/VNC.java index 195b49dbcf..fc1f8807e0 100644 --- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/VNC.java +++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/domain/VNC.java @@ -18,7 +18,7 @@ */ package org.jclouds.cloudsigma.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * 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 b8580dae26..517bf0e43d 100644 --- a/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java +++ b/providers/gogrid/src/test/java/org/jclouds/gogrid/GoGridLiveTestDisabled.java @@ -35,7 +35,7 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.Constants; import org.jclouds.compute.ComputeServiceContextFactory; diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Network.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Network.java index 85c6148bda..cb01ce8831 100644 --- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Network.java +++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Network.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Org.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Org.java index 8de095d1e9..46be0d8b6d 100644 --- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Org.java +++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Org.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Task.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Task.java index 814e911488..6cc07413b4 100644 --- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Task.java +++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/Task.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Date; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * The result of a client request cannot be returned immediately, the server creates a task entity diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/TaskError.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/TaskError.java index 4a9b13d21f..08f1af663d 100644 --- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/TaskError.java +++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/TaskError.java @@ -18,7 +18,7 @@ */ package org.jclouds.savvis.vpdc.domain; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; /** * diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/VDC.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/VDC.java index 1d143a5f04..d8ee059b7f 100644 --- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/VDC.java +++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/domain/VDC.java @@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.net.URI; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableSet; diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClient.java index eb9937093d..a3322abfe9 100644 --- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClient.java +++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingAsyncClient.java @@ -20,7 +20,7 @@ package org.jclouds.savvis.vpdc.features; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingClient.java index b1e504e630..311be9970d 100644 --- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingClient.java +++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/BrowsingClient.java @@ -21,7 +21,7 @@ package org.jclouds.savvis.vpdc.features; import java.net.URI; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.savvis.vpdc.domain.FirewallService; diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClient.java index 8b66960a61..b8842574dd 100644 --- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClient.java +++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/FirewallAsyncClient.java @@ -18,7 +18,7 @@ */ package org.jclouds.savvis.vpdc.features; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.DELETE; import javax.ws.rs.PUT; import javax.ws.rs.Path; diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClient.java index e22fdbda15..b741b510a8 100644 --- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClient.java +++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/ServiceManagementAsyncClient.java @@ -20,7 +20,7 @@ package org.jclouds.savvis.vpdc.features; import java.net.URI; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; diff --git a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java index 1f36917709..1abd499c62 100644 --- a/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java +++ b/providers/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/features/VMAsyncClient.java @@ -21,7 +21,7 @@ package org.jclouds.savvis.vpdc.features; import java.net.URI; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; diff --git a/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java index c2ee4ea373..81a15683cd 100644 --- a/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java +++ b/providers/slicehost/src/main/java/org/jclouds/slicehost/domain/Slice.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; 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 29ad959d44..03aa1b41c7 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,7 +20,7 @@ package org.jclouds.slicehost.xml; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.http.functions.ParseSax; import org.jclouds.slicehost.domain.Slice; 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 629e7d5d52..5d9c214366 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,7 @@ import static org.jclouds.trmk.vcloud_0_8.TerremarkVCloudMediaType.ORG_XML; import java.net.URI; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; 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 e2bbf15778..ff5a32aa5d 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,7 +22,7 @@ import java.net.URI; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.concurrent.Timeout; import org.jclouds.rest.annotations.Delegate; 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 27a451aeca..1843d15f71 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,15 +18,13 @@ */ 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.annotation.Nullable; 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; import org.jclouds.rest.annotations.RequestFilters; @@ -38,7 +36,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 com.google.common.util.concurrent.ListenableFuture; +import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.DATACENTERSLIST_XML; /** * 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 937913541b..5a21819604 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,15 +18,13 @@ */ 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.annotation.Nullable; 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; import org.jclouds.rest.annotations.RequestFilters; @@ -36,7 +34,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 com.google.common.util.concurrent.ListenableFuture; +import static org.jclouds.trmk.ecloud.TerremarkECloudMediaType.TAGSLISTLIST_XML; /** * 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 e2e2cbfa4f..1e36377c6f 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,7 +25,7 @@ import static org.jclouds.trmk.vcloudexpress.TerremarkVCloudExpressMediaType.KEY import java.net.URI; import java.util.Set; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; 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 b63dfe7cb3..266685409b 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functions/CredentialsFromAdminAccess.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functions/CredentialsFromAdminAccess.java @@ -20,7 +20,7 @@ package org.jclouds.scriptbuilder.functions; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.domain.Credentials; import org.jclouds.scriptbuilder.domain.AcceptsStatementVisitor; diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java index c3a1b29220..fad467c49f 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccess.java @@ -25,7 +25,7 @@ import java.io.File; import java.io.IOException; import java.util.Map; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import org.jclouds.crypto.Sha512Crypt; import org.jclouds.domain.Credentials; 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 ce7c2cbe22..ce71168fd0 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,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.List; -import javax.annotation.Nullable; +import org.jclouds.javax.annotation.Nullable; import javax.inject.Named; import org.jclouds.crypto.Sha512Crypt;