Rebuild guice 2.0 API spec to include spring
git-svn-id: https://google-guice.googlecode.com/svn/trunk@1282 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/lib/build/guice-2.0.xml b/lib/build/guice-2.0.xml
index 9f20716..d71b65c 100644
--- a/lib/build/guice-2.0.xml
+++ b/lib/build/guice-2.0.xml
@@ -29,6 +29,19 @@
deprecated="not deprecated"
visibility="protected"
>
+<parameter name="message" type="com.google.inject.spi.Message">
+</parameter>
+</method>
+<method name="addError"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
<parameter name="message" type="java.lang.String">
</parameter>
<parameter name="arguments" type="java.lang.Object...">
@@ -47,19 +60,6 @@
<parameter name="t" type="java.lang.Throwable">
</parameter>
</method>
-<method name="addError"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-<parameter name="message" type="com.google.inject.spi.Message">
-</parameter>
-</method>
<method name="bind"
return="com.google.inject.binder.LinkedBindingBuilder<T>"
abstract="false"
@@ -170,6 +170,17 @@
</method>
<method name="configure"
return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</method>
+<method name="configure"
+ return="void"
abstract="false"
native="false"
synchronized="true"
@@ -181,17 +192,6 @@
<parameter name="builder" type="com.google.inject.Binder">
</parameter>
</method>
-<method name="configure"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-</method>
<method name="convertToTypes"
return="void"
abstract="false"
@@ -228,7 +228,7 @@
deprecated="not deprecated"
visibility="protected"
>
-<parameter name="type" type="java.lang.Class<T>">
+<parameter name="type" type="com.google.inject.TypeLiteral<T>">
</parameter>
</method>
<method name="getMembersInjector"
@@ -241,7 +241,7 @@
deprecated="not deprecated"
visibility="protected"
>
-<parameter name="type" type="com.google.inject.TypeLiteral<T>">
+<parameter name="type" type="java.lang.Class<T>">
</parameter>
</method>
<method name="getProvider"
@@ -353,6 +353,19 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="message" type="com.google.inject.spi.Message">
+</parameter>
+</method>
+<method name="addError"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="message" type="java.lang.String">
</parameter>
<parameter name="arguments" type="java.lang.Object...">
@@ -371,19 +384,6 @@
<parameter name="t" type="java.lang.Throwable">
</parameter>
</method>
-<method name="addError"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="message" type="com.google.inject.spi.Message">
-</parameter>
-</method>
<method name="bind"
return="com.google.inject.binder.LinkedBindingBuilder<T>"
abstract="true"
@@ -717,6 +717,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<class name="ConfigurationException"
extends="java.lang.RuntimeException"
@@ -810,6 +812,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<class name="Guice"
extends="java.lang.Object"
@@ -842,19 +846,6 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="modules" type="java.lang.Iterable<? extends com.google.inject.Module>">
-</parameter>
-</method>
-<method name="createInjector"
- return="com.google.inject.Injector"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
<parameter name="stage" type="com.google.inject.Stage">
</parameter>
<parameter name="modules" type="com.google.inject.Module...">
@@ -875,6 +866,19 @@
<parameter name="modules" type="java.lang.Iterable<? extends com.google.inject.Module>">
</parameter>
</method>
+<method name="createInjector"
+ return="com.google.inject.Injector"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="modules" type="java.lang.Iterable<? extends com.google.inject.Module>">
+</parameter>
+</method>
</class>
<class name="ImplementedBy"
extends="java.lang.Object"
@@ -884,6 +888,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<class name="Inject"
extends="java.lang.Object"
@@ -893,6 +899,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<interface name="Injector"
abstract="true"
@@ -911,7 +919,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="modules" type="java.lang.Iterable<? extends com.google.inject.Module>">
+<parameter name="modules" type="com.google.inject.Module...">
</parameter>
</method>
<method name="createChildInjector"
@@ -924,7 +932,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="modules" type="com.google.inject.Module...">
+<parameter name="modules" type="java.lang.Iterable<? extends com.google.inject.Module>">
</parameter>
</method>
<method name="findBindingsByType"
@@ -1095,6 +1103,14 @@
deprecated="not deprecated"
visibility="protected"
>
+</constructor>
+<constructor name="Key"
+ type="com.google.inject.Key"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
<parameter name="annotationType" type="java.lang.Class<? extends java.lang.annotation.Annotation>">
</parameter>
</constructor>
@@ -1108,14 +1124,6 @@
<parameter name="annotation" type="java.lang.annotation.Annotation">
</parameter>
</constructor>
-<constructor name="Key"
- type="com.google.inject.Key"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-</constructor>
<method name="equals"
return="boolean"
abstract="false"
@@ -1139,6 +1147,49 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="typeLiteral" type="com.google.inject.TypeLiteral<T>">
+</parameter>
+</method>
+<method name="get"
+ return="com.google.inject.Key<T>"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="typeLiteral" type="com.google.inject.TypeLiteral<T>">
+</parameter>
+<parameter name="annotationType" type="java.lang.Class<? extends java.lang.annotation.Annotation>">
+</parameter>
+</method>
+<method name="get"
+ return="com.google.inject.Key<T>"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="typeLiteral" type="com.google.inject.TypeLiteral<T>">
+</parameter>
+<parameter name="annotation" type="java.lang.annotation.Annotation">
+</parameter>
+</method>
+<method name="get"
+ return="com.google.inject.Key<T>"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="type" type="java.lang.Class<T>">
</parameter>
</method>
@@ -1215,49 +1266,6 @@
<parameter name="annotation" type="java.lang.annotation.Annotation">
</parameter>
</method>
-<method name="get"
- return="com.google.inject.Key<T>"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="typeLiteral" type="com.google.inject.TypeLiteral<T>">
-</parameter>
-</method>
-<method name="get"
- return="com.google.inject.Key<T>"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="typeLiteral" type="com.google.inject.TypeLiteral<T>">
-</parameter>
-<parameter name="annotationType" type="java.lang.Class<? extends java.lang.annotation.Annotation>">
-</parameter>
-</method>
-<method name="get"
- return="com.google.inject.Key<T>"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="typeLiteral" type="com.google.inject.TypeLiteral<T>">
-</parameter>
-<parameter name="annotation" type="java.lang.annotation.Annotation">
-</parameter>
-</method>
<method name="getAnnotation"
return="java.lang.annotation.Annotation"
abstract="false"
@@ -1429,7 +1437,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="type" type="java.lang.Class<?>">
+<parameter name="type" type="com.google.inject.TypeLiteral<?>">
</parameter>
</method>
<method name="expose"
@@ -1442,7 +1450,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="type" type="com.google.inject.TypeLiteral<?>">
+<parameter name="type" type="java.lang.Class<?>">
</parameter>
</method>
<method name="skipSources"
@@ -1500,6 +1508,19 @@
deprecated="not deprecated"
visibility="protected"
>
+<parameter name="message" type="com.google.inject.spi.Message">
+</parameter>
+</method>
+<method name="addError"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="protected"
+>
<parameter name="message" type="java.lang.String">
</parameter>
<parameter name="arguments" type="java.lang.Object...">
@@ -1518,19 +1539,6 @@
<parameter name="t" type="java.lang.Throwable">
</parameter>
</method>
-<method name="addError"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="true"
- deprecated="not deprecated"
- visibility="protected"
->
-<parameter name="message" type="com.google.inject.spi.Message">
-</parameter>
-</method>
<method name="bind"
return="com.google.inject.binder.LinkedBindingBuilder<T>"
abstract="false"
@@ -1641,6 +1649,17 @@
</method>
<method name="configure"
return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</method>
+<method name="configure"
+ return="void"
abstract="false"
native="false"
synchronized="true"
@@ -1652,17 +1671,6 @@
<parameter name="binder" type="com.google.inject.Binder">
</parameter>
</method>
-<method name="configure"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-</method>
<method name="convertToTypes"
return="void"
abstract="false"
@@ -1712,7 +1720,7 @@
deprecated="not deprecated"
visibility="protected"
>
-<parameter name="type" type="java.lang.Class<?>">
+<parameter name="type" type="com.google.inject.TypeLiteral<?>">
</parameter>
</method>
<method name="expose"
@@ -1725,20 +1733,7 @@
deprecated="not deprecated"
visibility="protected"
>
-<parameter name="type" type="com.google.inject.TypeLiteral<?>">
-</parameter>
-</method>
-<method name="getMembersInjector"
- return="com.google.inject.MembersInjector<T>"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="protected"
->
-<parameter name="type" type="java.lang.Class<T>">
+<parameter name="type" type="java.lang.Class<?>">
</parameter>
</method>
<method name="getMembersInjector"
@@ -1754,6 +1749,19 @@
<parameter name="type" type="com.google.inject.TypeLiteral<T>">
</parameter>
</method>
+<method name="getMembersInjector"
+ return="com.google.inject.MembersInjector<T>"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+<parameter name="type" type="java.lang.Class<T>">
+</parameter>
+</method>
<method name="getProvider"
return="com.google.inject.Provider<T>"
abstract="false"
@@ -1854,6 +1862,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<interface name="Provider"
abstract="true"
@@ -1882,6 +1892,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<class name="ProvisionException"
extends="java.lang.RuntimeException"
@@ -1910,8 +1922,6 @@
>
<parameter name="message" type="java.lang.String">
</parameter>
-<parameter name="cause" type="java.lang.Throwable">
-</parameter>
</constructor>
<constructor name="ProvisionException"
type="com.google.inject.ProvisionException"
@@ -1922,6 +1932,8 @@
>
<parameter name="message" type="java.lang.String">
</parameter>
+<parameter name="cause" type="java.lang.Throwable">
+</parameter>
</constructor>
<method name="getErrorMessages"
return="java.util.Collection<com.google.inject.spi.Message>"
@@ -1977,6 +1989,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<class name="Scopes"
extends="java.lang.Object"
@@ -2015,6 +2029,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<class name="Stage"
extends="java.lang.Enum"
@@ -2079,19 +2095,6 @@
</parameter>
</method>
<method name="get"
- return="com.google.inject.TypeLiteral<?>"
- abstract="false"
- native="false"
- synchronized="false"
- static="true"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="type" type="java.lang.reflect.Type">
-</parameter>
-</method>
-<method name="get"
return="com.google.inject.TypeLiteral<T>"
abstract="false"
native="false"
@@ -2104,6 +2107,19 @@
<parameter name="type" type="java.lang.Class<T>">
</parameter>
</method>
+<method name="get"
+ return="com.google.inject.TypeLiteral<?>"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="type" type="java.lang.reflect.Type">
+</parameter>
+</method>
<method name="getExceptionTypes"
return="java.util.List<com.google.inject.TypeLiteral<?>>"
abstract="false"
@@ -2225,6 +2241,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<class name="AssistedInject"
extends="java.lang.Object"
@@ -2234,6 +2252,8 @@
deprecated="deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<class name="FactoryProvider"
extends="java.lang.Object"
@@ -2279,9 +2299,9 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="factoryType" type="java.lang.Class<F>">
+<parameter name="factoryType" type="com.google.inject.TypeLiteral<F>">
</parameter>
-<parameter name="implementationType" type="java.lang.Class<?>">
+<parameter name="implementationType" type="com.google.inject.TypeLiteral<?>">
</parameter>
</method>
<method name="newFactory"
@@ -2294,9 +2314,9 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="factoryType" type="com.google.inject.TypeLiteral<F>">
+<parameter name="factoryType" type="java.lang.Class<F>">
</parameter>
-<parameter name="implementationType" type="com.google.inject.TypeLiteral<?>">
+<parameter name="implementationType" type="java.lang.Class<?>">
</parameter>
</method>
</class>
@@ -2424,33 +2444,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="value" type="java.lang.String">
-</parameter>
-</method>
-<method name="to"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="value" type="int">
-</parameter>
-</method>
-<method name="to"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="value" type="long">
+<parameter name="value" type="E">
</parameter>
</method>
<method name="to"
@@ -2476,6 +2470,19 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="value" type="char">
+</parameter>
+</method>
+<method name="to"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="value" type="double">
</parameter>
</method>
@@ -2502,20 +2509,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="value" type="short">
-</parameter>
-</method>
-<method name="to"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="value" type="char">
+<parameter name="value" type="int">
</parameter>
</method>
<method name="to"
@@ -2541,7 +2535,33 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="value" type="E">
+<parameter name="value" type="java.lang.String">
+</parameter>
+</method>
+<method name="to"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="value" type="long">
+</parameter>
+</method>
+<method name="to"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="value" type="short">
</parameter>
</method>
</interface>
@@ -2564,7 +2584,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="implementation" type="java.lang.Class<? extends T>">
+<parameter name="targetKey" type="com.google.inject.Key<? extends T>">
</parameter>
</method>
<method name="to"
@@ -2590,7 +2610,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="targetKey" type="com.google.inject.Key<? extends T>">
+<parameter name="implementation" type="java.lang.Class<? extends T>">
</parameter>
</method>
<method name="toInstance"
@@ -2616,6 +2636,19 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="providerKey" type="com.google.inject.Key<? extends com.google.inject.Provider<? extends T>>">
+</parameter>
+</method>
+<method name="toProvider"
+ return="com.google.inject.binder.ScopedBindingBuilder"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="provider" type="com.google.inject.Provider<? extends T>">
</parameter>
</method>
@@ -2632,19 +2665,6 @@
<parameter name="providerType" type="java.lang.Class<? extends com.google.inject.Provider<? extends T>>">
</parameter>
</method>
-<method name="toProvider"
- return="com.google.inject.binder.ScopedBindingBuilder"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="providerKey" type="com.google.inject.Key<? extends com.google.inject.Provider<? extends T>>">
-</parameter>
-</method>
</interface>
<interface name="ScopedBindingBuilder"
abstract="true"
@@ -2674,7 +2694,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="scopeAnnotation" type="java.lang.Class<? extends java.lang.annotation.Annotation>">
+<parameter name="scope" type="com.google.inject.Scope">
</parameter>
</method>
<method name="in"
@@ -2687,7 +2707,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="scope" type="com.google.inject.Scope">
+<parameter name="scopeAnnotation" type="java.lang.Class<? extends java.lang.annotation.Annotation>">
</parameter>
</method>
</interface>
@@ -3003,9 +3023,11 @@
>
<parameter name="binder" type="com.google.inject.Binder">
</parameter>
-<parameter name="keyType" type="java.lang.Class<K>">
+<parameter name="keyType" type="com.google.inject.TypeLiteral<K>">
</parameter>
-<parameter name="valueType" type="java.lang.Class<V>">
+<parameter name="valueType" type="com.google.inject.TypeLiteral<V>">
+</parameter>
+<parameter name="annotationType" type="java.lang.Class<? extends java.lang.annotation.Annotation>">
</parameter>
</method>
<method name="newMapBinder"
@@ -3043,8 +3065,6 @@
</parameter>
<parameter name="valueType" type="java.lang.Class<V>">
</parameter>
-<parameter name="annotation" type="java.lang.annotation.Annotation">
-</parameter>
</method>
<method name="newMapBinder"
return="com.google.inject.multibindings.MapBinder<K, V>"
@@ -3058,9 +3078,9 @@
>
<parameter name="binder" type="com.google.inject.Binder">
</parameter>
-<parameter name="keyType" type="com.google.inject.TypeLiteral<K>">
+<parameter name="keyType" type="java.lang.Class<K>">
</parameter>
-<parameter name="valueType" type="com.google.inject.TypeLiteral<V>">
+<parameter name="valueType" type="java.lang.Class<V>">
</parameter>
<parameter name="annotationType" type="java.lang.Class<? extends java.lang.annotation.Annotation>">
</parameter>
@@ -3081,7 +3101,7 @@
</parameter>
<parameter name="valueType" type="java.lang.Class<V>">
</parameter>
-<parameter name="annotationType" type="java.lang.Class<? extends java.lang.annotation.Annotation>">
+<parameter name="annotation" type="java.lang.annotation.Annotation">
</parameter>
</method>
</class>
@@ -3131,7 +3151,9 @@
>
<parameter name="binder" type="com.google.inject.Binder">
</parameter>
-<parameter name="type" type="java.lang.Class<T>">
+<parameter name="type" type="com.google.inject.TypeLiteral<T>">
+</parameter>
+<parameter name="annotationType" type="java.lang.Class<? extends java.lang.annotation.Annotation>">
</parameter>
</method>
<method name="newSetBinder"
@@ -3165,8 +3187,6 @@
</parameter>
<parameter name="type" type="java.lang.Class<T>">
</parameter>
-<parameter name="annotation" type="java.lang.annotation.Annotation">
-</parameter>
</method>
<method name="newSetBinder"
return="com.google.inject.multibindings.Multibinder<T>"
@@ -3180,7 +3200,7 @@
>
<parameter name="binder" type="com.google.inject.Binder">
</parameter>
-<parameter name="type" type="com.google.inject.TypeLiteral<T>">
+<parameter name="type" type="java.lang.Class<T>">
</parameter>
<parameter name="annotationType" type="java.lang.Class<? extends java.lang.annotation.Annotation>">
</parameter>
@@ -3199,7 +3219,7 @@
</parameter>
<parameter name="type" type="java.lang.Class<T>">
</parameter>
-<parameter name="annotationType" type="java.lang.Class<? extends java.lang.annotation.Annotation>">
+<parameter name="annotation" type="java.lang.annotation.Annotation">
</parameter>
</method>
</class>
@@ -3214,6 +3234,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<class name="Names"
extends="java.lang.Object"
@@ -3396,6 +3418,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<class name="RequestScoped"
extends="java.lang.Object"
@@ -3405,6 +3429,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
<class name="ServletModule"
extends="com.google.inject.AbstractModule"
@@ -3522,19 +3548,6 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="filterKey" type="java.lang.Class<? extends Filter>">
-</parameter>
-</method>
-<method name="through"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
<parameter name="filterKey" type="com.google.inject.Key<? extends Filter>">
</parameter>
</method>
@@ -3548,7 +3561,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="dummyFilterClass" type="java.lang.Class<? extends Filter>">
+<parameter name="dummyFilterClass" type="com.google.inject.Key<? extends Filter>">
</parameter>
<parameter name="contextParams" type="java.util.Map<java.lang.String, java.lang.String>">
</parameter>
@@ -3563,7 +3576,20 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="dummyFilterClass" type="com.google.inject.Key<? extends Filter>">
+<parameter name="filterKey" type="java.lang.Class<? extends Filter>">
+</parameter>
+</method>
+<method name="through"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="dummyFilterClass" type="java.lang.Class<? extends Filter>">
</parameter>
<parameter name="contextParams" type="java.util.Map<java.lang.String, java.lang.String>">
</parameter>
@@ -3586,19 +3612,6 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="servletKey" type="java.lang.Class<? extends HttpServlet>">
-</parameter>
-</method>
-<method name="with"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
<parameter name="servletKey" type="com.google.inject.Key<? extends HttpServlet>">
</parameter>
</method>
@@ -3612,7 +3625,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="servletKey" type="java.lang.Class<? extends HttpServlet>">
+<parameter name="servletKey" type="com.google.inject.Key<? extends HttpServlet>">
</parameter>
<parameter name="contextParams" type="java.util.Map<java.lang.String, java.lang.String>">
</parameter>
@@ -3627,7 +3640,20 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="servletKey" type="com.google.inject.Key<? extends HttpServlet>">
+<parameter name="servletKey" type="java.lang.Class<? extends HttpServlet>">
+</parameter>
+</method>
+<method name="with"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="servletKey" type="java.lang.Class<? extends HttpServlet>">
</parameter>
<parameter name="contextParams" type="java.util.Map<java.lang.String, java.lang.String>">
</parameter>
@@ -3670,6 +3696,8 @@
deprecated="not deprecated"
visibility="public"
>
+<implements name="java.lang.annotation.Annotation">
+</implements>
</class>
</package>
<package name="com.google.inject.spi"
@@ -3747,6 +3775,45 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="binding" type="com.google.inject.spi.ConstructorBinding<? extends T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="binding" type="com.google.inject.spi.ConvertedConstantBinding<? extends T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="binding" type="com.google.inject.spi.ExposedBinding<? extends T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="binding" type="com.google.inject.spi.InstanceBinding<? extends T>">
</parameter>
</method>
@@ -3760,6 +3827,32 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="binding" type="com.google.inject.spi.LinkedKeyBinding<? extends T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="binding" type="com.google.inject.spi.ProviderBinding<? extends T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="binding" type="com.google.inject.spi.ProviderInstanceBinding<? extends T>">
</parameter>
</method>
@@ -3786,74 +3879,9 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="binding" type="com.google.inject.spi.LinkedKeyBinding<? extends T>">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="binding" type="com.google.inject.spi.ExposedBinding<? extends T>">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
<parameter name="binding" type="com.google.inject.spi.UntargettedBinding<? extends T>">
</parameter>
</method>
-<method name="visit"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="binding" type="com.google.inject.spi.ConstructorBinding<? extends T>">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="binding" type="com.google.inject.spi.ConvertedConstantBinding<? extends T>">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="binding" type="com.google.inject.spi.ProviderBinding<? extends T>">
-</parameter>
-</method>
</interface>
<interface name="ConstructorBinding"
abstract="true"
@@ -4051,6 +4079,45 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="constructorBinding" type="com.google.inject.spi.ConstructorBinding<? extends T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="convertedConstantBinding" type="com.google.inject.spi.ConvertedConstantBinding<? extends T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="exposedBinding" type="com.google.inject.spi.ExposedBinding<? extends T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="instanceBinding" type="com.google.inject.spi.InstanceBinding<? extends T>">
</parameter>
</method>
@@ -4064,6 +4131,32 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="linkedKeyBinding" type="com.google.inject.spi.LinkedKeyBinding<? extends T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="providerBinding" type="com.google.inject.spi.ProviderBinding<? extends T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="providerInstanceBinding" type="com.google.inject.spi.ProviderInstanceBinding<? extends T>">
</parameter>
</method>
@@ -4090,74 +4183,9 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="linkedKeyBinding" type="com.google.inject.spi.LinkedKeyBinding<? extends T>">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="exposedBinding" type="com.google.inject.spi.ExposedBinding<? extends T>">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
<parameter name="untargettedBinding" type="com.google.inject.spi.UntargettedBinding<? extends T>">
</parameter>
</method>
-<method name="visit"
- return="V"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="constructorBinding" type="com.google.inject.spi.ConstructorBinding<? extends T>">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="convertedConstantBinding" type="com.google.inject.spi.ConvertedConstantBinding<? extends T>">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="providerBinding" type="com.google.inject.spi.ProviderBinding<? extends T>">
-</parameter>
-</method>
<method name="visitOther"
return="V"
abstract="false"
@@ -4200,19 +4228,6 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="message" type="com.google.inject.spi.Message">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
<parameter name="binding" type="com.google.inject.Binding<T>">
</parameter>
</method>
@@ -4226,58 +4241,6 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="interceptorBinding" type="com.google.inject.spi.InterceptorBinding">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="scopeBinding" type="com.google.inject.spi.ScopeBinding">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="typeConverterBinding" type="com.google.inject.spi.TypeConverterBinding">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="providerLookup" type="com.google.inject.spi.ProviderLookup<T>">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
<parameter name="injectionRequest" type="com.google.inject.spi.InjectionRequest">
</parameter>
</method>
@@ -4291,7 +4254,33 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="staticInjectionRequest" type="com.google.inject.spi.StaticInjectionRequest">
+<parameter name="interceptorBinding" type="com.google.inject.spi.InterceptorBinding">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="lookup" type="com.google.inject.spi.MembersInjectorLookup<T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="com.google.inject.spi.Message">
</parameter>
</method>
<method name="visit"
@@ -4317,7 +4306,46 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="lookup" type="com.google.inject.spi.MembersInjectorLookup<T>">
+<parameter name="providerLookup" type="com.google.inject.spi.ProviderLookup<T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="scopeBinding" type="com.google.inject.spi.ScopeBinding">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="staticInjectionRequest" type="com.google.inject.spi.StaticInjectionRequest">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="typeConverterBinding" type="com.google.inject.spi.TypeConverterBinding">
</parameter>
</method>
<method name="visit"
@@ -4501,45 +4529,6 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="binding" type="com.google.inject.spi.InterceptorBinding">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="binding" type="com.google.inject.spi.ScopeBinding">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="binding" type="com.google.inject.spi.TypeConverterBinding">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
<parameter name="request" type="com.google.inject.spi.InjectionRequest">
</parameter>
</method>
@@ -4553,20 +4542,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="request" type="com.google.inject.spi.StaticInjectionRequest">
-</parameter>
-</method>
-<method name="visit"
- return="V"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="lookup" type="com.google.inject.spi.ProviderLookup<T>">
+<parameter name="binding" type="com.google.inject.spi.InterceptorBinding">
</parameter>
</method>
<method name="visit"
@@ -4618,6 +4594,58 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="lookup" type="com.google.inject.spi.ProviderLookup<T>">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="binding" type="com.google.inject.spi.ScopeBinding">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="request" type="com.google.inject.spi.StaticInjectionRequest">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="binding" type="com.google.inject.spi.TypeConverterBinding">
+</parameter>
+</method>
+<method name="visit"
+ return="V"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="binding" type="com.google.inject.spi.TypeListenerBinding">
</parameter>
</method>
@@ -4676,6 +4704,8 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="stage" type="com.google.inject.Stage">
+</parameter>
<parameter name="modules" type="java.lang.Iterable<? extends com.google.inject.Module>">
</parameter>
</method>
@@ -4689,8 +4719,6 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="stage" type="com.google.inject.Stage">
-</parameter>
<parameter name="modules" type="java.lang.Iterable<? extends com.google.inject.Module>">
</parameter>
</method>
@@ -5260,20 +5288,6 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="sources" type="java.util.List<java.lang.Object>">
-</parameter>
-<parameter name="message" type="java.lang.String">
-</parameter>
-<parameter name="cause" type="java.lang.Throwable">
-</parameter>
-</constructor>
-<constructor name="Message"
- type="com.google.inject.spi.Message"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
<parameter name="source" type="java.lang.Object">
</parameter>
<parameter name="message" type="java.lang.String">
@@ -5289,6 +5303,20 @@
<parameter name="message" type="java.lang.String">
</parameter>
</constructor>
+<constructor name="Message"
+ type="com.google.inject.spi.Message"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="sources" type="java.util.List<java.lang.Object>">
+</parameter>
+<parameter name="message" type="java.lang.String">
+</parameter>
+<parameter name="cause" type="java.lang.Throwable">
+</parameter>
+</constructor>
<method name="acceptVisitor"
return="T"
abstract="false"
@@ -5862,6 +5890,19 @@
deprecated="not deprecated"
visibility="public"
>
+<parameter name="message" type="com.google.inject.spi.Message">
+</parameter>
+</method>
+<method name="addError"
+ return="void"
+ abstract="true"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
<parameter name="message" type="java.lang.String">
</parameter>
<parameter name="arguments" type="java.lang.Object...">
@@ -5880,19 +5921,6 @@
<parameter name="t" type="java.lang.Throwable">
</parameter>
</method>
-<method name="addError"
- return="void"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="message" type="com.google.inject.spi.Message">
-</parameter>
-</method>
<method name="bindInterceptor"
return="void"
abstract="true"
@@ -6091,6 +6119,48 @@
</implements>
</interface>
</package>
+<package name="com.google.inject.spring"
+>
+<class name="SpringIntegration"
+ extends="java.lang.Object"
+ abstract="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<method name="bindAll"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="binder" type="com.google.inject.Binder">
+</parameter>
+<parameter name="beanFactory" type="ListableBeanFactory">
+</parameter>
+</method>
+<method name="fromSpring"
+ return="com.google.inject.Provider<T>"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="type" type="java.lang.Class<T>">
+</parameter>
+<parameter name="name" type="java.lang.String">
+</parameter>
+</method>
+</class>
+</package>
<package name="com.google.inject.throwingproviders"
>
<interface name="ThrowingProvider"
@@ -6220,7 +6290,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="targetType" type="java.lang.Class<? extends P>">
+<parameter name="targetKey" type="com.google.inject.Key<? extends P>">
</parameter>
</method>
<method name="to"
@@ -6233,7 +6303,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="targetKey" type="com.google.inject.Key<? extends P>">
+<parameter name="targetType" type="java.lang.Class<? extends P>">
</parameter>
</method>
</class>
