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

This reverts commit 87e5b33c003d07ca585d73e0166857fe22b4c16f, reversing
changes made to 80b96d32550ae0df59572a58cd62f507e8068c2c.

4 files changed, 9 insertions, 9 deletions

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 4ef09bbfce0..5ecc22ffc5e 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.from("alias1"),
+                                                     new LatencyAliasTarget(HostName.of("alias1"),
                                                                             "dns-zone-01",
                                                                             ZoneId.from("prod", "us-north-1")).pack()),
                                           new Record(Record.Type.ALIAS, RecordName.from("alias.example.com"),
-                                                     new LatencyAliasTarget(HostName.from("alias2"),
+                                                     new LatencyAliasTarget(HostName.of("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 482303a0e49..d50c071d98e 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.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)))
+                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)))
         ));
         versions.put(new OsVersion(version2, CloudName.defaultName()), List.of(
-                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)))
+                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)))
         ));
 
         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 422188420bd..2e8ba84d4ff 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.from("long-and-ugly-name"),
+                                                 HostName.of("long-and-ugly-name"),
                                                  Optional.of("zone1"),
                                                  instanceEndpoints,
                                                  applicationEndpoints,
                                                  new RoutingPolicy.Status(true, RoutingStatus.DEFAULT)),
                                new RoutingPolicy(id2,
-                                                 HostName.from("long-and-ugly-name-2"),
+                                                 HostName.of("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 e202d4a687d..73cfc6ad2f3 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.from(hostname), ZoneId.from("prod", "us-north-1"), version, wantedVersion, Optional.empty()));
+            nodeVersions.add(new NodeVersion(HostName.of(hostname), ZoneId.from("prod", "us-north-1"), version, wantedVersion, Optional.empty()));
         }
         return nodeVersions;
     }