Merge pull request #10932 from vespa-engine/hakonhall/depend-on-interface-instead-of-subclass

Depend on interface instead of subclass

2 files changed, 6 insertions, 10 deletions

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 59873d7956e..7b2a1f9764b 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
@@ -4,8 +4,8 @@ package com.yahoo.vespa.hosted.node.admin.configserver;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yahoo.config.provision.HostName;
+import com.yahoo.vespa.athenz.identity.ServiceIdentityProvider;
 import com.yahoo.vespa.athenz.identity.ServiceIdentitySslSocketFactory;
-import com.yahoo.vespa.athenz.identity.SiaIdentityProvider;
 import com.yahoo.vespa.hosted.node.admin.component.ConfigServerInfo;
 import org.apache.http.HttpHeaders;
 import org.apache.http.client.config.RequestConfig;
@@ -55,7 +55,9 @@ public class ConfigServerApiImpl implements ConfigServerApi {
 
     private final CloseableHttpClient client;
 
-    public static ConfigServerApiImpl create(ConfigServerInfo info, SiaIdentityProvider provider, HostnameVerifier hostnameVerifier) {
+    public static ConfigServerApiImpl create(ConfigServerInfo info,
+                                             ServiceIdentityProvider provider,
+                                             HostnameVerifier hostnameVerifier) {
         return new ConfigServerApiImpl(
                 info.getConfigServerUris(),
                 hostnameVerifier,
@@ -63,7 +65,7 @@ public class ConfigServerApiImpl implements ConfigServerApi {
     }
 
     public static ConfigServerApiImpl createFor(ConfigServerInfo info,
-                                                SiaIdentityProvider provider,
+                                                ServiceIdentityProvider provider,
                                                 HostnameVerifier hostnameVerifier,
                                                 HostName configServerHostname) {
         return new ConfigServerApiImpl(
@@ -74,7 +76,7 @@ public class ConfigServerApiImpl implements ConfigServerApi {
 
     private ConfigServerApiImpl(Collection<URI> configServers,
                                 HostnameVerifier verifier,
-                                SiaIdentityProvider identityProvider) {
+                                ServiceIdentityProvider identityProvider) {
         this(configServers, createClient(new SSLConnectionSocketFactory(new ServiceIdentitySslSocketFactory(identityProvider), verifier)));
     }
 
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java
index cab28e55b21..06f3246ee44 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identity/SiaIdentityProvider.java
@@ -26,9 +26,6 @@ public class SiaIdentityProvider extends AbstractComponent implements ServiceIde
     private final AutoReloadingX509KeyManager keyManager;
     private final SSLContext sslContext;
     private final AthenzIdentity service;
-    private final File privateKeyFile;
-    private final File certificateFile;
-    private final File trustStoreFile;
 
     @Inject
     public SiaIdentityProvider(SiaProviderConfig config) {
@@ -52,9 +49,6 @@ public class SiaIdentityProvider extends AbstractComponent implements ServiceIde
                                File certificateFile,
                                File trustStoreFile) {
         this.service = service;
-        this.privateKeyFile = privateKeyFile;
-        this.certificateFile = certificateFile;
-        this.trustStoreFile = trustStoreFile;
         this.keyManager = AutoReloadingX509KeyManager.fromPemFiles(privateKeyFile.toPath(), certificateFile.toPath());
         this.sslContext = createIdentitySslContext(keyManager, trustStoreFile.toPath());
     }