diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-04-09 14:00:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-09 14:00:04 +0200 |
| commit | 87e5b33c003d07ca585d73e0166857fe22b4c16f (patch) | |
| tree | 6748bfa41fac16ad9b22d0afba4d150b44414542 /config-lib/src | |
| parent | 80b96d32550ae0df59572a58cd62f507e8068c2c (diff) | |
| parent | 1c27950698237c7ebe0f8ea7ed5848889d6b4759 (diff) | |
Merge pull request #22072 from vespa-engine/jonmv/unify-hostname-classes
Jonmv/unify hostname classes
Diffstat (limited to 'config-lib/src')
3 files changed, 7 insertions, 5 deletions
diff --git a/config-lib/src/main/java/com/yahoo/config/PathNode.java b/config-lib/src/main/java/com/yahoo/config/PathNode.java index ea4c657af8c..03e6fb51086 100644 --- a/config-lib/src/main/java/com/yahoo/config/PathNode.java +++ b/config-lib/src/main/java/com/yahoo/config/PathNode.java @@ -25,7 +25,7 @@ public class PathNode extends LeafNode<Path> { super(true); this.value = Path.of(fileReference.value()); if (value.normalize().toString().startsWith("..")) - throw new IllegalArgumentException("path may not start with '..', but got: " + value); + throw new IllegalArgumentException("path may not start with '..', but got :" + value); this.fileReference = fileReference; } 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"))); } } |