diff options
Diffstat (limited to 'vespajlib/src/main/java/com')
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/path/Path.java | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/path/Path.java b/vespajlib/src/main/java/com/yahoo/path/Path.java index c466fe50d6f..da55c6767d1 100644 --- a/vespajlib/src/main/java/com/yahoo/path/Path.java +++ b/vespajlib/src/main/java/com/yahoo/path/Path.java @@ -2,14 +2,11 @@ package com.yahoo.path; import com.google.common.annotations.Beta; -import com.google.common.collect.ImmutableList; import java.io.File; import java.util.ArrayList; -import java.util.Arrays; import java.util.Iterator; import java.util.List; -import java.util.stream.Collectors; /** * Represents a path represented by a list of elements. Immutable @@ -20,7 +17,7 @@ import java.util.stream.Collectors; public final class Path { private final String delimiter; - private final ImmutableList<String> elements; + private final List<String> elements = new ArrayList<>(); /** * Create an empty path. @@ -42,7 +39,7 @@ public final class Path { * @param elements a list of path elements */ private Path(List<String> elements, String delimiter) { - this.elements = ImmutableList.copyOf(elements); + this.elements.addAll(elements); this.delimiter = delimiter; } @@ -54,20 +51,26 @@ public final class Path { /** * Add path elements by splitting based on delimiter and appending to elements. */ - private static List<String> elementsOf(String path, String delimiter) { - return Arrays.stream(path.split(delimiter)).filter(e -> !"".equals(e)).collect(Collectors.toList()); + private void addElementsFromString(String path) { + String[] pathElements = path.split(delimiter); + if (pathElements != null) { + for (String elem : pathElements) { + if (!"".equals(elem)) { + elements.add(elem); + } + } + } } /** - * Append an element to the path. Returns a new path with the given path appended. - * - * @param path the path to append to this - * @return the new path + * Append an element to the path. Returns a new path with this element appended. + * @param name name of element to append. + * @return this, for chaining */ - public Path append(String path) { - List<String> newElements = new ArrayList<>(this.elements); - newElements.addAll(elementsOf(path, delimiter)); - return new Path(newElements, delimiter); + public Path append(String name) { + Path path = new Path(this); + path.addElementsFromString(name); + return path; } /** @@ -77,9 +80,9 @@ public final class Path { * @return a new path with argument appended to it. */ public Path append(Path path) { - List<String> newElements = new ArrayList<>(this.elements); - newElements.addAll(path.elements()); - return new Path(newElements, delimiter); + Path newPath = new Path(this); + newPath.elements.addAll(path.elements); + return newPath; } /** @@ -87,7 +90,9 @@ public final class Path { * @return the name */ public String getName() { - if (elements.isEmpty()) return ""; + if (elements.isEmpty()) { + return ""; + } return elements.get(elements.size() - 1); } @@ -136,9 +141,6 @@ public final class Path { public Iterator<String> iterator() { return elements.iterator(); } - /** Returns an immutable list of the elements of this path in order */ - public List<String> elements() { return elements; } - /** * Convert to string. * @@ -169,7 +171,9 @@ public final class Path { * @return a path object that may be used with the application package. */ public static Path fromString(String path, String delimiter) { - return new Path(elementsOf(path, delimiter), delimiter); + Path pathObj = new Path(delimiter); + pathObj.addElementsFromString(path); + return pathObj; } /** |