Remove usages in service-monitor as well

8 files changed, 24 insertions, 27 deletions

diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java
index 323ae678b0b..73774321ffb 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.orchestrator;
 
+import ai.vespa.http.DomainName;
 import com.yahoo.config.model.api.SuperModel;
 import com.yahoo.config.model.api.SuperModelListener;
 import com.yahoo.config.model.api.SuperModelProvider;
@@ -87,9 +88,9 @@ public class OrchestratorTest {
 
         // There is one config server application with 3 nodes
         ApplicationId applicationId = new ConfigServerApplication().getApplicationId();
-        var cfg1 = com.yahoo.config.provision.HostName.of("cfg1");
-        var cfg2 = com.yahoo.config.provision.HostName.of("cfg2");
-        var cfg3 = com.yahoo.config.provision.HostName.of("cfg3");
+        var cfg1 = DomainName.of("cfg1");
+        var cfg2 = DomainName.of("cfg2");
+        var cfg3 = DomainName.of("cfg3");
         duperModelManager.infraApplicationActivated(applicationId, List.of(cfg1, cfg2, cfg3));
         duperModelManager.infraApplicationsIsNowComplete();
 
@@ -135,7 +136,7 @@ public class OrchestratorTest {
         // etc (should be the same as for cfg1)
     }
 
-    private HostName toApplicationModelHostName(com.yahoo.config.provision.HostName hostname) {
+    private HostName toApplicationModelHostName(DomainName hostname) {
         return new HostName(hostname.value());
     }
 
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthEndpoint.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthEndpoint.java
index a654a4557ef..1d832cc0eec 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthEndpoint.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthEndpoint.java
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.service.health;
 
-import com.yahoo.config.provision.HostName;
+import ai.vespa.http.DomainName;
 import com.yahoo.vespa.service.executor.RunletExecutor;
 import com.yahoo.vespa.service.monitor.ServiceId;
 
@@ -22,7 +22,7 @@ class StateV1HealthEndpoint implements HealthEndpoint {
     private final RunletExecutor executor;
 
     StateV1HealthEndpoint(ServiceId serviceId,
-                          HostName hostname,
+                          DomainName hostname,
                           int port,
                           Duration delay,
                           Duration requestTimeout,
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthModel.java b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthModel.java
index 3391bbcf82a..3969ef141bd 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthModel.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/health/StateV1HealthModel.java
@@ -1,11 +1,11 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.service.health;
 
+import ai.vespa.http.DomainName;
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.api.PortInfo;
 import com.yahoo.config.model.api.ServiceInfo;
-import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.service.executor.RunletExecutor;
 import com.yahoo.vespa.service.model.ApplicationInstanceGenerator;
 import com.yahoo.vespa.service.monitor.ServiceId;
@@ -45,7 +45,7 @@ public class StateV1HealthModel implements AutoCloseable {
         Map<ServiceId, HealthEndpoint> endpoints = new HashMap<>();
 
         for (HostInfo hostInfo : application.getModel().getHosts()) {
-            HostName hostname = HostName.of(hostInfo.getHostname());
+            DomainName hostname = DomainName.of(hostInfo.getHostname());
             for (ServiceInfo serviceInfo : hostInfo.getServices()) {
                 ServiceId serviceId = ApplicationInstanceGenerator.getServiceId(application, serviceInfo);
                 for (PortInfo portInfo : serviceInfo.getPorts()) {
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java
index 73a49ca8717..568dc3640e2 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelTest.java
@@ -1,11 +1,11 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.service.duper;
 
+import ai.vespa.http.DomainName;
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.api.Model;
 import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.service.monitor.DuperModelListener;
 import org.junit.Before;
 import org.junit.Test;
@@ -14,7 +14,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.junit.Assert.assertEquals;
@@ -34,12 +33,12 @@ public class DuperModelTest {
 
     private final ApplicationId id1 = ApplicationId.fromSerializedForm("tenant:app1:default");
     private final ApplicationInfo application1 = mock(ApplicationInfo.class);
-    private final HostName hostname1_1 = HostName.of("hostname1-1");
-    private final HostName hostname1_2 = HostName.of("hostname1-2");
+    private final DomainName hostname1_1 = DomainName.of("hostname1-1");
+    private final DomainName hostname1_2 = DomainName.of("hostname1-2");
 
     private final ApplicationId id2 = ApplicationId.fromSerializedForm("tenant:app2:default");
     private final ApplicationInfo application2 = mock(ApplicationInfo.class);
-    private final HostName hostname2_1 = HostName.of("hostname2-1");
+    private final DomainName hostname2_1 = DomainName.of("hostname2-1");
 
     private final DuperModelListener listener1 = mock(DuperModelListener.class);
 
@@ -49,7 +48,7 @@ public class DuperModelTest {
         setUpApplication(id2, application2, hostname2_1);
     }
 
-    private void setUpApplication(ApplicationId id, ApplicationInfo info, HostName... hostnames) {
+    private void setUpApplication(ApplicationId id, ApplicationInfo info, DomainName... hostnames) {
         when(info.getApplicationId()).thenReturn(id);
 
         Model model = mock(Model.class);
@@ -129,7 +128,7 @@ public class DuperModelTest {
         addAndVerifyApplication1("host1");
         addAndVerifyApplication1("host1", "host2");
         addAndVerifyApplication1("host2", "host3");
-        assertEquals(Optional.empty(), duperModel.getApplicationId(HostName.of("host1")));
+        assertEquals(Optional.empty(), duperModel.getApplicationId(DomainName.of("host1")));
 
         duperModel.remove(id1);
         assertEquals(0, duperModel.numberOfApplications());
@@ -138,7 +137,7 @@ public class DuperModelTest {
     }
 
     private void addAndVerifyApplication1(String... hostnameStrings) {
-        HostName[] hostnameArray = Stream.of(hostnameStrings).map(HostName::of).toArray(HostName[]::new);
+        DomainName[] hostnameArray = Stream.of(hostnameStrings).map(DomainName::of).toArray(DomainName[]::new);
         setUpApplication(id1, application1, hostnameArray);
         duperModel.add(application1);
 
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/ApplicationHealthMonitorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/ApplicationHealthMonitorTest.java
index d99e882985f..9f46b5dfe8f 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/ApplicationHealthMonitorTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/ApplicationHealthMonitorTest.java
@@ -1,13 +1,13 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.service.health;
 
+import ai.vespa.http.DomainName;
 import com.yahoo.config.model.api.ApplicationInfo;
-import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.applicationmodel.ServiceStatusInfo;
 import com.yahoo.vespa.service.duper.ConfigServerApplication;
-import com.yahoo.vespa.service.monitor.ServiceId;
 import com.yahoo.vespa.service.monitor.ConfigserverUtil;
+import com.yahoo.vespa.service.monitor.ServiceId;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -87,7 +87,7 @@ public class ApplicationHealthMonitorTest {
         return new ServiceId(configServerApplication.getApplicationId(),
                 configServerApplication.getClusterId(),
                 configServerApplication.getServiceType(),
-                configServerApplication.configIdFor(HostName.of(hostname)));
+                configServerApplication.configIdFor(DomainName.of(hostname)));
     }
 
     private ServiceStatus getStatus(ApplicationHealthMonitor monitor, String hostname) {
@@ -95,7 +95,7 @@ public class ApplicationHealthMonitorTest {
                 configServerApplication.getApplicationId(),
                 configServerApplication.getClusterId(),
                 configServerApplication.getServiceType(),
-                configServerApplication.configIdFor(HostName.of(hostname)))
+                configServerApplication.configIdFor(DomainName.of(hostname)))
                 .serviceStatus();
     }
 }
\ No newline at end of file
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java
index 2cfbc0307b7..f9129b5e4f4 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/health/HealthMonitorManagerTest.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.service.health;
 
 import ai.vespa.http.DomainName;
 import com.yahoo.config.model.api.ApplicationInfo;
-import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.applicationmodel.ServiceStatus;
 import com.yahoo.vespa.applicationmodel.ServiceStatusInfo;
 import com.yahoo.vespa.service.duper.ControllerHostApplication;
@@ -77,7 +76,7 @@ public class HealthMonitorManagerTest {
                 infraApplication.getApplicationId(),
                 infraApplication.getClusterId(),
                 infraApplication.getServiceType(),
-                infraApplication.configIdFor(HostName.of(hostname))).serviceStatus();
+                infraApplication.configIdFor(DomainName.of(hostname))).serviceStatus();
 
         assertEquals(expected, actual);
 
@@ -85,7 +84,7 @@ public class HealthMonitorManagerTest {
                 infraApplication.getApplicationId(),
                 infraApplication.getClusterId(),
                 infraApplication.getServiceType(),
-                infraApplication.configIdFor(HostName.of(hostname)));
+                infraApplication.configIdFor(DomainName.of(hostname)));
 
     }
 }
\ No newline at end of file
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java
index c93e4dfb7fe..23422640af9 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/model/ServiceHostListenerAdapterTest.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.service.model;
 
+import ai.vespa.http.DomainName;
 import com.yahoo.config.model.api.ApplicationInfo;
 import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.model.api.Model;
@@ -100,7 +101,7 @@ public class ServiceHostListenerAdapterTest {
     }
 
     private Optional<ApplicationInfo> getDuperModelApplicationInfo(String hostname) {
-        return duperModel.getApplicationInfo(com.yahoo.config.provision.HostName.of(hostname));
+        return duperModel.getApplicationInfo(DomainName.of(hostname));
     }
 
     private void removeAndVerify(ApplicationId id, boolean listenerInvoked) {
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java
index 7367b8c5992..d2480cd6520 100644
--- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java
+++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/ConfigserverUtil.java
@@ -4,12 +4,9 @@ package com.yahoo.vespa.service.monitor;
 import ai.vespa.http.DomainName;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.model.api.ApplicationInfo;
-import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.service.duper.ConfigServerApplication;
 
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author hakon