From 9f51726239039a6f63b3bb6597c9f30412dc6bcd Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Wed, 24 Nov 2010 10:43:54 +0100 Subject: [PATCH] Issue 413: removed use of guice internal @Nullable annotations --- .../java/org/jclouds/aws/ec2/domain/BlockDeviceMapping.java | 3 ++- .../src/main/java/org/jclouds/aws/ec2/domain/Image.java | 3 ++- .../src/main/java/org/jclouds/aws/ec2/domain/KeyPair.java | 2 +- .../org/jclouds/aws/ec2/domain/PublicIpInstanceIdPair.java | 2 +- .../main/java/org/jclouds/aws/ec2/domain/Reservation.java | 3 ++- .../java/org/jclouds/aws/ec2/domain/RunningInstance.java | 3 ++- .../src/main/java/org/jclouds/aws/s3/domain/S3Object.java | 3 ++- aws/demos/googleappengine/pom.xml | 2 +- .../storage/blob/domain/internal/BlobPropertiesImpl.java | 3 ++- .../java/org/jclouds/blobstore/TransientAsyncBlobStore.java | 6 +++--- .../src/main/java/org/jclouds/blobstore/domain/Blob.java | 4 +++- .../jclouds/blobstore/domain/internal/BlobMetadataImpl.java | 4 ++-- .../blobstore/domain/internal/StorageMetadataImpl.java | 4 ++-- core/pom.xml | 2 +- .../org/jclouds/domain/internal/ResourceMetadataImpl.java | 3 ++- demos/gae-tweetstore/pom.xml | 2 +- .../org/jclouds/filesystem/FilesystemAsyncBlobStore.java | 6 +++--- .../org/jclouds/rackspace/cloudfiles/domain/CFObject.java | 3 ++- .../cloudservers/options/CreateSharedIpGroupOptions.java | 3 ++- 19 files changed, 36 insertions(+), 25 deletions(-) diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/BlockDeviceMapping.java b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/BlockDeviceMapping.java index a254e3085d..7cb5a0b81a 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/BlockDeviceMapping.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/BlockDeviceMapping.java @@ -21,10 +21,11 @@ package org.jclouds.aws.ec2.domain; import static com.google.common.base.Preconditions.checkNotNull; +import javax.annotation.Nullable; + import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; -import com.google.inject.internal.Nullable; /** * Defines the mapping of volumes for diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Image.java b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Image.java index 33cd5021cf..11f3ab00ec 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Image.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Image.java @@ -24,10 +24,11 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Set; +import javax.annotation.Nullable; + import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.inject.internal.Nullable; /** * diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/KeyPair.java b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/KeyPair.java index eedcd60428..1c572c144c 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/KeyPair.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/KeyPair.java @@ -21,7 +21,7 @@ package org.jclouds.aws.ec2.domain; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.inject.internal.Nullable; +import javax.annotation.Nullable; /** * diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/PublicIpInstanceIdPair.java b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/PublicIpInstanceIdPair.java index 891a075a31..1a947a7dcf 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/PublicIpInstanceIdPair.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/PublicIpInstanceIdPair.java @@ -21,7 +21,7 @@ package org.jclouds.aws.ec2.domain; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.inject.internal.Nullable; +import javax.annotation.Nullable; /** * diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Reservation.java b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Reservation.java index 0657f19a12..6d6619d7c2 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Reservation.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/Reservation.java @@ -24,9 +24,10 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.LinkedHashSet; import java.util.Set; +import javax.annotation.Nullable; + import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import com.google.inject.internal.Nullable; /** * diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/RunningInstance.java b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/RunningInstance.java index a2a7a575df..ed4ed62499 100644 --- a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/RunningInstance.java +++ b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/RunningInstance.java @@ -25,12 +25,13 @@ import java.util.Date; import java.util.Map; import java.util.Set; +import javax.annotation.Nullable; + import org.jclouds.aws.ec2.domain.Attachment.Status; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.inject.internal.Nullable; /** * diff --git a/aws/core/src/main/java/org/jclouds/aws/s3/domain/S3Object.java b/aws/core/src/main/java/org/jclouds/aws/s3/domain/S3Object.java index da4478e78b..bf2c43695a 100644 --- a/aws/core/src/main/java/org/jclouds/aws/s3/domain/S3Object.java +++ b/aws/core/src/main/java/org/jclouds/aws/s3/domain/S3Object.java @@ -19,10 +19,11 @@ package org.jclouds.aws.s3.domain; +import javax.annotation.Nullable; + import org.jclouds.io.PayloadEnclosing; import com.google.common.collect.Multimap; -import com.google.inject.internal.Nullable; /** * Amazon S3 is designed to store objects. Objects are stored in buckets and consist of a diff --git a/aws/demos/googleappengine/pom.xml b/aws/demos/googleappengine/pom.xml index 65f5964ce1..c3a39338fa 100644 --- a/aws/demos/googleappengine/pom.xml +++ b/aws/demos/googleappengine/pom.xml @@ -52,7 +52,7 @@ com.google.code.guice guice-servlet - 2.1-r1201 + 3.0-snapshot-20101120 displaytag diff --git a/azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/BlobPropertiesImpl.java b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/BlobPropertiesImpl.java index 3233257cd6..e84ed48e84 100644 --- a/azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/BlobPropertiesImpl.java +++ b/azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/BlobPropertiesImpl.java @@ -26,6 +26,8 @@ import java.net.URI; import java.util.Date; import java.util.Map; +import javax.annotation.Nullable; + import org.jclouds.azure.storage.blob.domain.BlobProperties; import org.jclouds.azure.storage.blob.domain.BlobType; import org.jclouds.azure.storage.blob.domain.LeaseStatus; @@ -33,7 +35,6 @@ import org.jclouds.io.ContentMetadata; import org.jclouds.io.payloads.BaseImmutableContentMetadata; import com.google.common.collect.Maps; -import com.google.inject.internal.Nullable; /** * Allows you to manipulate metadata. diff --git a/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java index 5b2bae075b..f308d57d18 100755 --- a/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java @@ -49,27 +49,28 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; +import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; import javax.ws.rs.core.HttpHeaders; import org.jclouds.Constants; import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.Blob.Factory; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.MutableBlobMetadata; import org.jclouds.blobstore.domain.MutableStorageMetadata; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; -import org.jclouds.blobstore.domain.Blob.Factory; import org.jclouds.blobstore.domain.internal.MutableStorageMetadataImpl; import org.jclouds.blobstore.domain.internal.PageSetImpl; import org.jclouds.blobstore.functions.HttpGetOptionsListToGetOptions; @@ -103,7 +104,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Multimaps; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import com.google.inject.internal.Nullable; /** * Implementation of {@link BaseAsyncBlobStore} which keeps all data in a local Map object. 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 51bc1d4351..e618c08ca4 100644 --- a/blobstore/src/main/java/org/jclouds/blobstore/domain/Blob.java +++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/Blob.java @@ -19,10 +19,12 @@ package org.jclouds.blobstore.domain; +import javax.annotation.Nullable; + +import org.jclouds.io.Payload; import org.jclouds.io.PayloadEnclosing; import com.google.common.collect.Multimap; -import com.google.inject.internal.Nullable; /** * Value type for an HTTP Blob service. Blobs are stored in containers and consist of a 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 bcc8f4be3e..17659b73a6 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 @@ -26,14 +26,14 @@ import java.net.URI; import java.util.Date; import java.util.Map; +import javax.annotation.Nullable; + import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.StorageType; import org.jclouds.domain.Location; import org.jclouds.io.ContentMetadata; -import com.google.inject.internal.Nullable; - /** * System and user Metadata for the {@link Blob}. * 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 4e416806d9..7a347eaf46 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 @@ -26,13 +26,13 @@ import java.net.URI; import java.util.Date; import java.util.Map; +import javax.annotation.Nullable; + import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; import org.jclouds.domain.Location; import org.jclouds.domain.internal.ResourceMetadataImpl; -import com.google.inject.internal.Nullable; - /** * Idpayload of the object * diff --git a/core/pom.xml b/core/pom.xml index dae3ed8250..4abd10c9bb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -81,7 +81,7 @@ com.google.code.guice guice - 2.1-r1201 + 3.0-snapshot-20101120 javax.inject 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 fbc55edde7..38d6b6352f 100644 --- a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java +++ b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java @@ -25,11 +25,12 @@ import java.io.Serializable; import java.net.URI; import java.util.Map; +import javax.annotation.Nullable; + import org.jclouds.domain.Location; import org.jclouds.domain.ResourceMetadata; import com.google.common.collect.Maps; -import com.google.inject.internal.Nullable; /** * Idpayload of the object diff --git a/demos/gae-tweetstore/pom.xml b/demos/gae-tweetstore/pom.xml index 6b3063661a..7c716e5702 100644 --- a/demos/gae-tweetstore/pom.xml +++ b/demos/gae-tweetstore/pom.xml @@ -103,7 +103,7 @@ com.google.code.guice guice-servlet - 2.1-r1201 + 3.0-snapshot-20101120 displaytag diff --git a/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java b/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java index 3ffde30ddf..d8622888ac 100644 --- a/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java +++ b/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java @@ -49,12 +49,13 @@ import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import java.util.Map.Entry; import java.util.concurrent.ExecutorService; +import javax.annotation.Nullable; import javax.annotation.Resource; import javax.inject.Inject; import javax.inject.Named; @@ -66,13 +67,13 @@ import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.blobstore.KeyNotFoundException; import org.jclouds.blobstore.domain.Blob; +import org.jclouds.blobstore.domain.Blob.Factory; import org.jclouds.blobstore.domain.BlobMetadata; import org.jclouds.blobstore.domain.MutableBlobMetadata; import org.jclouds.blobstore.domain.MutableStorageMetadata; import org.jclouds.blobstore.domain.PageSet; import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.domain.StorageType; -import org.jclouds.blobstore.domain.Blob.Factory; import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl; import org.jclouds.blobstore.domain.internal.MutableStorageMetadataImpl; import org.jclouds.blobstore.domain.internal.PageSetImpl; @@ -107,7 +108,6 @@ import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -import com.google.inject.internal.Nullable; /** * diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/CFObject.java b/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/CFObject.java index abefae7c34..182916521a 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/CFObject.java +++ b/rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/CFObject.java @@ -19,10 +19,11 @@ package org.jclouds.rackspace.cloudfiles.domain; +import javax.annotation.Nullable; + import org.jclouds.io.PayloadEnclosing; import com.google.common.collect.Multimap; -import com.google.inject.internal.Nullable; /** * diff --git a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptions.java b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptions.java index a69269654f..3b5af4042a 100644 --- a/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptions.java +++ b/rackspace/src/main/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptions.java @@ -24,11 +24,12 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; +import javax.annotation.Nullable; + import org.jclouds.http.HttpRequest; import org.jclouds.rest.binders.BindToJsonPayload; import com.google.common.collect.ImmutableMap; -import com.google.inject.internal.Nullable; /** *