From 3cb5a2ec1c7da77b7eeeee349265bf12166a9099 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 13 Feb 2023 07:01:08 +0100 Subject: Deprecate and stop using HostSpec constructor that should be removed --- .../java/com/yahoo/config/model/provision/HostsXmlProvisioner.java | 4 ++-- .../java/com/yahoo/config/model/provision/InMemoryProvisioner.java | 2 +- .../java/com/yahoo/config/model/provision/SingleNodeProvisioner.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'config-model/src/main/java/com/yahoo/config') diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java index acad7532404..99a47bfbd71 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java @@ -39,7 +39,7 @@ public class HostsXmlProvisioner implements HostProvisioner { } for (Host host : hosts.asCollection()) { if (host.aliases().contains(alias)) { - return new HostSpec(host.hostname(), host.aliases(), Optional.empty()); + return new HostSpec(host.hostname(), Optional.empty()); } } throw new IllegalArgumentException("Unable to find host for alias '" + alias + "'"); @@ -54,7 +54,7 @@ public class HostsXmlProvisioner implements HostProvisioner { } private HostSpec host2HostSpec(Host host) { - return new HostSpec(host.hostname(), host.aliases(), Optional.empty()); + return new HostSpec(host.hostname(), Optional.empty()); } private Host getFirstHost() { diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java index 9e48510e704..dd6087eefc7 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java @@ -151,7 +151,7 @@ public class InMemoryProvisioner implements HostProvisioner { List defaultHosts = freeNodes.get(defaultHostResources); if (defaultHosts.isEmpty()) throw new IllegalArgumentException("No more hosts with default resources available"); Host newHost = freeNodes.removeValue(defaultHostResources, 0); - return new HostSpec(newHost.hostname(), List.of(alias), Optional.empty()); + return new HostSpec(newHost.hostname(), Optional.empty()); } @Override diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java index c3b91c5da0f..da0fdf47398 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java @@ -30,7 +30,7 @@ public class SingleNodeProvisioner implements HostProvisioner { public SingleNodeProvisioner() { host = new Host(HostName.getLocalhost()); - this.hostSpec = new HostSpec(host.hostname(), host.aliases(), Optional.empty()); + this.hostSpec = new HostSpec(host.hostname(), Optional.empty()); } public SingleNodeProvisioner(Flavor flavor) { -- cgit v1.2.3