diff options
| author | Valerij Fredriksen <valerijf@oath.com> | 2017-09-19 12:35:30 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2017-09-22 22:15:49 +0200 |
| commit | 650bd5b230efd283a27e81dd6badaee0a115c45b (patch) | |
| tree | 071b3f19d45d6eb42d56c97722bcf75e0aad6a6d /node-admin/src/main/java/com | |
| parent | a8d6f5c76bb7e9b18bcc16f6dd8f4e9b09d2ba4f (diff) | |
Simplify NodeRepository constructor
Diffstat (limited to 'node-admin/src/main/java/com')
2 files changed, 6 insertions, 7 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepository.java index d14cd2f1330..9f4c6916b48 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepository.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepository.java @@ -13,7 +13,7 @@ import java.util.Optional; * @author stiankri */ public interface NodeRepository { - List<ContainerNodeSpec> getContainersToRun() throws IOException; + List<ContainerNodeSpec> getContainersToRun(String baseHostName) throws IOException; Optional<ContainerNodeSpec> getContainerNodeSpec(String hostName); diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java index 7d73d05ca36..08957a489b6 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java @@ -28,18 +28,17 @@ import java.util.stream.Collectors; */ public class NodeRepositoryImpl implements NodeRepository { private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(NodeRepositoryImpl.class); - private final String baseHostName; - private final int port; + private final ConfigServerHttpRequestExecutor requestExecutor; + private final int port; - public NodeRepositoryImpl(ConfigServerHttpRequestExecutor requestExecutor, int configPort, String baseHostName) { - this.baseHostName = baseHostName; - this.port = configPort; + public NodeRepositoryImpl(ConfigServerHttpRequestExecutor requestExecutor, int port) { this.requestExecutor = requestExecutor; + this.port = port; } @Override - public List<ContainerNodeSpec> getContainersToRun() throws IOException { + public List<ContainerNodeSpec> getContainersToRun(String baseHostName) throws IOException { try { final GetNodesResponse nodesForHost = requestExecutor.get( "/nodes/v2/node/?parentHost=" + baseHostName + "&recursive=true", |