Remove unused methods and one method only used by tests

3 files changed, 14 insertions, 8 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 720ff1cebf0..90b4625a282 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -155,11 +155,10 @@ public class ModelProvisioningTest {
         assertEquals(45, qrsStartConfig.jvm().heapSizeAsPercentageOfPhysicalMemory());
         
         HostSystem hostSystem = model.hostSystem();
-        assertNotNull(hostSystem.getHostByHostname("myhost0"));
-        assertNotNull(hostSystem.getHostByHostname("myhost1"));
-        assertNotNull(hostSystem.getHostByHostname("myhost2"));
-        assertNotNull(hostSystem.getHostByHostname("myhost3"));
-        assertNull(hostSystem.getHostByHostname("Nope"));
+        assertTrue(hostNameExists(hostSystem, "myhost0"));
+        assertTrue(hostNameExists(hostSystem, "myhost1"));
+        assertTrue(hostNameExists(hostSystem, "myhost2"));
+        assertFalse(hostNameExists(hostSystem, "Nope"));
     }
 
     @Test
@@ -2570,6 +2569,10 @@ public class ModelProvisioningTest {
         assertProvisioned(nodeCount, id, null, type, model);
     }
 
+    private static boolean hostNameExists(HostSystem hostSystem, String hostname) {
+        return hostSystem.getHosts().stream().map(HostResource::getHost).anyMatch(host -> host.getHostname().equals(hostname));
+    }
+
     record TestLogger(List<LogMessage> msgs) implements DeployLogger {
 
         public TestLogger() {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
index a38f0ebe476..2063f0cdbdf 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
@@ -9,6 +9,7 @@ import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.text.XML;
+import com.yahoo.vespa.model.HostResource;
 import com.yahoo.vespa.model.admin.Admin;
 import com.yahoo.vespa.model.admin.Configserver;
 import com.yahoo.vespa.model.admin.Slobrok;
@@ -20,7 +21,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author hmusum
@@ -115,7 +119,7 @@ public class DomAdminV2BuilderTest extends DomBuilderTest {
         Admin admin = buildAdmin(servicesMultitenantAdminOnly(), true, configServerSpecs);
         assertEquals(3, admin.getConfigservers().size());
         assertEquals(1, admin.getSlobroks().size());
-        assertNotNull(admin.hostSystem().getHostByHostname("test1"));
+        assertTrue(admin.hostSystem().getAllHosts().stream().map(HostResource::getHost).anyMatch(host -> host.getHostname().equals("test1")));
         for (Configserver configserver : admin.getConfigservers()) {
             for (Slobrok slobrok : admin.getSlobroks()) {
                 assertNotEquals(configserver.getHostName(), slobrok.getHostName());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
index 97951ab5a20..31287ddf089 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
@@ -95,7 +95,6 @@ public class VespaDomBuilderTest {
         HostSystem hostSystem = model.hostSystem();
         assertEquals(1, hostSystem.getHosts().size());
         HostResource host = hostSystem.getHosts().get(0);
-        assertEquals(hostSystem.getHostByHostname(host.getHostname()), host);
         assertNotNull(hostSystem.getHost("node1"));
         assertEquals("hosts [" + host.getHostname() + "]", hostSystem.toString());
     }