deprecated ThrowingProvider in favor of CheckedProvider, which lets you specify more than one exception type. remove tentative @ThrowingProvides in favor of @CheckedProvides. add tests.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1373 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderMethodsModule.java b/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderMethodsModule.java
index 528782a..cfb46a4 100644
--- a/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderMethodsModule.java
+++ b/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderMethodsModule.java
@@ -37,7 +37,7 @@
import java.util.logging.Logger;
/**
- * Creates bindings to methods annotated with {@literal @}{@link ThrowingProvides}. Use the scope
+ * Creates bindings to methods annotated with {@literal @}{@link CheckedProvides}. Use the scope
* and binding annotations on the provider method to configure the binding.
*
* @author sameb@google.com (Sam Berlin)
@@ -73,10 +73,10 @@
List<ThrowingProviderMethod<?>> result = Lists.newArrayList();
for (Class<?> c = delegate.getClass(); c != Object.class; c = c.getSuperclass()) {
for (Method method : c.getDeclaredMethods()) {
- ThrowingProvides throwingProvides =
- (ThrowingProvides)method.getAnnotation(ThrowingProvides.class);
- if(throwingProvides != null) {
- result.add(createProviderMethod(binder, method, throwingProvides.value()));
+ CheckedProvides checkedProvides =
+ (CheckedProvides)method.getAnnotation(CheckedProvides.class);
+ if(checkedProvides != null) {
+ result.add(createProviderMethod(binder, method, checkedProvides.value()));
}
}
}
@@ -84,7 +84,7 @@
}
<T> ThrowingProviderMethod<T> createProviderMethod(Binder binder, final Method method,
- Class<? extends ThrowingProvider> throwingProvider) {
+ Class<? extends CheckedProvider> throwingProvider) {
binder = binder.withSource(method);
Errors errors = new Errors(method);