Revision: 1323
Author: sberlin
Date: Tue Oct 26 19:03:52 2010
Log: move @nullable to internal.util
http://code.google.com/p/google-guice/source/detail?r=1323
Added:
/trunk/core/src/com/google/inject/internal/util/Nullable.java
Deleted:
/trunk/core/src/com/google/inject/internal/Nullable.java
Modified:
/trunk/core/src/com/google/inject/internal/BytecodeGen.java
/trunk/core/src/com/google/inject/internal/FailableCache.java
/trunk/core/src/com/google/inject/internal/InjectorImpl.java
/trunk/core/src/com/google/inject/internal/util/AbstractMapEntry.java
/trunk/core/src/com/google/inject/internal/util/Collections2.java
/trunk/core/src/com/google/inject/internal/util/CustomConcurrentHashMap.java
/trunk/core/src/com/google/inject/internal/util/Function.java
/trunk/core/src/com/google/inject/internal/util/ImmutableCollection.java
/trunk/core/src/com/google/inject/internal/util/ImmutableEntry.java
/trunk/core/src/com/google/inject/internal/util/ImmutableList.java
/trunk/core/src/com/google/inject/internal/util/ImmutableMap.java
/trunk/core/src/com/google/inject/internal/util/ImmutableSet.java
/trunk/core/src/com/google/inject/internal/util/Iterators.java
/trunk/core/src/com/google/inject/internal/util/Join.java
/trunk/core/src/com/google/inject/internal/util/Lists.java
/trunk/core/src/com/google/inject/internal/util/Maps.java
/trunk/core/src/com/google/inject/internal/util/Objects.java
/trunk/core/src/com/google/inject/internal/util/Preconditions.java
/trunk/core/src/com/google/inject/internal/util/Sets.java
/trunk/core/test/com/google/inject/NullableInjectionPointTest.java
/trunk/core/test/com/google/inject/internal/util/ForwardingMap.java
/trunk/core/test/com/google/inject/internal/util/ForwardingSet.java
/trunk/core/test/com/google/inject/internal/util/MapMakerTestSuite.java
/trunk/extensions/grapher/src/com/google/inject/grapher/DependencyEdge.java
/trunk/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java
/trunk/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistService.java
=======================================
--- /dev/null
+++ /trunk/core/src/com/google/inject/internal/util/Nullable.java Tue Oct
26 19:03:52 2010
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2007 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.inject.internal.util;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The presence of this annotation on a method parameter indicates that
+ * {...@code null} is an acceptable value for that parameter. It should not
be
+ * used for parameters of primitive types.
+ *
+ * <p>This annotation may be used with the Google Web Toolkit (GWT).
+ *
+ * @author Kevin Bourrillion
+ */
+...@documented
+...@retention(RetentionPolicy.RUNTIME)
+...@target({ElementType.PARAMETER, ElementType.FIELD})
+public @interface Nullable { }
=======================================
--- /trunk/core/src/com/google/inject/internal/Nullable.java Fri Feb 20
16:25:27 2009
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2007 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.inject.internal;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The presence of this annotation on a method parameter indicates that
- * {...@code null} is an acceptable value for that parameter. It should not
be
- * used for parameters of primitive types.
- *
- * <p>This annotation may be used with the Google Web Toolkit (GWT).
- *
- * @author Kevin Bourrillion
- */
-...@documented
-...@retention(RetentionPolicy.RUNTIME)
-...@target({ElementType.PARAMETER, ElementType.FIELD})
-public @interface Nullable { }
=======================================
--- /trunk/core/src/com/google/inject/internal/BytecodeGen.java Sun Aug 1
12:23:10 2010
+++ /trunk/core/src/com/google/inject/internal/BytecodeGen.java Tue Oct 26
19:03:52 2010
@@ -19,6 +19,8 @@
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;
=======================================
--- /trunk/core/src/com/google/inject/internal/FailableCache.java Sun Aug
1 12:23:10 2010
+++ /trunk/core/src/com/google/inject/internal/FailableCache.java Tue Oct
26 19:03:52 2010
@@ -18,6 +18,8 @@
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;
/**
=======================================
--- /trunk/core/src/com/google/inject/internal/InjectorImpl.java Thu Aug 26
15:36:19 2010
+++ /trunk/core/src/com/google/inject/internal/InjectorImpl.java Tue Oct 26
19:03:52 2010
@@ -36,6 +36,7 @@
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;
=======================================
--- /trunk/core/src/com/google/inject/internal/util/AbstractMapEntry.java
Sat Jul 3 08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/AbstractMapEntry.java
Tue Oct 26 19:03:52 2010
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Nullable;
import java.util.Map.Entry;
/**
=======================================
--- /trunk/core/src/com/google/inject/internal/util/Collections2.java Sat
Jul 3 08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/Collections2.java Tue
Oct 26 19:03:52 2010
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Nullable;
import java.util.Collection;
import java.util.Set;
=======================================
---
/trunk/core/src/com/google/inject/internal/util/CustomConcurrentHashMap.java
Sun Aug 1 12:23:10 2010
+++
/trunk/core/src/com/google/inject/internal/util/CustomConcurrentHashMap.java
Tue Oct 26 19:03:52 2010
@@ -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;
=======================================
--- /trunk/core/src/com/google/inject/internal/util/Function.java Sun Aug
1 12:23:10 2010
+++ /trunk/core/src/com/google/inject/internal/util/Function.java Tue Oct
26 19:03:52 2010
@@ -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
=======================================
---
/trunk/core/src/com/google/inject/internal/util/ImmutableCollection.java
Sat Jul 3 08:51:31 2010
+++
/trunk/core/src/com/google/inject/internal/util/ImmutableCollection.java
Tue Oct 26 19:03:52 2010
@@ -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;
=======================================
--- /trunk/core/src/com/google/inject/internal/util/ImmutableEntry.java Sat
Jul 3 08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/ImmutableEntry.java Tue
Oct 26 19:03:52 2010
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Nullable;
import java.io.Serializable;
/**
=======================================
--- /trunk/core/src/com/google/inject/internal/util/ImmutableList.java Sat
Jul 3 08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/ImmutableList.java Tue
Oct 26 19:03:52 2010
@@ -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;
=======================================
--- /trunk/core/src/com/google/inject/internal/util/ImmutableMap.java Sat
Jul 3 08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/ImmutableMap.java Tue
Oct 26 19:03:52 2010
@@ -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;
=======================================
--- /trunk/core/src/com/google/inject/internal/util/ImmutableSet.java Sat
Jul 3 08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/ImmutableSet.java Tue
Oct 26 19:03:52 2010
@@ -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;
=======================================
--- /trunk/core/src/com/google/inject/internal/util/Iterators.java Sun Aug
1 12:23:10 2010
+++ /trunk/core/src/com/google/inject/internal/util/Iterators.java Tue Oct
26 19:03:52 2010
@@ -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;
=======================================
--- /trunk/core/src/com/google/inject/internal/util/Join.java Sat Jul 3
08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/Join.java Tue Oct 26
19:03:52 2010
@@ -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;
=======================================
--- /trunk/core/src/com/google/inject/internal/util/Lists.java Sat Jul 3
08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/Lists.java Tue Oct 26
19:03:52 2010
@@ -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;
=======================================
--- /trunk/core/src/com/google/inject/internal/util/Maps.java Sat Jul 3
08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/Maps.java Tue Oct 26
19:03:52 2010
@@ -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;
=======================================
--- /trunk/core/src/com/google/inject/internal/util/Objects.java Sat Jul 3
08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/Objects.java Tue Oct 26
19:03:52 2010
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Nullable;
import java.util.Arrays;
/**
=======================================
--- /trunk/core/src/com/google/inject/internal/util/Preconditions.java Sat
Jul 3 08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/Preconditions.java Tue
Oct 26 19:03:52 2010
@@ -50,7 +50,7 @@
* 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).
=======================================
--- /trunk/core/src/com/google/inject/internal/util/Sets.java Sat Jul 3
08:51:31 2010
+++ /trunk/core/src/com/google/inject/internal/util/Sets.java Tue Oct 26
19:03:52 2010
@@ -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;
=======================================
--- /trunk/core/test/com/google/inject/NullableInjectionPointTest.java Mon
Aug 10 16:57:56 2009
+++ /trunk/core/test/com/google/inject/NullableInjectionPointTest.java Tue
Oct 26 19:03:52 2010
@@ -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;
/**
=======================================
--- /trunk/core/test/com/google/inject/internal/util/ForwardingMap.java Sat
Jul 3 08:51:31 2010
+++ /trunk/core/test/com/google/inject/internal/util/ForwardingMap.java Tue
Oct 26 19:03:52 2010
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Nullable;
import java.util.Collection;
import java.util.Map;
=======================================
--- /trunk/core/test/com/google/inject/internal/util/ForwardingSet.java Sat
Jul 3 08:51:31 2010
+++ /trunk/core/test/com/google/inject/internal/util/ForwardingSet.java Tue
Oct 26 19:03:52 2010
@@ -16,7 +16,6 @@
package com.google.inject.internal.util;
-import com.google.inject.internal.Nullable;
import java.util.Set;
=======================================
--- /trunk/core/test/com/google/inject/internal/util/MapMakerTestSuite.java
Sun Aug 1 12:23:10 2010
+++ /trunk/core/test/com/google/inject/internal/util/MapMakerTestSuite.java
Tue Oct 26 19:03:52 2010
@@ -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;
=======================================
---
/trunk/extensions/grapher/src/com/google/inject/grapher/DependencyEdge.java
Fri Feb 20 16:25:27 2009
+++
/trunk/extensions/grapher/src/com/google/inject/grapher/DependencyEdge.java
Tue Oct 26 19:03:52 2010
@@ -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;
/**
=======================================
---
/trunk/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java
Sat Jul 3 08:51:31 2010
+++
/trunk/extensions/grapher/src/com/google/inject/grapher/GraphingVisitor.java
Tue Oct 26 19:03:52 2010
@@ -21,7 +21,7 @@
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;
=======================================
---
/trunk/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistService.java
Sun Sep 12 09:05:06 2010
+++
/trunk/extensions/persist/src/com/google/inject/persist/jpa/JpaPersistService.java
Tue Oct 26 19:03:52 2010
@@ -19,7 +19,7 @@
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;
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to google-guice-...@googlegroups.com.
To unsubscribe from this group, send email to
google-guice-dev+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en.
