Make ConfigServerApi AutoCloseable

4 files changed, 7 insertions, 6 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApi.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApi.java
index 2de84bf10e6..4d4a6c0328d 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApi.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApi.java
@@ -8,7 +8,7 @@ import java.util.Optional;
  *
  * @author freva
  */
-public interface ConfigServerApi {
+public interface ConfigServerApi extends AutoCloseable {
 
     <T> T get(String path, Class<T> wantedReturnType);
 
@@ -23,5 +23,6 @@ public interface ConfigServerApi {
     /**
      * Close the underlying HTTP client and any threads this class might have started.
      */
-    void stop();
+    @Override
+    void close();
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java
index c10340525da..c5592e91973 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java
@@ -165,7 +165,7 @@ public class ConfigServerApiImpl implements ConfigServerApi {
     }
 
     @Override
-    public void stop() {
+    public void close() {
         client.close();
     }
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerClientsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerClientsImpl.java
index bd51758793b..43a2c66a9e5 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerClientsImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerClientsImpl.java
@@ -49,6 +49,6 @@ public class ConfigServerClientsImpl implements ConfigServerClients {
 
     @Override
     public void stop() {
-        configServerApi.ifPresent(ConfigServerApi::stop);
+        configServerApi.ifPresent(ConfigServerApi::close);
     }
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/SslConfigServerApiImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/SslConfigServerApiImpl.java
index 752e678029b..8c2b87f4068 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/SslConfigServerApiImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/SslConfigServerApiImpl.java
@@ -87,9 +87,9 @@ public class SslConfigServerApiImpl implements ConfigServerApi {
     }
 
     @Override
-    public void stop() {
+    public void close() {
         keyStoreRefresher.ifPresent(ConfigServerKeyStoreRefresher::stop);
-        configServerApi.stop();
+        configServerApi.close();
     }
 
     private SSLConnectionSocketFactory makeSslConnectionSocketFactory(Optional<KeyStoreOptions> keyStoreOptions) {