Revert "Merge pull request #22068 from vespa-engine/jonmv/unify-hostname-classes"

This reverts commit 8aa4c83df5ce7843c040afa41706fcc7c3afd030, reversing
changes made to f95ad44fae879da9db19f73eabe62c53baeb0c36.

26 files changed, 94 insertions, 94 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 816a7370bcd..5ababdd8250 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -940,19 +940,19 @@ public class ControllerTest {
                 // The weighted record for zone 2's region
                 new Record(Record.Type.ALIAS,
                            RecordName.from("application.tenant.us-east-3-w.vespa.oath.cloud"),
-                           new WeightedAliasTarget(HostName.of("lb-0--tenant.application.default--prod.us-east-3"),
+                           new WeightedAliasTarget(HostName.from("lb-0--tenant:application:default--prod.us-east-3"),
                                                    "dns-zone-1", ZoneId.from("prod.us-east-3"), 1).pack()),
 
                 // The 'east' global endpoint, pointing to the weighted record for zone 2's region
                 new Record(Record.Type.ALIAS,
                            RecordName.from("east.application.tenant.global.vespa.oath.cloud"),
-                           new LatencyAliasTarget(HostName.of("application.tenant.us-east-3-w.vespa.oath.cloud"),
+                           new LatencyAliasTarget(HostName.from("application.tenant.us-east-3-w.vespa.oath.cloud"),
                                                   "dns-zone-1", ZoneId.from("prod.us-east-3")).pack()),
 
                 // The zone-scoped endpoint pointing to zone 2 with exclusive routing
                 new Record(Record.Type.CNAME,
                            RecordName.from("application.tenant.us-east-3.vespa.oath.cloud"),
-                           RecordData.from("lb-0--tenant.application.default--prod.us-east-3.")));
+                           RecordData.from("lb-0--tenant:application:default--prod.us-east-3.")));
         assertEquals(expectedRecords, List.copyOf(tester.controllerTester().nameService().records()));
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
index b39e59d4420..75c33952754 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
@@ -239,7 +239,7 @@ public final class ControllerTester {
     /** Upgrade controller to given version */
     public void upgradeController(Version version, String commitSha, Instant commitDate) {
         for (var hostname : controller().curator().cluster()) {
-            upgradeController(HostName.of(hostname), version, commitSha, commitDate);
+            upgradeController(HostName.from(hostname), version, commitSha, commitDate);
         }
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
index 896f5355129..86c21839c96 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java
@@ -247,7 +247,7 @@ public class DeploymentContext {
         var clusterId = "default-inactive";
         var id = new RoutingPolicyId(instanceId, ClusterSpec.Id.from(clusterId), zone);
         var policies = new LinkedHashMap<>(tester.controller().routing().policies().read(instanceId).asMap());
-        policies.put(id, new RoutingPolicy(id, HostName.of("lb-host"),
+        policies.put(id, new RoutingPolicy(id, HostName.from("lb-host"),
                                            Optional.empty(),
                                            Set.of(EndpointId.of("default")),
                                            Set.of(),
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueueTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueueTest.java
index b5fd3d750ef..44bcbcfb4fa 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueueTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/dns/NameServiceQueueTest.java
@@ -28,11 +28,11 @@ public class NameServiceQueueTest {
         var r1 = new Record(Record.Type.CNAME, RecordName.from("cname.vespa.oath.cloud"), RecordData.from("example.com"));
         var r2 = new Record(Record.Type.TXT, RecordName.from("txt.example.com"), RecordData.from("text"));
         var r3 = List.of(new Record(Record.Type.ALIAS, RecordName.from("alias.example.com"),
-                                    new LatencyAliasTarget(HostName.of("alias1"),
+                                    new LatencyAliasTarget(HostName.from("alias1"),
                                                            "dns-zone-01",
                                                            ZoneId.from("prod", "us-north-1")).pack()),
                          new Record(Record.Type.ALIAS, RecordName.from("alias.example.com"),
-                                    new LatencyAliasTarget(HostName.of("alias2"),
+                                    new LatencyAliasTarget(HostName.from("alias2"),
                                                            "dns-zone-02",
                                                            ZoneId.from("prod", "us-north-2")).pack()));
         var req1 = new CreateRecord(r1);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
index fc87f3f8be6..e98ff71884d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
@@ -159,7 +159,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
     }
 
     public HostName hostFor(ApplicationId application, ZoneId zone) {
-        return HostName.of("host-" + application.toFullString() + "-" + zone.value());
+        return HostName.from("host-" + application.serializedForm() + "-" + zone.value());
     }
 
     public void bootstrap(List<ZoneId> zones, SystemApplication... applications) {
@@ -176,8 +176,8 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
             for (SystemApplication application : applications) {
                 for (int i = 1; i <= 3; i++) {
                     Node node = Node.builder()
-                                    .hostname(HostName.of("node-" + i + "-" + application.id().application()
-                                                                                         .value() + "-" + zone.value()))
+                                    .hostname(HostName.from("node-" + i + "-" + application.id().application()
+                                                                                   .value() + "-" + zone.value()))
                                     .state(Node.State.active)
                                     .type(application.nodeType())
                                     .owner(application.id())
@@ -402,7 +402,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
             putLoadBalancers(id.zoneId(), List.of(new LoadBalancer(UUID.randomUUID().toString(),
                                                                    id.applicationId(),
                                                                    cluster,
-                                                                   Optional.of(HostName.of("lb-0--" + id.applicationId().toFullString() + "--" + id.zoneId().toString())),
+                                                                   Optional.of(HostName.from("lb-0--" + id.applicationId().serializedForm() + "--" + id.zoneId().toString())),
                                                                    LoadBalancer.State.active,
                                                                    Optional.of("dns-zone-1"))));
         }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
index 3f1ca3f9706..7b67db39350 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/NodeRepositoryMock.java
@@ -60,7 +60,7 @@ public class NodeRepositoryMock implements NodeRepository {
     @Override
     public void deleteNode(ZoneId zone, String hostname) {
         require(zone, hostname);
-        nodeRepository.get(zone).remove(HostName.of(hostname));
+        nodeRepository.get(zone).remove(HostName.from(hostname));
     }
 
     @Override
@@ -246,8 +246,8 @@ public class NodeRepositoryMock implements NodeRepository {
     /** Add a fixed set of nodes to given zone */
     public void addFixedNodes(ZoneId zone) {
         var nodeA = Node.builder()
-                        .hostname(HostName.of("hostA"))
-                        .parentHostname(HostName.of("parentHostA"))
+                        .hostname(HostName.from("hostA"))
+                        .parentHostname(HostName.from("parentHostA"))
                         .state(Node.State.active)
                         .type(NodeType.tenant)
                         .owner(ApplicationId.from("tenant1", "app1", "default"))
@@ -262,8 +262,8 @@ public class NodeRepositoryMock implements NodeRepository {
                         .exclusiveTo(ApplicationId.from("t1", "a1", "i1"))
                         .build();
         var nodeB = Node.builder()
-                        .hostname(HostName.of("hostB"))
-                        .parentHostname(HostName.of("parentHostB"))
+                        .hostname(HostName.from("hostB"))
+                        .parentHostname(HostName.from("parentHostB"))
                         .state(Node.State.active)
                         .type(NodeType.tenant)
                         .owner(ApplicationId.from("tenant2", "app2", "default"))
@@ -319,7 +319,7 @@ public class NodeRepositoryMock implements NodeRepository {
     }
 
     private Node require(ZoneId zone, String hostname) {
-        return require(zone, HostName.of(hostname));
+        return require(zone, HostName.from(hostname));
     }
 
     private Node require(ZoneId zone, HostName hostname) {
@@ -329,7 +329,7 @@ public class NodeRepositoryMock implements NodeRepository {
     }
 
     private void patchNodes(ZoneId zone, String hostname, UnaryOperator<Node> patcher) {
-        patchNodes(zone, Optional.of(HostName.of(hostname)), patcher);
+        patchNodes(zone, Optional.of(HostName.from(hostname)), patcher);
     }
 
     private void patchNodes(DeploymentId deployment, Optional<HostName> hostname, UnaryOperator<Node> patcher) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventTrackerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventTrackerTest.java
index 6ccd307f0d9..8daedc05e96 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventTrackerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudEventTrackerTest.java
@@ -122,7 +122,7 @@ public class CloudEventTrackerTest {
 
     private Node createNode(String hostname, NodeType nodeType) {
         return Node.builder()
-                   .hostname(HostName.of(hostname))
+                   .hostname(HostName.from(hostname))
                    .type(nodeType)
                    .build();
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostInfoUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostInfoUpdaterTest.java
index 890f0b41098..a06e15de3c7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostInfoUpdaterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostInfoUpdaterTest.java
@@ -84,10 +84,10 @@ public class HostInfoUpdaterTest {
         // Updates node registered under a different hostname
         ZoneId zone = tester.zoneRegistry().zones().controllerUpgraded().all().ids().get(0);
         String hostnameSuffix = ".prod." + zone.value();
-        Node configNode = Node.builder().hostname(HostName.of("cfg3" + hostnameSuffix))
+        Node configNode = Node.builder().hostname(HostName.from("cfg3" + hostnameSuffix))
                               .type(NodeType.config)
                               .build();
-        Node configHost = Node.builder().hostname(HostName.of("cfghost3" + hostnameSuffix))
+        Node configHost = Node.builder().hostname(HostName.from("cfghost3" + hostnameSuffix))
                               .type(NodeType.confighost)
                               .build();
         tester.serviceRegistry().configServer().nodeRepository().putNodes(zone, List.of(configNode, configHost));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
index 4d3f94eaa3d..6109890bae3 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java
@@ -135,8 +135,8 @@ public class ResourceMeterMaintainerTest {
                          Node.State.parked,
                          Node.State.active)
                      .map(state -> Node.builder()
-                                       .hostname(HostName.of("host" + state))
-                                       .parentHostname(HostName.of("parenthost" + state))
+                                       .hostname(HostName.from("host" + state))
+                                       .parentHostname(HostName.from("parenthost" + state))
                                        .state(state)
                                        .type(NodeType.tenant)
                                        .owner(ApplicationId.from("tenant1", "app1", "default"))
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
index 1a6976034c5..f58911a6114 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceTagMaintainerTest.java
@@ -36,8 +36,8 @@ public class ResourceTagMaintainerTest {
         resourceTagMaintainer.maintain();
         assertEquals(2, mockResourceTagger.getValues().size());
         Map<HostName, ApplicationId> applicationForHost = mockResourceTagger.getValues().get(ZoneId.from("prod.region-2"));
-        assertEquals(ApplicationId.from("t1", "a1", "i1"), applicationForHost.get(HostName.of("parentHostA.prod.region-2")));
-        assertEquals(SHARED_HOST_APPLICATION, applicationForHost.get(HostName.of("parentHostB.prod.region-2")));
+        assertEquals(ApplicationId.from("t1", "a1", "i1"), applicationForHost.get(HostName.from("parentHostA.prod.region-2")));
+        assertEquals(SHARED_HOST_APPLICATION, applicationForHost.get(HostName.from("parentHostB.prod.region-2")));
     }
 
     private void setUpZones() {
@@ -51,19 +51,19 @@ public class ResourceTagMaintainerTest {
 
     public void setNodes(ZoneId zone) {
         var hostA = Node.builder()
-                        .hostname(HostName.of("parentHostA." + zone.value()))
+                        .hostname(HostName.from("parentHostA." + zone.value()))
                         .type(NodeType.host)
                         .owner(ApplicationId.from(SystemApplication.TENANT.value(), "tenant-host", "default"))
                         .exclusiveTo(ApplicationId.from("t1", "a1", "i1"))
                         .build();
         var nodeA = Node.builder()
-                        .hostname(HostName.of("hostA." + zone.value()))
+                        .hostname(HostName.from("hostA." + zone.value()))
                         .type(NodeType.tenant)
-                        .parentHostname(HostName.of("parentHostA." + zone.value()))
+                        .parentHostname(HostName.from("parentHostA." + zone.value()))
                         .owner(ApplicationId.from("tenant1", "app1", "default"))
                         .build();
         var hostB = Node.builder()
-                        .hostname(HostName.of("parentHostB." + zone.value()))
+                        .hostname(HostName.from("parentHostB." + zone.value()))
                         .type(NodeType.host)
                         .owner(ApplicationId.from(SystemApplication.TENANT.value(), "tenant-host", "default"))
                         .build();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java
index 8b2bfe8ee95..0dbe31d921b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemRoutingPolicyMaintainerTest.java
@@ -35,7 +35,7 @@ public class SystemRoutingPolicyMaintainerTest {
         tester.configServer().putLoadBalancers(zone, List.of(new LoadBalancer("lb1",
                                                                               SystemApplication.configServer.id(),
                                                                               ClusterSpec.Id.from("config"),
-                                                                              Optional.of(HostName.of("lb1.example.com")),
+                                                                              Optional.of(HostName.from("lb1.example.com")),
                                                                               LoadBalancer.State.active,
                                                                               Optional.of("dns-zone-1"))));
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java
index e7a6c3ea3c3..7f369d21d3a 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainerTest.java
@@ -37,9 +37,9 @@ public class VcmrMaintainerTest {
     private NodeRepositoryMock nodeRepo;
     private final ZoneId zoneId = ZoneId.from("prod.us-east-3");
     private final ZoneId zone2 = ZoneId.from("prod.us-west-1");
-    private final HostName host1 = HostName.of("host1");
-    private final HostName host2 = HostName.of("host2");
-    private final HostName host3 = HostName.of("host3");
+    private final HostName host1 = HostName.from("host1");
+    private final HostName host2 = HostName.from("host2");
+    private final HostName host3 = HostName.from("host3");
     private final String changeRequestId = "id123";
 
     @Before
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/NameServiceQueueSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/NameServiceQueueSerializerTest.java
index 5ecc22ffc5e..4ef09bbfce0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/NameServiceQueueSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/NameServiceQueueSerializerTest.java
@@ -32,11 +32,11 @@ public class NameServiceQueueSerializerTest {
                 new CreateRecord(record1),
                 new CreateRecords(List.of(record2)),
                 new CreateRecords(List.of(new Record(Record.Type.ALIAS, RecordName.from("alias.example.com"),
-                                                     new LatencyAliasTarget(HostName.of("alias1"),
+                                                     new LatencyAliasTarget(HostName.from("alias1"),
                                                                             "dns-zone-01",
                                                                             ZoneId.from("prod", "us-north-1")).pack()),
                                           new Record(Record.Type.ALIAS, RecordName.from("alias.example.com"),
-                                                     new LatencyAliasTarget(HostName.of("alias2"),
+                                                     new LatencyAliasTarget(HostName.from("alias2"),
                                                                             "dns-zone-02",
                                                                             ZoneId.from("prod", "us-north-2")).pack()))
                 ),
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java
index d50c071d98e..482303a0e49 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionStatusSerializerTest.java
@@ -30,12 +30,12 @@ public class OsVersionStatusSerializerTest {
         Map<OsVersion, List<NodeVersion>> versions = new LinkedHashMap<>();
 
         versions.put(new OsVersion(version1, CloudName.defaultName()), List.of(
-                new NodeVersion(HostName.of("node1"), ZoneId.from("prod", "us-west"), version1, version2, Optional.of(Instant.ofEpochMilli(11))),
-                new NodeVersion(HostName.of("node2"), ZoneId.from("prod", "us-east"), version1, version2, Optional.of(Instant.ofEpochMilli(22)))
+                new NodeVersion(HostName.from("node1"), ZoneId.from("prod", "us-west"), version1, version2, Optional.of(Instant.ofEpochMilli(11))),
+                new NodeVersion(HostName.from("node2"), ZoneId.from("prod", "us-east"), version1, version2, Optional.of(Instant.ofEpochMilli(22)))
         ));
         versions.put(new OsVersion(version2, CloudName.defaultName()), List.of(
-                new NodeVersion(HostName.of("node3"), ZoneId.from("prod", "us-west"), version2, version2, Optional.of(Instant.ofEpochMilli(33))),
-                new NodeVersion(HostName.of("node4"), ZoneId.from("prod", "us-east"), version2, version2, Optional.of(Instant.ofEpochMilli(44)))
+                new NodeVersion(HostName.from("node3"), ZoneId.from("prod", "us-west"), version2, version2, Optional.of(Instant.ofEpochMilli(33))),
+                new NodeVersion(HostName.from("node4"), ZoneId.from("prod", "us-east"), version2, version2, Optional.of(Instant.ofEpochMilli(44)))
         ));
 
         OsVersionStatusSerializer serializer = new OsVersionStatusSerializer(new OsVersionSerializer(), new NodeVersionSerializer());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java
index 2e8ba84d4ff..422188420bd 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RoutingPolicySerializerTest.java
@@ -38,13 +38,13 @@ public class RoutingPolicySerializerTest {
                                       ClusterSpec.Id.from("my-cluster2"),
                                       ZoneId.from("prod", "us-north-2"));
         var policies = List.of(new RoutingPolicy(id1,
-                                                 HostName.of("long-and-ugly-name"),
+                                                 HostName.from("long-and-ugly-name"),
                                                  Optional.of("zone1"),
                                                  instanceEndpoints,
                                                  applicationEndpoints,
                                                  new RoutingPolicy.Status(true, RoutingStatus.DEFAULT)),
                                new RoutingPolicy(id2,
-                                                 HostName.of("long-and-ugly-name-2"),
+                                                 HostName.from("long-and-ugly-name-2"),
                                                  Optional.empty(),
                                                  instanceEndpoints,
                                                  Set.of(),
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
index 73cfc6ad2f3..e202d4a687d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
@@ -55,7 +55,7 @@ public class VersionStatusSerializerTest {
     private static List<NodeVersion> nodeVersions(Version version, Version wantedVersion, String... hostnames) {
         var nodeVersions = new ArrayList<NodeVersion>();
         for (var hostname : hostnames) {
-            nodeVersions.add(new NodeVersion(HostName.of(hostname), ZoneId.from("prod", "us-north-1"), version, wantedVersion, Optional.empty()));
+            nodeVersions.add(new NodeVersion(HostName.from(hostname), ZoneId.from("prod", "us-north-1"), version, wantedVersion, Optional.empty()));
         }
         return nodeVersions;
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java
index 6b07fea0187..5827ef676d7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/proxy/ProxyRequestTest.java
@@ -19,9 +19,9 @@ public class ProxyRequestTest {
 
     @Test
     public void testBadUri() {
-        assertEquals("Request path '/path' does not end with proxy path '/zone/v2/'",
-                     assertThrows(IllegalArgumentException.class,
-                                  () -> testRequest("http://domain.tld/path", "/zone/v2/")).getMessage());
+        assertThrows("Request path '/path' does not end with proxy path '/zone/v2/'",
+                     IllegalArgumentException.class,
+                     () -> testRequest("http://domain.tld/path", "/zone/v2/"));
     }
 
     @Test
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 52da2fadf0c..67b201bdc9d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -634,13 +634,13 @@ public class ApplicationApiTest extends ControllerContainerTest {
                               "{\"enabled\":true,\"clusters\":[{\"name\":\"cluster\",\"pending\":[{\"type\":\"type\",\"requiredGeneration\":100}],\"ready\":[{\"type\":\"type\",\"readyAtMillis\":345,\"startedAtMillis\":456,\"endedAtMillis\":567,\"state\":\"failed\",\"message\":\"(＃｀д´)ﾉ\",\"progress\":0.1,\"speed\":1.0}]}]}");
 
         // POST to request a service dump
-        tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/node/host-tenant1.application1.instance1-prod.us-central-1/service-dump", POST)
+        tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/node/host-tenant1:application1:instance1-prod.us-central-1/service-dump", POST)
                         .userIdentity(HOSTED_VESPA_OPERATOR)
                         .data("{\"configId\":\"default/container.1\",\"artifacts\":[\"jvm-dump\"],\"dumpOptions\":{\"duration\":30}}"),
                 "{\"message\":\"Request created\"}");
 
         // GET to get status of service dump
-        tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/node/host-tenant1.application1.instance1-prod.us-central-1/service-dump", GET)
+        tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/instance1/environment/prod/region/us-central-1/node/host-tenant1:application1:instance1-prod.us-central-1/service-dump", GET)
                         .userIdentity(HOSTED_VESPA_OPERATOR),
                 "{\"createdMillis\":" + tester.controller().clock().millis() + ",\"configId\":\"default/container.1\"" +
                         ",\"artifacts\":[\"jvm-dump\"],\"dumpOptions\":{\"duration\":30}}");
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json
index 88a92bf7810..422c8c122fa 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-nodes.json
@@ -1,7 +1,7 @@
 {
   "nodes": [
     {
-      "hostname": "host-tenant1.application1.instance1-prod.us-central-1",
+      "hostname": "host-tenant1:application1:instance1-prod.us-central-1",
       "state": "active",
       "orchestration": "unorchestrated",
       "version": "6.1",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
index bfaa4d5c813..3ef993c6589 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
@@ -28,7 +28,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "host-tenant.application.default-dev.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-dev.us-east-1: unorchestrated"
       },
       {
         "at": 0,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
index 7c1f7223e9e..6b1d48f4a08 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
@@ -18,7 +18,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "host-tenant.application.default-t-staging.us-east-3: unorchestrated"
+        "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated"
       },
       {
         "at": 14503000,
@@ -33,7 +33,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "host-tenant.application.default-t-staging.us-east-3: unorchestrated"
+        "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated"
       },
       {
         "at": 14503000,
@@ -48,7 +48,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "host-tenant.application.default-t-staging.us-east-3: unorchestrated"
+        "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated"
       },
       {
         "at": 14503000,
@@ -63,7 +63,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "host-tenant.application.default-t-staging.us-east-3: unorchestrated"
+        "message": "host-tenant:application:default-t-staging.us-east-3: unorchestrated"
       },
       {
         "at": 14503000,
@@ -102,7 +102,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "host-tenant.application.default-staging.us-east-3: unorchestrated"
+        "message": "host-tenant:application:default-staging.us-east-3: unorchestrated"
       },
       {
         "at": 14503000,
@@ -127,7 +127,7 @@
       {
         "at": 14503000,
         "type": "debug",
-        "message": "host-tenant.application.default-staging.us-east-3: unorchestrated"
+        "message": "host-tenant:application:default-staging.us-east-3: unorchestrated"
       },
       {
         "at": 14503000,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
index e830f96bbba..377b8c6ed69 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
@@ -23,7 +23,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-t-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
@@ -38,7 +38,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-t-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
@@ -53,7 +53,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-t-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
@@ -68,7 +68,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-t-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
@@ -83,7 +83,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "host-tenant1.application1.instance1-t-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-t-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
@@ -122,7 +122,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
@@ -147,7 +147,7 @@
       {
         "at": "(ignore)",
         "type": "debug",
-        "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
@@ -172,7 +172,7 @@
       {
         "at": "(ignore)",
         "type": "debug",
-        "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
@@ -197,7 +197,7 @@
       {
         "at": "(ignore)",
         "type": "debug",
-        "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
@@ -222,7 +222,7 @@
       {
         "at": "(ignore)",
         "type": "debug",
-        "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
@@ -247,7 +247,7 @@
       {
         "at": "(ignore)",
         "type": "debug",
-        "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
@@ -272,7 +272,7 @@
       {
         "at": "(ignore)",
         "type": "debug",
-        "message": "host-tenant1.application1.instance1-test.us-east-1: unorchestrated"
+        "message": "host-tenant1:application1:instance1-test.us-east-1: unorchestrated"
       },
       {
         "at": "(ignore)",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
index bfb5d8e6cbc..f675825c3b6 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
@@ -18,7 +18,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "host-tenant.application.default-t-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-t-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
@@ -33,7 +33,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "host-tenant.application.default-t-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-t-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
@@ -48,7 +48,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "host-tenant.application.default-t-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-t-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
@@ -63,7 +63,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "host-tenant.application.default-t-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-t-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
@@ -78,7 +78,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "host-tenant.application.default-t-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-t-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
@@ -117,7 +117,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "host-tenant.application.default-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
@@ -142,7 +142,7 @@
       {
         "at": 0,
         "type": "debug",
-        "message": "host-tenant.application.default-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
@@ -167,7 +167,7 @@
       {
         "at": 0,
         "type": "debug",
-        "message": "host-tenant.application.default-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
@@ -192,7 +192,7 @@
       {
         "at": 0,
         "type": "debug",
-        "message": "host-tenant.application.default-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
@@ -217,7 +217,7 @@
       {
         "at": 0,
         "type": "debug",
-        "message": "host-tenant.application.default-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
@@ -242,7 +242,7 @@
       {
         "at": 0,
         "type": "debug",
-        "message": "host-tenant.application.default-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
@@ -267,7 +267,7 @@
       {
         "at": 0,
         "type": "debug",
-        "message": "host-tenant.application.default-test.us-east-1: unorchestrated"
+        "message": "host-tenant:application:default-test.us-east-1: unorchestrated"
       },
       {
         "at": 0,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
index 53da8c515a7..ca0db13b3d1 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
@@ -97,8 +97,8 @@ public class DeploymentApiTest extends ControllerContainerTest {
                                            version.isControllerVersion(),
                                            version.isSystemVersion(),
                                            version.isReleased(),
-                                           List.of(new NodeVersion(HostName.of("config1.test"), ZoneId.defaultId(), version.versionNumber(), version.versionNumber(), Optional.empty()),
-                                                   new NodeVersion(HostName.of("config2.test"), ZoneId.defaultId(), version.versionNumber(), version.versionNumber(), Optional.empty())),
+                                           List.of(new NodeVersion(HostName.from("config1.test"), ZoneId.defaultId(), version.versionNumber(), version.versionNumber(), Optional.empty()),
+                                                   new NodeVersion(HostName.from("config2.test"), ZoneId.defaultId(), version.versionNumber(), version.versionNumber(), Optional.empty())),
                                            version.confidence()
                 );
             }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
index 83b6f05c0b0..1919de33e8b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
@@ -453,7 +453,7 @@ public class RoutingPoliciesTest {
         tester.controllerTester().configServer().removeLoadBalancers(context.instanceId(), zone1);
 
         // Load balancer for the same application is provisioned again, but with a different hostname
-        var newHostname = HostName.of("new-hostname");
+        var newHostname = HostName.from("new-hostname");
         var loadBalancer = new LoadBalancer("LB-0-Z-" + zone1.value(),
                                             context.instanceId(),
                                             ClusterSpec.Id.from("c0"),
@@ -708,7 +708,7 @@ public class RoutingPoliciesTest {
 
         List<Record> records = tester.controllerTester().nameService().findRecords(Record.Type.CNAME, name);
         assertEquals(1, records.size());
-        assertEquals(RecordData.from("lb-0--hosted-vespa.zone-config-servers.default--prod.us-west-1."),
+        assertEquals(RecordData.from("lb-0--hosted-vespa:zone-config-servers:default--prod.us-west-1."),
                      records.get(0).data());
     }
 
@@ -859,10 +859,10 @@ public class RoutingPoliciesTest {
         for (int i = 0; i < count; i++) {
             HostName lbHostname;
             if (shared) {
-                lbHostname = HostName.of("shared-lb--" + zone.value());
+                lbHostname = HostName.from("shared-lb--" + zone.value());
             } else {
-                lbHostname = HostName.of("lb-" + i + "--" + application.toFullString() +
-                                         "--" + zone.value());
+                lbHostname = HostName.from("lb-" + i + "--" + application.serializedForm() +
+                                           "--" + zone.value());
             }
             loadBalancers.add(
                     new LoadBalancer("LB-" + i + "-Z-" + zone.value(),
@@ -985,7 +985,7 @@ public class RoutingPoliciesTest {
             deploymentsByDnsName.forEach((dnsName, deployments) -> {
                 Set<String> weightedTargets = deployments.stream()
                                                            .map(d -> "weighted/lb-" + loadBalancerId + "--" +
-                                                                     d.applicationId().toFullString() + "--" + d.zoneId().value() +
+                                                                     d.applicationId().serializedForm() + "--" + d.zoneId().value() +
                                                                      "/dns-zone-1/" + d.zoneId().value() + "/" + deploymentWeights.get(d))
                                                            .collect(Collectors.toSet());
                 assertEquals(dnsName + " has expected targets", weightedTargets, aliasDataOf(dnsName));
@@ -1009,7 +1009,7 @@ public class RoutingPoliciesTest {
             zonesByRegionEndpoint.forEach((regionEndpoint, zonesInRegion) -> {
                 Set<String> weightedTargets = zonesInRegion.stream()
                                                            .map(z -> "weighted/lb-" + loadBalancerId + "--" +
-                                                                     instance.toFullString() + "--" + z.value() +
+                                                                     instance.serializedForm() + "--" + z.value() +
                                                                      "/dns-zone-1/" + z.value() + "/" + zoneWeights.get(z))
                                                            .collect(Collectors.toSet());
                 assertEquals("Region endpoint " + regionEndpoint + " points to load balancer",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
index 7ba69438816..ec8d5c35049 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
@@ -82,9 +82,9 @@ public class VersionStatusTest {
 
     @Test
     public void testControllerVersionIsVersionOfOldestController() {
-        HostName controller1 = HostName.of("controller-1");
-        HostName controller2 = HostName.of("controller-2");
-        HostName controller3 = HostName.of("controller-3");
+        HostName controller1 = HostName.from("controller-1");
+        HostName controller2 = HostName.from("controller-2");
+        HostName controller3 = HostName.from("controller-3");
         MockCuratorDb db = new MockCuratorDb(Stream.of(controller1, controller2, controller3)
                                                    .map(hostName -> hostName.value() + ":2222")
                                                    .collect(Collectors.joining(",")));
@@ -491,9 +491,9 @@ public class VersionStatusTest {
 
     @Test
     public void testCommitDetailsPreservation() {
-        HostName controller1 = HostName.of("controller-1");
-        HostName controller2 = HostName.of("controller-2");
-        HostName controller3 = HostName.of("controller-3");
+        HostName controller1 = HostName.from("controller-1");
+        HostName controller2 = HostName.from("controller-2");
+        HostName controller3 = HostName.from("controller-3");
         MockCuratorDb db = new MockCuratorDb(Stream.of(controller1, controller2, controller3)
                                                    .map(hostName -> hostName.value() + ":2222")
                                                    .collect(Collectors.joining(",")));