Skip to content

Commit

Permalink
Issue 413: removed use of guice internal @nullable annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian Cole committed Nov 24, 2010
1 parent 7cf4886 commit 9f51726
Show file tree
Hide file tree
Showing 19 changed files with 36 additions and 25 deletions.
3 changes: 2 additions & 1 deletion aws/core/src/main/java/org/jclouds/aws/ec2/domain/BlockDeviceMapping.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@

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
Expand Down
3 changes: 2 additions & 1 deletion aws/core/src/main/java/org/jclouds/aws/ec2/domain/Image.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@
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;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion aws/core/src/main/java/org/jclouds/aws/ec2/domain/KeyPair.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.inject.internal.Nullable;
import javax.annotation.Nullable;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion aws/core/src/main/java/org/jclouds/aws/ec2/domain/PublicIpInstanceIdPair.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import static com.google.common.base.Preconditions.checkNotNull;

import com.google.inject.internal.Nullable;
import javax.annotation.Nullable;

/**
*
Expand Down
3 changes: 2 additions & 1 deletion aws/core/src/main/java/org/jclouds/aws/ec2/domain/Reservation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
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;

/**
*
Expand Down
3 changes: 2 additions & 1 deletion aws/core/src/main/java/org/jclouds/aws/ec2/domain/RunningInstance.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@
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;

/**
*
Expand Down
3 changes: 2 additions & 1 deletion aws/core/src/main/java/org/jclouds/aws/s3/domain/S3Object.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion aws/demos/googleappengine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice-servlet</artifactId>
<version>2.1-r1201</version>
<version>3.0-snapshot-20101120</version>
</dependency>
<dependency>
<groupId>displaytag</groupId>
Expand Down
3 changes: 2 additions & 1 deletion azure/src/main/java/org/jclouds/azure/storage/blob/domain/internal/BlobPropertiesImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@
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;
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.
Expand Down
6 changes: 3 additions & 3 deletions blobstore/src/main/java/org/jclouds/blobstore/TransientAsyncBlobStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,28 @@
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;
Expand Down Expand Up @@ -103,7 +104,6 @@
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.
Expand Down
4 changes: 3 additions & 1 deletion blobstore/src/main/java/org/jclouds/blobstore/domain/Blob.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
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}.
*
Expand Down
4 changes: 2 additions & 2 deletions blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
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
*
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
<version>2.1-r1201</version>
<version>3.0-snapshot-20101120</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@
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
Expand Down
2 changes: 1 addition & 1 deletion demos/gae-tweetstore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice-servlet</artifactId>
<version>2.1-r1201</version>
<version>3.0-snapshot-20101120</version>
</dependency>
<dependency>
<groupId>displaytag</groupId>
Expand Down
6 changes: 3 additions & 3 deletions filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,13 @@
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;
Expand All @@ -66,13 +67,13 @@
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;
Expand Down Expand Up @@ -107,7 +108,6 @@
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;

/**
*
Expand Down
3 changes: 2 additions & 1 deletion rackspace/src/main/java/org/jclouds/rackspace/cloudfiles/domain/CFObject.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
*
Expand Down
3 changes: 2 additions & 1 deletion .../src/main/java/org/jclouds/rackspace/cloudservers/options/CreateSharedIpGroupOptions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@

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;

/**
*
Expand Down

0 comments on commit 9f51726

Please sign in to comment.