From 8242de189462e8aaf6342f307ff58ad5bfb9326f Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 8 Oct 2021 12:20:43 +0200 Subject: Remove getSupervisor() from ConnectionPool interface Cleanup use of supervisor in connection pool and some file download classes --- .../java/com/yahoo/config/subscription/impl/MockConnection.java | 6 ------ config/src/main/java/com/yahoo/vespa/config/ConnectionPool.java | 5 ----- config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java | 5 ----- 3 files changed, 16 deletions(-) (limited to 'config/src/main') diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java b/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java index c27e4cb2bc8..640f3d0c27e 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java @@ -3,7 +3,6 @@ package com.yahoo.config.subscription.impl; import com.yahoo.jrt.Request; import com.yahoo.jrt.RequestWaiter; -import com.yahoo.jrt.Supervisor; import com.yahoo.vespa.config.ConfigPayload; import com.yahoo.vespa.config.Connection; import com.yahoo.vespa.config.ConnectionPool; @@ -74,11 +73,6 @@ public class MockConnection implements ConnectionPool, Connection { return numSpecs; } - @Override - public Supervisor getSupervisor() { - return null; - } - public int getNumberOfRequests() { return numberOfRequests; } diff --git a/config/src/main/java/com/yahoo/vespa/config/ConnectionPool.java b/config/src/main/java/com/yahoo/vespa/config/ConnectionPool.java index 1ee44bfee87..31f85ee4fd5 100644 --- a/config/src/main/java/com/yahoo/vespa/config/ConnectionPool.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConnectionPool.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config; -import com.yahoo.jrt.Supervisor; - /** * @author hmusum */ @@ -22,7 +20,4 @@ public interface ConnectionPool extends AutoCloseable { int getSize(); - // TODO: Exposes implementation, try to remove - Supervisor getSupervisor(); - } diff --git a/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java b/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java index d7e21356ba2..048c82b1bde 100644 --- a/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java +++ b/config/src/main/java/com/yahoo/vespa/config/JRTConnectionPool.java @@ -148,9 +148,4 @@ public class JRTConnectionPool implements ConnectionPool { } } - @Override - public Supervisor getSupervisor() { - return supervisor; - } - } -- cgit v1.2.3