diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-03-30 09:59:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-30 09:59:54 +0200 |
commit | 211fdb61ecf7379c8113e0da413a8cc16f72494d (patch) | |
tree | 6798636ed4be073154541da7e1adec8eb995e345 /vespajlib | |
parent | be725ccae3572b03f1f599543abfe7de9a383833 (diff) | |
parent | 5cea7bd3497bdb30bdbebebc0685d93249765d89 (diff) |
Merge pull request #21880 from vespa-engine/mpolden/disallow-relative-path
Disallow relative paths and specs
Diffstat (limited to 'vespajlib')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/path/Path.java | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/path/Path.java b/vespajlib/src/main/java/com/yahoo/path/Path.java index 55859850a08..16370059c8c 100644 --- a/vespajlib/src/main/java/com/yahoo/path/Path.java +++ b/vespajlib/src/main/java/com/yahoo/path/Path.java @@ -2,7 +2,6 @@ package com.yahoo.path; import com.yahoo.api.annotations.Beta; -import com.google.common.collect.ImmutableList; import java.io.File; import java.util.ArrayList; @@ -21,20 +20,11 @@ import java.util.stream.Collectors; public final class Path { private final String delimiter; - private final ImmutableList<String> elements; + private final List<String> elements; /** Creates an empty path */ private Path(String delimiter) { - this(new ArrayList<>(), delimiter); - } - - /** - * Create a new path as a copy of the provided path - * - * @param path the path to copy - */ - private Path(Path path) { - this(path.elements, path.delimiter); + this(List.of(), delimiter); } /** @@ -47,7 +37,7 @@ public final class Path { if ("..".equals(element)) throw new IllegalArgumentException("'..' is not allowed in path"); - this.elements = ImmutableList.copyOf(elements); + this.elements = List.copyOf(elements); this.delimiter = delimiter; } |