Re-add the Injector.getInstance() methods which were removed frankly by mistake.

git-svn-id: https://google-guice.googlecode.com/svn/trunk@244 d779f126-a31b-0410-b53b-1d3aecad763e

16 files changed, 56 insertions, 36 deletions

diff --git a/servlet/test/com/google/inject/servlet/ServletTest.java b/servlet/test/com/google/inject/servlet/ServletTest.java
index 4981482b..43e6b864 100644
--- a/servlet/test/com/google/inject/servlet/ServletTest.java
+++ b/servlet/test/com/google/inject/servlet/ServletTest.java
@@ -59,7 +59,7 @@ public class ServletTest extends TestCase {
           ServletResponse servletResponse) {
         invoked[0] = true;
         assertSame(request, servletRequest);
-        assertNotNull(injector.getProvider(InRequest.class).get());
+        assertNotNull(injector.getInstance(InRequest.class));
       }
     };
 
@@ -89,8 +89,8 @@ public class ServletTest extends TestCase {
           ServletResponse servletResponse) {
         invoked[0] = true;
         assertSame(request, servletRequest);
-        assertSame(inRequest, injector.getProvider(InRequest.class).get());
-        assertSame(inRequest, injector.getProvider(InRequest.class).get());
+        assertSame(inRequest, injector.getInstance(InRequest.class));
+        assertSame(inRequest, injector.getInstance(InRequest.class));
       }
     };
 
@@ -123,7 +123,7 @@ public class ServletTest extends TestCase {
           ServletResponse servletResponse) {
         invoked[0] = true;
         assertSame(request, servletRequest);
-        assertNotNull(injector.getProvider(InSession.class).get());
+        assertNotNull(injector.getInstance(InSession.class));
       }
     };
 
@@ -157,8 +157,8 @@ public class ServletTest extends TestCase {
         invoked[0] = true;
         assertSame(request, servletRequest);
 
-        assertSame(inSession, injector.getProvider(InSession.class).get());
-        assertSame(inSession, injector.getProvider(InSession.class).get());
+        assertSame(inSession, injector.getInstance(InSession.class));
+        assertSame(inSession, injector.getInstance(InSession.class));
       }
     };
 
diff --git a/src/com/google/inject/Injector.java b/src/com/google/inject/Injector.java
index 66e816dc..60f8fee7 100644
--- a/src/com/google/inject/Injector.java
+++ b/src/com/google/inject/Injector.java
@@ -76,4 +76,16 @@ public interface Injector {
    * Gets the provider bound to the given type.
    */
   <T> Provider<T> getProvider(Class<T> type);
+
+  /**
+   * Gets an instance bound to the given key; equivalent to
+   * {@code getProvider(key).get()}.
+   */
+  <T> T getInstance(Key<T> key);
+
+  /**
+   * Gets an instance bound to the given type; equivalent to
+   * {@code getProvider(type).get()}.
+   */
+  <T> T getInstance(Class<T> type);
 }
diff --git a/src/com/google/inject/InjectorImpl.java b/src/com/google/inject/InjectorImpl.java
index c2af1b4c..d878820a 100644
--- a/src/com/google/inject/InjectorImpl.java
+++ b/src/com/google/inject/InjectorImpl.java
@@ -713,6 +713,14 @@ class InjectorImpl implements Injector {
     };
   }
 
+  public <T> T getInstance(Key<T> key) {
+    return getProvider(key).get();
+  }
+
+  public <T> T getInstance(Class<T> type) {
+    return getProvider(type).get();
+  }
+
   final ThreadLocal<InternalContext[]> localContext
       = new ThreadLocal<InternalContext[]>() {
     protected InternalContext[] initialValue() {
diff --git a/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java b/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java
index 2730c013..613e84d1 100644
--- a/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java
+++ b/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java
@@ -117,7 +117,7 @@ public class GuiceObjectFactory extends ObjectFactory {
       }
     }
 
-    return injector.getProvider(clazz).get();
+    return injector.getInstance(clazz);
   }
 
   public Interceptor buildInterceptor(InterceptorConfig interceptorConfig,
diff --git a/test/com/google/inject/BindingAnnotationTest.java b/test/com/google/inject/BindingAnnotationTest.java
index eca308f6..65a0dea1 100644
--- a/test/com/google/inject/BindingAnnotationTest.java
+++ b/test/com/google/inject/BindingAnnotationTest.java
@@ -34,7 +34,7 @@ public class BindingAnnotationTest extends TestCase {
       }
     });
 
-    Foo foo = c.getProvider(Foo.class).get();
+    Foo foo = c.getInstance(Foo.class);
 
     assertEquals("foo", foo.s);
   }
diff --git a/test/com/google/inject/BoundInstanceInjectionTest.java b/test/com/google/inject/BoundInstanceInjectionTest.java
index d23a0da6..ca462be8 100644
--- a/test/com/google/inject/BoundInstanceInjectionTest.java
+++ b/test/com/google/inject/BoundInstanceInjectionTest.java
@@ -59,7 +59,7 @@ public class BoundInstanceInjectionTest extends TestCase {
       }
     });
 
-    assertEquals(5, injector.getProvider(O.class).get().fromMethod);
+    assertEquals(5, injector.getInstance(O.class).fromMethod);
   }
 
 }
diff --git a/test/com/google/inject/BoundProviderTest.java b/test/com/google/inject/BoundProviderTest.java
index 80b4d2fb..df20ba7f 100644
--- a/test/com/google/inject/BoundProviderTest.java
+++ b/test/com/google/inject/BoundProviderTest.java
@@ -28,8 +28,8 @@ public class BoundProviderTest extends TestCase {
     cb.bind(Foo.class).toProvider(FooProvider.class);
     Injector c = cb.createInjector();
 
-    Foo a = c.getProvider(Foo.class).get();
-    Foo b = c.getProvider(Foo.class).get();
+    Foo a = c.getInstance(Foo.class);
+    Foo b = c.getInstance(Foo.class);
 
     assertEquals(0, a.i);
     assertEquals(0, b.i);
@@ -43,8 +43,8 @@ public class BoundProviderTest extends TestCase {
     cb.bind(Foo.class).toProvider(SingletonFooProvider.class);
     Injector c = cb.createInjector();
 
-    Foo a = c.getProvider(Foo.class).get();
-    Foo b = c.getProvider(Foo.class).get();
+    Foo a = c.getInstance(Foo.class);
+    Foo b = c.getInstance(Foo.class);
 
     assertEquals(0, a.i);
     assertEquals(1, b.i);
diff --git a/test/com/google/inject/CircularDependencyTest.java b/test/com/google/inject/CircularDependencyTest.java
index c59a9a6e..14c8b256 100644
--- a/test/com/google/inject/CircularDependencyTest.java
+++ b/test/com/google/inject/CircularDependencyTest.java
@@ -30,7 +30,7 @@ public class CircularDependencyTest extends TestCase {
     builder.bind(B.class).to(BImpl.class);
 
     Injector injector = builder.createInjector();
-    A a = injector.getProvider(AImpl.class).get();
+    A a = injector.getInstance(AImpl.class);
     assertNotNull(a.getB().getA());
   }
 
diff --git a/test/com/google/inject/ConstantConversionTest.java b/test/com/google/inject/ConstantConversionTest.java
index 8ad648f8..abc049bf 100644
--- a/test/com/google/inject/ConstantConversionTest.java
+++ b/test/com/google/inject/ConstantConversionTest.java
@@ -65,7 +65,7 @@ public class ConstantConversionTest extends TestCase {
     builder.bindConstant(NumericValue.class).to("5");
     builder.bind(Simple.class);
     Injector injector = builder.createInjector();
-    Simple simple = injector.getProvider(Simple.class).get();
+    Simple simple = injector.getInstance(Simple.class);
     assertEquals(5, simple.i);
   }
 
@@ -80,7 +80,7 @@ public class ConstantConversionTest extends TestCase {
     b.bindConstant(EnumValue.class).to("TEE");
     b.bindConstant(ClassName.class).to(Foo.class.getName());
     Injector c = b.createInjector();
-    Foo foo = c.getProvider(Foo.class).get();
+    Foo foo = c.getInstance(Foo.class);
 
     checkNumbers(
       foo.integerField,
@@ -112,7 +112,7 @@ public class ConstantConversionTest extends TestCase {
     b.bindConstant(NumericValue.class).to("invalid");
     Injector c = b.createInjector();
     try {
-      c.getProvider(InvalidInteger.class).get();
+      c.getInstance(InvalidInteger.class);
       fail();
     } catch (ConfigurationException e) { /* expected */ }
   }
@@ -126,7 +126,7 @@ public class ConstantConversionTest extends TestCase {
     b.bindConstant(NumericValue.class).to("invalid");
     Injector c = b.createInjector();
     try {
-      c.getProvider(InvalidCharacter.class).get();
+      c.getInstance(InvalidCharacter.class);
       fail();
     } catch (ConfigurationException e) { /* expected */ }
   }
@@ -140,7 +140,7 @@ public class ConstantConversionTest extends TestCase {
     b.bindConstant(NumericValue.class).to("invalid");
     Injector c = b.createInjector();
     try {
-      c.getProvider(InvalidEnum.class).get();
+      c.getInstance(InvalidEnum.class);
       fail();
     } catch (ConfigurationException e) { /* expected */ }
   }
diff --git a/test/com/google/inject/GenericInjectionTest.java b/test/com/google/inject/GenericInjectionTest.java
index 17f75f72..2281b596 100644
--- a/test/com/google/inject/GenericInjectionTest.java
+++ b/test/com/google/inject/GenericInjectionTest.java
@@ -30,7 +30,7 @@ public class GenericInjectionTest extends TestCase {
     BinderImpl builder = new BinderImpl();
     builder.bind(new TypeLiteral<List<String>>() {}).toInstance(names);
     Injector injector = builder.createInjector();
-    Foo foo = injector.getProvider(Foo.class).get();
+    Foo foo = injector.getInstance(Foo.class);
     assertEquals(names, foo.names);
   }
 
diff --git a/test/com/google/inject/ImplicitBindingTest.java b/test/com/google/inject/ImplicitBindingTest.java
index ce280210..c07761ac 100644
--- a/test/com/google/inject/ImplicitBindingTest.java
+++ b/test/com/google/inject/ImplicitBindingTest.java
@@ -25,7 +25,7 @@ public class ImplicitBindingTest extends TestCase {
 
   public void testCircularDependency() throws CreationException {
     Injector injector = Guice.createInjector();
-    Foo foo = injector.getProvider(Foo.class).get();
+    Foo foo = injector.getInstance(Foo.class);
     assertSame(foo, foo.bar.foo);
   }
 
diff --git a/test/com/google/inject/InjectorTest.java b/test/com/google/inject/InjectorTest.java
index 01085e7f..6b314731 100644
--- a/test/com/google/inject/InjectorTest.java
+++ b/test/com/google/inject/InjectorTest.java
@@ -46,18 +46,18 @@ public class InjectorTest extends TestCase {
     Injector injector = builder.createInjector();
 
     assertSame(singleton,
-        injector.getProvider(Key.get(SampleSingleton.class)).get());
-    assertSame(singleton, injector.getProvider(SampleSingleton.class).get());
+        injector.getInstance(Key.get(SampleSingleton.class)));
+    assertSame(singleton, injector.getInstance(SampleSingleton.class));
 
     assertSame(other,
-        injector.getProvider(Key.get(SampleSingleton.class, Other.class)).get());
+        injector.getInstance(Key.get(SampleSingleton.class, Other.class)));
   }
 
   static class SampleSingleton {}
 
   public void testInjection() throws CreationException {
     Injector injector = createFooInjector();
-    Foo foo = injector.getProvider(Foo.class).get();
+    Foo foo = injector.getInstance(Foo.class);
 
     assertEquals("test", foo.s);
     assertEquals("test", foo.bar.getTee().getS());
@@ -83,7 +83,7 @@ public class InjectorTest extends TestCase {
   public void testGetInstance() throws CreationException {
     Injector injector = createFooInjector();
 
-    Bar bar = injector.getProvider(Key.get(Bar.class)).get();
+    Bar bar = injector.getInstance(Key.get(Bar.class));
     assertEquals("test", bar.getTee().getS());
     assertEquals(5, bar.getI());
   }
@@ -93,7 +93,7 @@ public class InjectorTest extends TestCase {
     BinderImpl builder = new BinderImpl();
     builder.bindConstant(I.class).to(5);
     Injector injector = builder.createInjector();
-    IntegerWrapper iw = injector.getProvider(IntegerWrapper.class).get();
+    IntegerWrapper iw = injector.getInstance(IntegerWrapper.class);
     assertEquals(5, (int) iw.i);
   }
 
@@ -175,7 +175,7 @@ public class InjectorTest extends TestCase {
     builder.bind(B.class).to(BImpl.class);
 
     Injector injector = builder.createInjector();
-    A a = injector.getProvider(AImpl.class).get();
+    A a = injector.getInstance(AImpl.class);
     assertNotNull(a.getB().getA());
   }
 
@@ -238,7 +238,7 @@ public class InjectorTest extends TestCase {
       }
     });
 
-    Private p = injector.getProvider(Private.class).get();
+    Private p = injector.getInstance(Private.class);
     assertEquals("foo", p.fromConstructor);
     assertEquals(5, p.fromMethod);
   }
@@ -266,7 +266,7 @@ public class InjectorTest extends TestCase {
       }
     });
 
-    Protected p = injector.getProvider(Protected.class).get();
+    Protected p = injector.getInstance(Protected.class);
     assertEquals("foo", p.fromConstructor);
     assertEquals(5, p.fromMethod);
   }
diff --git a/test/com/google/inject/IntegrationTest.java b/test/com/google/inject/IntegrationTest.java
index 8abd0197..91923b8e 100644
--- a/test/com/google/inject/IntegrationTest.java
+++ b/test/com/google/inject/IntegrationTest.java
@@ -34,12 +34,12 @@ public class IntegrationTest extends TestCase {
     binder.bindInterceptor(any(), any(), counter);
     Injector injector = binder.createInjector();
 
-    Foo foo = injector.getProvider(Key.get(Foo.class)).get();
+    Foo foo = injector.getInstance(Key.get(Foo.class));
     foo.foo();
     assertTrue(foo.invoked);
     assertEquals(1, counter.count);
 
-    foo = injector.getProvider(Foo.class).get();
+    foo = injector.getInstance(Foo.class);
     foo.foo();
     assertTrue(foo.invoked);
     assertEquals(2, counter.count);
diff --git a/test/com/google/inject/NotRequiredTest.java b/test/com/google/inject/NotRequiredTest.java
index 91709520..45d46ba1 100644
--- a/test/com/google/inject/NotRequiredTest.java
+++ b/test/com/google/inject/NotRequiredTest.java
@@ -27,14 +27,14 @@ public class NotRequiredTest extends TestCase {
     BinderImpl builder = new BinderImpl();
     builder.bind(Bar.class).to(BarImpl.class);
     Injector c = builder.createInjector();
-    Foo foo = c.getProvider(Foo.class).get();
+    Foo foo = c.getInstance(Foo.class);
     assertNotNull(foo.bar);
     assertNotNull(foo.fromMethod);
   }
 
   public void testNotProvided() throws CreationException {
     Injector c = Guice.createInjector();
-    Foo foo = c.getProvider(Foo.class).get();
+    Foo foo = c.getInstance(Foo.class);
     assertNull(foo.bar);
     assertNull(foo.fromMethod);
   }
diff --git a/test/com/google/inject/ProviderInjectionTest.java b/test/com/google/inject/ProviderInjectionTest.java
index de7364a1..154eec49 100644
--- a/test/com/google/inject/ProviderInjectionTest.java
+++ b/test/com/google/inject/ProviderInjectionTest.java
@@ -31,7 +31,7 @@ public class ProviderInjectionTest extends TestCase {
 
     Injector injector = builder.createInjector();
 
-    Foo foo = injector.getProvider(Foo.class).get();
+    Foo foo = injector.getInstance(Foo.class);
 
     Bar bar = foo.barProvider.get();
     assertNotNull(bar);
diff --git a/test/com/google/inject/example/ClientServiceWithGuice.java b/test/com/google/inject/example/ClientServiceWithGuice.java
index 99abda87..061dbbc4 100644
--- a/test/com/google/inject/example/ClientServiceWithGuice.java
+++ b/test/com/google/inject/example/ClientServiceWithGuice.java
@@ -67,6 +67,6 @@ public static void main(String[] args) throws CreationException {
   new ClientServiceWithGuice().testClient();
 
   Injector injector = Guice.createInjector(new ServiceModule());
-  Client client = injector.getProvider(Client.class).get();
+  Client client = injector.getInstance(Client.class);
 }
 }