Deprecate and stop using HostSpec constructor that should be removed

6 files changed, 13 insertions, 23 deletions

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<Host> 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) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
index d12f116d61f..7aa8cb25a38 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
@@ -37,7 +37,7 @@ public class HostResource implements Comparable<HostResource> {
      * @param host {@link com.yahoo.vespa.model.Host} object to bind to.
      */
     public HostResource(Host host) {
-        this(host, new HostSpec(host.getHostname(), List.of(), Optional.empty()));
+        this(host, new HostSpec(host.getHostname(), Optional.empty()));
     }
 
     public HostResource(Host host, HostSpec spec) {
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
index 734385cb4ad..a2c0f258e14 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostSpecTest.java
@@ -3,7 +3,6 @@ package com.yahoo.config.model.provision;
 
 import com.yahoo.config.provision.HostSpec;
 import org.junit.jupiter.api.Test;
-import java.util.List;
 import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -16,30 +15,21 @@ public class HostSpecTest {
 
     @Test
     void testEquals() {
-        HostSpec h1 = new HostSpec("foo", List.of(), Optional.empty());
-        HostSpec h2 = new HostSpec("foo", List.of(), Optional.empty());
-        HostSpec h3 = new HostSpec("foo", List.of("my", "alias"), Optional.empty());
-        HostSpec h4 = new HostSpec("bar", List.of(), Optional.empty());
+        HostSpec h1 = new HostSpec("foo", Optional.empty());
+        HostSpec h2 = new HostSpec("foo", Optional.empty());
+        HostSpec h3 = new HostSpec("bar", Optional.empty());
 
         assertEquals(h1, h1);
         assertEquals(h1, h2);
-        assertEquals(h1, h3);
-        assertNotEquals(h1, h4);
+        assertNotEquals(h1, h3);
 
         assertEquals(h2, h1);
         assertEquals(h2, h2);
-        assertEquals(h2, h3);
-        assertNotEquals(h2, h4);
+        assertNotEquals(h2, h3);
 
-        assertEquals(h3, h1);
-        assertEquals(h3, h2);
+        assertNotEquals(h3, h1);
+        assertNotEquals(h3, h2);
         assertEquals(h3, h3);
-        assertNotEquals(h3, h4);
-
-        assertNotEquals(h4, h1);
-        assertNotEquals(h4, h2);
-        assertNotEquals(h4, h3);
-        assertEquals(h4, h4);
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidatorTest.java
index 7080a3e0f12..87e1d3f0479 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/NodeResourceChangeValidatorTest.java
@@ -105,7 +105,7 @@ public class NodeResourceChangeValidatorTest {
 
         @Override
         public HostSpec allocateHost(String alias) {
-            return new HostSpec(alias, List.of(), Optional.empty());
+            return new HostSpec(alias, Optional.empty());
         }
 
         @Override