diff options
Diffstat (limited to 'jdisc_core/src')
5 files changed, 10 insertions, 16 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/Container.java b/jdisc_core/src/main/java/com/yahoo/jdisc/Container.java index f3ed16c65e7..e96f7f08fe8 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/Container.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/Container.java @@ -49,8 +49,10 @@ public interface Container extends SharedResource, Timer { * @return The appropriate instance of the given class. * @throws ConfigurationException If this injector cannot find or create the provider. * @throws ProvisionException If there was a runtime failure while providing an instance. + * @deprecated Use {@link #getInstance(Class)} instead. */ - <T> T getInstance(Key<T> key); + @Deprecated(forRemoval = true, since = "7") // TODO Vespa 8 remove + default <T> T getInstance(Key<T> key) { throw new UnsupportedOperationException(); } /** * Returns the appropriate instance for the given injection type. When feasible, avoid using this method in diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ContainerSnapshot.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ContainerSnapshot.java index f3641f2475b..808c8e89b1b 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ContainerSnapshot.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ContainerSnapshot.java @@ -37,7 +37,10 @@ class ContainerSnapshot extends AbstractResource implements Container { this.containerReference = container.refer(context); } + /** @deprecated Use {@link #getInstance(Class)} instead. */ @Override + @Deprecated(forRemoval = true, since = "7") // TODO Vespa 8 remove + @SuppressWarnings("removal") public <T> T getInstance(Key<T> key) { return container.guiceInjector().getInstance(key); } diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/RequestTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/RequestTestCase.java index 987a24fe332..75154dd588e 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/RequestTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/RequestTestCase.java @@ -3,7 +3,6 @@ package com.yahoo.jdisc; import com.google.inject.AbstractModule; import com.google.inject.Guice; -import com.google.inject.Key; import com.yahoo.jdisc.application.BindingMatch; import com.yahoo.jdisc.application.UriPattern; import com.yahoo.jdisc.handler.CompletionHandler; @@ -307,11 +306,6 @@ public class RequestTestCase { } @Override - public <T> T getInstance(Key<T> key) { - return Guice.createInjector().getInstance(key); - } - - @Override public <T> T getInstance(Class<T> type) { return Guice.createInjector().getInstance(type); } diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ContainerSnapshotTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ContainerSnapshotTestCase.java index 3e6987c8c6f..dc1f3c7609e 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ContainerSnapshotTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ContainerSnapshotTestCase.java @@ -2,8 +2,6 @@ package com.yahoo.jdisc.core; import com.google.inject.AbstractModule; -import com.google.inject.Key; -import com.google.inject.name.Names; import com.yahoo.jdisc.AbstractResource; import com.yahoo.jdisc.Request; import com.yahoo.jdisc.application.BindingMatch; @@ -142,13 +140,11 @@ public class ContainerSnapshotTestCase { @Override protected void configure() { bind(Object.class).toInstance(obj); - bind(String.class).annotatedWith(Names.named("foo")).toInstance("foo"); } }); ActiveContainer active = new ActiveContainer(driver.newContainerBuilder()); ContainerSnapshot snapshot = new ContainerSnapshot(active, null, null, null); assertSame(obj, snapshot.getInstance(Object.class)); - assertEquals("foo", snapshot.getInstance(Key.get(String.class, Names.named("foo")))); snapshot.release(); assertTrue(driver.close()); } diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/test/NonWorkingRequestTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/test/NonWorkingRequestTestCase.java index ac55334308c..b0d67102a12 100644 --- a/jdisc_core/src/test/java/com/yahoo/jdisc/test/NonWorkingRequestTestCase.java +++ b/jdisc_core/src/test/java/com/yahoo/jdisc/test/NonWorkingRequestTestCase.java @@ -2,13 +2,11 @@ package com.yahoo.jdisc.test; import com.google.inject.AbstractModule; -import com.google.inject.Key; -import com.google.inject.name.Names; import com.yahoo.jdisc.Request; import org.junit.Test; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; /** @@ -23,13 +21,14 @@ public class NonWorkingRequestTestCase { @Test public void requireThatGuiceModulesAreInjected() { + Object obj = new Object(); Request request = NonWorkingRequest.newInstance("scheme://host/path", new AbstractModule() { @Override protected void configure() { - bind(String.class).annotatedWith(Names.named("foo")).toInstance("bar"); + bind(Object.class).toInstance(obj); } }); - assertEquals("bar", request.container().getInstance(Key.get(String.class, Names.named("foo")))); + assertSame(obj, request.container().getInstance(Object.class)); } } |