rm jsr330, move the one method into Providers.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1437 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/core/src/com/google/inject/util/Jsr330.java b/core/src/com/google/inject/util/Jsr330.java
deleted file mode 100644
index 90e1af6..0000000
--- a/core/src/com/google/inject/util/Jsr330.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (C) 2009 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.util;
-
-import static com.google.inject.internal.util.Preconditions.checkNotNull;
-import javax.inject.Provider;
-
-/**
- * Utility methods for use with <a href="http://code.google.com/p/atinject/">JSR
- * 330</a>.
- *
- * @author jessewilson@google.com (Jesse Wilson)
- * @since 3.0
- */
-public final class Jsr330 {
-
- private Jsr330() {}
-
- /**
- * Returns a Guice-friendly {@code com.google.inject.Provider} for the given
- * JSR-330 {@code javax.inject.Provider}. The converse method is unnecessary,
- * since Guice providers directly implement the JSR-330 interface.
- */
- public static <T> com.google.inject.Provider<T> guicify(Provider<T> provider) {
- if (provider instanceof com.google.inject.Provider) {
- return (com.google.inject.Provider<T>) provider;
- }
-
- final Provider<T> delegate = checkNotNull(provider, "provider");
- return new com.google.inject.Provider<T>() {
- public T get() {
- return delegate.get();
- }
-
- @Override public String toString() {
- return "guicified(" + delegate + ")";
- }
- };
- }
-}
diff --git a/core/src/com/google/inject/util/Providers.java b/core/src/com/google/inject/util/Providers.java
index 1c2fed2..5c7fa1e 100644
--- a/core/src/com/google/inject/util/Providers.java
+++ b/core/src/com/google/inject/util/Providers.java
@@ -16,6 +16,8 @@
package com.google.inject.util;
+import static com.google.inject.internal.util.Preconditions.checkNotNull;
+
import com.google.inject.Provider;
/**
@@ -49,4 +51,26 @@
}
};
}
+
+ /**
+ * Returns a Guice-friendly {@code com.google.inject.Provider} for the given
+ * JSR-330 {@code javax.inject.Provider}. The converse method is unnecessary,
+ * since Guice providers directly implement the JSR-330 interface.
+ */
+ public static <T> Provider<T> guicify(javax.inject.Provider<T> provider) {
+ if (provider instanceof Provider) {
+ return (Provider<T>) provider;
+ }
+
+ final javax.inject.Provider<T> delegate = checkNotNull(provider, "provider");
+ return new Provider<T>() {
+ public T get() {
+ return delegate.get();
+ }
+
+ @Override public String toString() {
+ return "guicified(" + delegate + ")";
+ }
+ };
+ }
}
diff --git a/core/test/com/googlecode/guice/Jsr330Test.java b/core/test/com/googlecode/guice/Jsr330Test.java
index 66ea301..c2f06e8 100644
--- a/core/test/com/googlecode/guice/Jsr330Test.java
+++ b/core/test/com/googlecode/guice/Jsr330Test.java
@@ -27,7 +27,8 @@
import com.google.inject.Stage;
import com.google.inject.TypeLiteral;
import com.google.inject.name.Names;
-import com.google.inject.util.Jsr330;
+import com.google.inject.util.Providers;
+
import java.lang.annotation.Annotation;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -257,12 +258,12 @@
}
};
- com.google.inject.Provider<String> guicified = Jsr330.guicify(jsr330Provider);
+ com.google.inject.Provider<String> guicified = Providers.guicify(jsr330Provider);
assertEquals("guicified(jsr330Provider)", guicified.toString());
assertEquals("A", guicified.get());
// when you guicify the Guice-friendly, it's a no-op
- assertSame(guicified, Jsr330.guicify(guicified));
+ assertSame(guicified, Providers.guicify(guicified));
}
static class A {
