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

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

2 files changed, 6 insertions, 4 deletions

diff --git a/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java b/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java
index 42e4978091d..1ad9f722eca 100644
--- a/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/FileNodeTest.java
@@ -23,8 +23,9 @@ public class FileNodeTest {
         assertEquals("foo.txt", n.value().value());
         assertEquals("\"foo.txt\"", n.toString());
 
-        assertEquals("path may not start with '..', but got: foo/../../boo",
-                     assertThrows(IllegalArgumentException.class, () -> new FileNode("foo/../../boo")).getMessage());
+        assertThrows("path may not start with '..', but got: foo/../../boo",
+                     IllegalArgumentException.class,
+                     () -> new FileNode("foo/../../boo"));
     }
 
 }
diff --git a/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java b/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java
index 016c53b42e3..2240f647726 100644
--- a/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java
+++ b/config-lib/src/test/java/com/yahoo/config/PathNodeTest.java
@@ -22,8 +22,9 @@ public class PathNodeTest {
         n = new PathNode(new FileReference("foo.txt"));
         assertEquals(new File("foo.txt").toPath(), n.value());
 
-        assertEquals("path may not start with '..', but got: foo/../../boo",
-                     assertThrows(IllegalArgumentException.class, () -> new PathNode(new FileReference("foo/../../boo"))).getMessage());
+        assertThrows("path may not start with '..', but got: foo/../../boo",
+                     IllegalArgumentException.class,
+                     () -> new PathNode(new FileReference("foo/../../boo")));
     }
 
 }