summaryrefslogtreecommitdiffstats
path: root/container-core/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2022-02-08 17:13:41 +0100
committerGitHub <noreply@github.com>2022-02-08 17:13:41 +0100
commit12bc5e4513d97cd6bb752b3838fc610f634769a8 (patch)
tree91ba87fd1bfa2d10f4781963265d307008feb3aa /container-core/src
parent5607b924b450e6574f68fdbd164563e8c25b9dbd (diff)
parentbad739ae3be754bb495b5a3b5830a0c972f8fa39 (diff)
Merge pull request #21108 from vespa-engine/bjorncs/jdisc-corev7.540.35
Deprecate method leaking Guice
Diffstat (limited to 'container-core/src')
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java5
-rw-r--r--container-core/src/test/java/com/yahoo/container/handler/VipStatusHandlerTestCase.java5
-rw-r--r--container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java5
-rw-r--r--container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java6
4 files changed, 0 insertions, 21 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java
index 6f5cc5722c8..927284f2c66 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java
@@ -552,11 +552,6 @@ public class HttpRequest {
}
@Override
- public <T> T getInstance(Key<T> tKey) {
- return null;
- }
-
- @Override
public <T> T getInstance(Class<T> tClass) {
return null;
}
diff --git a/container-core/src/test/java/com/yahoo/container/handler/VipStatusHandlerTestCase.java b/container-core/src/test/java/com/yahoo/container/handler/VipStatusHandlerTestCase.java
index e95dbcbcb22..e78810db897 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/VipStatusHandlerTestCase.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/VipStatusHandlerTestCase.java
@@ -187,11 +187,6 @@ public class VipStatusHandlerTestCase {
}
@Override
- public <T> T getInstance(Key<T> tKey) {
- return null;
- }
-
- @Override
public <T> T getInstance(Class<T> tClass) {
return null;
}
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java
index 5f46184bf89..ae0f679771e 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java
@@ -150,11 +150,6 @@ public class LoggingRequestHandlerTestCase {
}
@Override
- public <T> T getInstance(Key<T> tKey) {
- return null;
- }
-
- @Override
public <T> T getInstance(Class<T> tClass) {
return null;
}
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java
index e2ebdf7a8fc..d1ba4a4d190 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactoryTest.java
@@ -1,7 +1,6 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.jdisc.http.server.jetty;
-import com.google.inject.Key;
import com.yahoo.jdisc.Container;
import com.yahoo.jdisc.References;
import com.yahoo.jdisc.ResourceReference;
@@ -158,11 +157,6 @@ public class HttpRequestFactoryTest {
}
@Override
- public <T> T getInstance(Key<T> tKey) {
- return null;
- }
-
- @Override
public <T> T getInstance(Class<T> tClass) {
return null;
}