diff options
27 files changed, 13 insertions, 24 deletions
diff --git a/core/src/com/google/inject/internal/BytecodeGen.java b/core/src/com/google/inject/internal/BytecodeGen.java index d83ebd66..621720f2 100644 --- a/core/src/com/google/inject/internal/BytecodeGen.java +++ b/core/src/com/google/inject/internal/BytecodeGen.java @@ -19,6 +19,8 @@ package com.google.inject.internal; import com.google.inject.internal.util.Function; import com.google.inject.internal.util.ImmutableMap; import com.google.inject.internal.util.MapMaker; +import com.google.inject.internal.util.Nullable; + import java.lang.reflect.Constructor; import java.lang.reflect.Member; import java.lang.reflect.Method; diff --git a/core/src/com/google/inject/internal/FailableCache.java b/core/src/com/google/inject/internal/FailableCache.java index 2d7f8850..96fb9222 100644 --- a/core/src/com/google/inject/internal/FailableCache.java +++ b/core/src/com/google/inject/internal/FailableCache.java @@ -18,6 +18,8 @@ package com.google.inject.internal; import com.google.inject.internal.util.Function; import com.google.inject.internal.util.MapMaker; +import com.google.inject.internal.util.Nullable; + import java.util.Map; /** diff --git a/core/src/com/google/inject/internal/InjectorImpl.java b/core/src/com/google/inject/internal/InjectorImpl.java index ab8e281e..897e5218 100644 --- a/core/src/com/google/inject/internal/InjectorImpl.java +++ b/core/src/com/google/inject/internal/InjectorImpl.java @@ -36,6 +36,7 @@ import com.google.inject.internal.util.ImmutableMap; import com.google.inject.internal.util.ImmutableSet; import com.google.inject.internal.util.Lists; import com.google.inject.internal.util.Maps; +import com.google.inject.internal.util.Nullable; import com.google.inject.internal.util.Objects; import com.google.inject.internal.util.SourceProvider; import com.google.inject.internal.util.ToStringBuilder; diff --git a/core/src/com/google/inject/internal/util/AbstractMapEntry.java b/core/src/com/google/inject/internal/util/AbstractMapEntry.java index 1ec9f792..fa8c1d9f 100644 --- a/core/src/com/google/inject/internal/util/AbstractMapEntry.java +++ b/core/src/com/google/inject/internal/util/AbstractMapEntry.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.util.Map.Entry; /** diff --git a/core/src/com/google/inject/internal/util/Collections2.java b/core/src/com/google/inject/internal/util/Collections2.java index 47efa343..b4bca380 100644 --- a/core/src/com/google/inject/internal/util/Collections2.java +++ b/core/src/com/google/inject/internal/util/Collections2.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.util.Collection; import java.util.Set; diff --git a/core/src/com/google/inject/internal/util/CustomConcurrentHashMap.java b/core/src/com/google/inject/internal/util/CustomConcurrentHashMap.java index c0994889..8915d700 100644 --- a/core/src/com/google/inject/internal/util/CustomConcurrentHashMap.java +++ b/core/src/com/google/inject/internal/util/CustomConcurrentHashMap.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.io.IOException; import java.io.Serializable; import java.lang.reflect.Array; diff --git a/core/src/com/google/inject/internal/util/Function.java b/core/src/com/google/inject/internal/util/Function.java index ce4a80c8..0e2264ce 100644 --- a/core/src/com/google/inject/internal/util/Function.java +++ b/core/src/com/google/inject/internal/util/Function.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; /** * A transformation from one object to another. For example, a diff --git a/core/src/com/google/inject/internal/util/ImmutableCollection.java b/core/src/com/google/inject/internal/util/ImmutableCollection.java index 402b9058..7b272f2d 100644 --- a/core/src/com/google/inject/internal/util/ImmutableCollection.java +++ b/core/src/com/google/inject/internal/util/ImmutableCollection.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; diff --git a/core/src/com/google/inject/internal/util/ImmutableEntry.java b/core/src/com/google/inject/internal/util/ImmutableEntry.java index 73318c7c..b740563f 100644 --- a/core/src/com/google/inject/internal/util/ImmutableEntry.java +++ b/core/src/com/google/inject/internal/util/ImmutableEntry.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.io.Serializable; /** diff --git a/core/src/com/google/inject/internal/util/ImmutableList.java b/core/src/com/google/inject/internal/util/ImmutableList.java index c5831d92..63c7e449 100644 --- a/core/src/com/google/inject/internal/util/ImmutableList.java +++ b/core/src/com/google/inject/internal/util/ImmutableList.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.Serializable; diff --git a/core/src/com/google/inject/internal/util/ImmutableMap.java b/core/src/com/google/inject/internal/util/ImmutableMap.java index 871024c7..e4119884 100644 --- a/core/src/com/google/inject/internal/util/ImmutableMap.java +++ b/core/src/com/google/inject/internal/util/ImmutableMap.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.io.Serializable; import java.util.Collections; import java.util.Iterator; diff --git a/core/src/com/google/inject/internal/util/ImmutableSet.java b/core/src/com/google/inject/internal/util/ImmutableSet.java index c1807f39..1a84ae6a 100644 --- a/core/src/com/google/inject/internal/util/ImmutableSet.java +++ b/core/src/com/google/inject/internal/util/ImmutableSet.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/com/google/inject/internal/util/Iterators.java b/core/src/com/google/inject/internal/util/Iterators.java index 2ffbe1b8..7706feb7 100644 --- a/core/src/com/google/inject/internal/util/Iterators.java +++ b/core/src/com/google/inject/internal/util/Iterators.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/core/src/com/google/inject/internal/util/Join.java b/core/src/com/google/inject/internal/util/Join.java index 6e979300..4e5c04f0 100644 --- a/core/src/com/google/inject/internal/util/Join.java +++ b/core/src/com/google/inject/internal/util/Join.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.io.IOException; import java.util.Arrays; import java.util.Iterator; diff --git a/core/src/com/google/inject/internal/util/Lists.java b/core/src/com/google/inject/internal/util/Lists.java index b32a430c..162e5db3 100644 --- a/core/src/com/google/inject/internal/util/Lists.java +++ b/core/src/com/google/inject/internal/util/Lists.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/core/src/com/google/inject/internal/util/Maps.java b/core/src/com/google/inject/internal/util/Maps.java index 7a652436..7ecf1be4 100644 --- a/core/src/com/google/inject/internal/util/Maps.java +++ b/core/src/com/google/inject/internal/util/Maps.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.util.Collections; import java.util.HashMap; import java.util.IdentityHashMap; diff --git a/core/src/com/google/inject/internal/Nullable.java b/core/src/com/google/inject/internal/util/Nullable.java index abe85eed..3236c07c 100644 --- a/core/src/com/google/inject/internal/Nullable.java +++ b/core/src/com/google/inject/internal/util/Nullable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.inject.internal; +package com.google.inject.internal.util; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/core/src/com/google/inject/internal/util/Objects.java b/core/src/com/google/inject/internal/util/Objects.java index c93409da..6e684bb4 100644 --- a/core/src/com/google/inject/internal/util/Objects.java +++ b/core/src/com/google/inject/internal/util/Objects.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.util.Arrays; /** diff --git a/core/src/com/google/inject/internal/util/Preconditions.java b/core/src/com/google/inject/internal/util/Preconditions.java index 2dd1335d..e72b6a70 100644 --- a/core/src/com/google/inject/internal/util/Preconditions.java +++ b/core/src/com/google/inject/internal/util/Preconditions.java @@ -50,7 +50,7 @@ import java.util.NoSuchElementException; * in their specifications to do so even when given perfectly valid input. That * is, {@code null} is a valid parameter to the method {@link * #checkNotNull(Object)} -- and technically this parameter could be even marked - * as {@link com.google.inject.internal.Nullable} -- yet the method will still throw an exception anyway, + * as {@link com.google.inject.internal.util.Nullable} -- yet the method will still throw an exception anyway, * because that's what its contract says to do. * * <p>This class may be used with the Google Web Toolkit (GWT). diff --git a/core/src/com/google/inject/internal/util/Sets.java b/core/src/com/google/inject/internal/util/Sets.java index 1aa3f84c..7edea444 100644 --- a/core/src/com/google/inject/internal/util/Sets.java +++ b/core/src/com/google/inject/internal/util/Sets.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; diff --git a/core/test/com/google/inject/NullableInjectionPointTest.java b/core/test/com/google/inject/NullableInjectionPointTest.java index 878d2c57..9b0e9ddc 100644 --- a/core/test/com/google/inject/NullableInjectionPointTest.java +++ b/core/test/com/google/inject/NullableInjectionPointTest.java @@ -1,7 +1,9 @@ package com.google.inject; import static com.google.inject.Asserts.assertContains; -import com.google.inject.internal.Nullable; + +import com.google.inject.internal.util.Nullable; + import junit.framework.TestCase; /** diff --git a/core/test/com/google/inject/internal/util/ForwardingMap.java b/core/test/com/google/inject/internal/util/ForwardingMap.java index b4f79d49..1031a553 100644 --- a/core/test/com/google/inject/internal/util/ForwardingMap.java +++ b/core/test/com/google/inject/internal/util/ForwardingMap.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.util.Collection; import java.util.Map; diff --git a/core/test/com/google/inject/internal/util/ForwardingSet.java b/core/test/com/google/inject/internal/util/ForwardingSet.java index f9bfd479..368dd21a 100644 --- a/core/test/com/google/inject/internal/util/ForwardingSet.java +++ b/core/test/com/google/inject/internal/util/ForwardingSet.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import java.util.Set; diff --git a/core/test/com/google/inject/internal/util/MapMakerTestSuite.java b/core/test/com/google/inject/internal/util/MapMakerTestSuite.java index d0c828cf..e04e5d90 100644 --- a/core/test/com/google/inject/internal/util/MapMakerTestSuite.java +++ b/core/test/com/google/inject/internal/util/MapMakerTestSuite.java @@ -16,7 +16,6 @@ package com.google.inject.internal.util; -import com.google.inject.internal.Nullable; import com.google.inject.internal.util.ComputationException; import com.google.inject.internal.util.CustomConcurrentHashMap.Impl; import com.google.inject.internal.util.ExpirationTimer; diff --git a/extensions/grapher/src/com/google/inject/grapher/DependencyEdge.java b/extensions/grapher/src/com/google/inject/grapher/DependencyEdge.java index decdb967..b76a90cd 100644 --- a/extensions/grapher/src/com/google/inject/grapher/DependencyEdge.java +++ b/extensions/grapher/src/com/google/inject/grapher/DependencyEdge.java @@ -16,7 +16,7 @@ package com.google.inject.grapher; -import com.google.inject.internal.Nullable; +import com.google.inject.internal.util.Nullable; import com.google.inject.spi.InjectionPoint; /** diff --git a/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java b/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java index 73098cb2..b8c9b626 100644 --- a/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java +++ b/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java @@ -21,7 +21,7 @@ import com.google.inject.Inject; import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.internal.util.Lists; -import com.google.inject.internal.Nullable; +import com.google.inject.internal.util.Nullable; import com.google.inject.spi.BindingTargetVisitor; import com.google.inject.spi.ConstructorBinding; import com.google.inject.spi.ConvertedConstantBinding; diff --git a/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistService.java b/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistService.java index cf52a9d1..1da61f78 100644 --- a/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistService.java +++ b/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistService.java @@ -19,7 +19,7 @@ package com.google.inject.persist.jpa; import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
-import com.google.inject.internal.Nullable;
+import com.google.inject.internal.util.Nullable;
import com.google.inject.internal.util.Preconditions;
import com.google.inject.persist.PersistService;
import com.google.inject.persist.UnitOfWork;
|