summaryrefslogtreecommitdiffstats
path: root/vespa-http-client
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-04-26 08:08:42 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-04-26 08:08:42 +0200
commit7b176bfe4f8286d9958cf9465aad3e32919327ed (patch)
treefe26b978f91f500e4aed6b1ce71faacf34d682a1 /vespa-http-client
parent3c39fd08665786b367424e6591f369053b33c9db (diff)
Don't import deprecated classes
Diffstat (limited to 'vespa-http-client')
-rw-r--r--vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/SessionImpl.java3
-rw-r--r--vespa-http-client/src/test/java/com/yahoo/vespa/http/client/QueueBoundsTest.java9
2 files changed, 5 insertions, 7 deletions
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/SessionImpl.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/SessionImpl.java
index e11903d7ba7..a5c97351347 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/SessionImpl.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/SessionImpl.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.http.client.core.api;
import com.yahoo.vespa.http.client.FeedClient;
import com.yahoo.vespa.http.client.Result;
-import com.yahoo.vespa.http.client.Session;
import com.yahoo.vespa.http.client.config.SessionParams;
import com.yahoo.vespa.http.client.core.ThrottlePolicy;
import com.yahoo.vespa.http.client.core.operationProcessor.IncompleteResultsThrottler;
@@ -20,7 +19,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
* @deprecated
*/
@Deprecated // TODO: Remove on Vespa 8
-public class SessionImpl implements Session {
+public class SessionImpl implements com.yahoo.vespa.http.client.Session {
private final OperationProcessor operationProcessor;
private final BlockingQueue<Result> resultQueue = new LinkedBlockingQueue<>();
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/QueueBoundsTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/QueueBoundsTest.java
index 344f8b46639..08c9299dcde 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/QueueBoundsTest.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/QueueBoundsTest.java
@@ -6,7 +6,6 @@ import com.yahoo.vespa.http.client.config.ConnectionParams;
import com.yahoo.vespa.http.client.config.Endpoint;
import com.yahoo.vespa.http.client.config.FeedParams;
import com.yahoo.vespa.http.client.config.SessionParams;
-import com.yahoo.vespa.http.client.core.api.SessionImpl;
import com.yahoo.vespa.http.client.handlers.V3MockParsingRequestHandler;
import org.junit.Test;
@@ -65,7 +64,7 @@ public class QueueBoundsTest extends TestOnCiBuildingSystemOnly {
mockXmlParsingRequestHandler.setScenario(V3MockParsingRequestHandler.Scenario.DONT_ACCEPT_VERSION);
try (Server server = new Server(mockXmlParsingRequestHandler, 0);
Session session =
- new SessionImpl(
+ new com.yahoo.vespa.http.client.core.api.SessionImpl(
new SessionParams.Builder()
.addCluster(new Cluster.Builder()
.addEndpoint(Endpoint.create("localhost", server.getPort(), false))
@@ -109,7 +108,7 @@ public class QueueBoundsTest extends TestOnCiBuildingSystemOnly {
try (Server serverA = new Server(new V3MockParsingRequestHandler("A"), 0);
Server serverB = new Server(slowHandler, 0);
- SessionImpl session = new SessionImpl(
+ com.yahoo.vespa.http.client.core.api.SessionImpl session = new com.yahoo.vespa.http.client.core.api.SessionImpl(
new SessionParams.Builder()
.addCluster(new Cluster.Builder()
.addEndpoint(Endpoint.create("localhost", serverA.getPort(), false))
@@ -196,7 +195,7 @@ public class QueueBoundsTest extends TestOnCiBuildingSystemOnly {
mockXmlParsingRequestHandler.setScenario(V3MockParsingRequestHandler.Scenario.DONT_ACCEPT_VERSION);
try (Server server = new Server(mockXmlParsingRequestHandler, 0);
Session session =
- new SessionImpl(
+ new com.yahoo.vespa.http.client.core.api.SessionImpl(
new SessionParams.Builder()
.addCluster(new Cluster.Builder()
.addEndpoint(Endpoint.create("localhost", server.getPort(), false))
@@ -278,7 +277,7 @@ public class QueueBoundsTest extends TestOnCiBuildingSystemOnly {
}
}
- private void assertIncompleteResultQueueSize(SessionImpl session, int size, long timeout, TimeUnit timeUnit) throws InterruptedException {
+ private void assertIncompleteResultQueueSize(com.yahoo.vespa.http.client.core.api.SessionImpl session, int size, long timeout, TimeUnit timeUnit) throws InterruptedException {
long timeoutMs = TimeUnit.MILLISECONDS.convert(timeout, timeUnit);
long waitTimeMs = 0;
while (true) {