summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2019-10-09 14:33:02 +0200
committerHåkon Hallingstad <hakon@verizonmedia.com>2019-10-09 14:33:02 +0200
commit99b8b0c3070e53f692e8d77cfb6001eafcfd0d7e (patch)
treef6b093fecda6faafbccc6399e1500f70074cacb3 /node-admin
parentf5a5dca146d8161462c144f31bfb4a91b8a5167a (diff)
Depend on interface instead of subclass
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java9
1 files changed, 6 insertions, 3 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..508e6301846 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,6 +4,7 @@ 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;
@@ -55,7 +56,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 +66,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 +77,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)));
}