diff options
author | Håkon Hallingstad <hakon@oath.com> | 2018-02-22 14:43:27 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2018-02-22 14:43:27 +0100 |
commit | 10d5c4b8bacd781b5b85da7c2cdd19cd92c8ee25 (patch) | |
tree | 05e9f2de1ae25cbf20870d27171b9833d1742173 /node-admin | |
parent | ccfa114800406b3803a8cf5d480664b583a8b4ad (diff) |
Rename ConfigServerClients implementation backed by real config servers to RealConfigServerClients
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/RealConfigServerClients.java (renamed from node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerClientsImpl.java) | 10 | ||||
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminMain.java | 4 |
2 files changed, 7 insertions, 7 deletions
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/RealConfigServerClients.java index 43a2c66a9e5..6cf534a212f 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/RealConfigServerClients.java @@ -12,25 +12,25 @@ import java.util.Optional; /** * @author freva */ -public class ConfigServerClientsImpl implements ConfigServerClients { +public class RealConfigServerClients implements ConfigServerClients { private final Optional<ConfigServerApi> configServerApi; private final NodeRepository nodeRepository; private final Orchestrator orchestrator; - public ConfigServerClientsImpl(Environment environment) { + public RealConfigServerClients(Environment environment) { this(new SslConfigServerApiImpl(environment)); } - public ConfigServerClientsImpl(NodeRepository nodeRepository, Orchestrator orchestrator) { + public RealConfigServerClients(NodeRepository nodeRepository, Orchestrator orchestrator) { this(nodeRepository, orchestrator, Optional.empty()); } - private ConfigServerClientsImpl(ConfigServerApi configServerApi) { + private RealConfigServerClients(ConfigServerApi configServerApi) { this(new NodeRepositoryImpl(configServerApi), new OrchestratorImpl(configServerApi), Optional.of(configServerApi)); } - private ConfigServerClientsImpl(NodeRepository nodeRepository, Orchestrator orchestrator, + private RealConfigServerClients(NodeRepository nodeRepository, Orchestrator orchestrator, Optional<ConfigServerApi> configServerApi) { this.nodeRepository = nodeRepository; this.orchestrator = orchestrator; diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminMain.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminMain.java index d19f64a2bc3..4b806c905d9 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminMain.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminMain.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.hosted.node.admin.component.AdminComponent; import com.yahoo.vespa.hosted.node.admin.component.Environment; import com.yahoo.vespa.hosted.node.admin.config.ConfigServerConfig; import com.yahoo.vespa.hosted.node.admin.component.DockerAdminComponent; -import com.yahoo.vespa.hosted.node.admin.configserver.ConfigServerClientsImpl; +import com.yahoo.vespa.hosted.node.admin.configserver.RealConfigServerClients; import com.yahoo.vespa.hosted.node.admin.provider.NodeAdminStateUpdater; import java.io.File; @@ -66,7 +66,7 @@ public class NodeAdminMain implements AutoCloseable { docker, metricReceiver, classLocking, - new ConfigServerClientsImpl(new Environment(configServerConfig))); + new RealConfigServerClients(new Environment(configServerConfig))); } logger.log(LogLevel.INFO, () -> { |