Repository: curator Updated Branches: refs/heads/CURATOR-166 [created] 84699d336
CURATOR-166: Allow ZKPaths to build paths with an arbitrary number of children. Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/01a23e9c Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/01a23e9c Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/01a23e9c Branch: refs/heads/CURATOR-166 Commit: 01a23e9c043277ab80d9f78b8c58b7aab06c902b Parents: ef2ca57 Author: Ricardo Ferreira <ricardo.ferre...@feedzai.com> Authored: Fri Nov 14 23:48:31 2014 +0000 Committer: Ricardo Ferreira <ricardo.ferre...@feedzai.com> Committed: Fri Nov 14 23:48:31 2014 +0000 ---------------------------------------------------------------------- .../java/org/apache/curator/utils/ZKPaths.java | 71 +++++++++++++------- .../org/apache/curator/utils/TestZKPaths.java | 10 +++ 2 files changed, 57 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/01a23e9c/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java ---------------------------------------------------------------------- diff --git a/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java b/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java index 352bfd6..300913b 100644 --- a/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java +++ b/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java @@ -32,6 +32,12 @@ import java.util.List; public class ZKPaths { /** + * Zookeeper's path separator character. + */ + public static final String PATH_SEPARATOR = "/"; + + + /** * Apply the namespace to the given path * * @param namespace namespace (can be null) @@ -59,7 +65,7 @@ public class ZKPaths public static String getNodeFromPath(String path) { PathUtils.validatePath(path); - int i = path.lastIndexOf('/'); + int i = path.lastIndexOf(PATH_SEPARATOR); if ( i < 0 ) { return path; @@ -102,21 +108,21 @@ public class ZKPaths public static PathAndNode getPathAndNode(String path) { PathUtils.validatePath(path); - int i = path.lastIndexOf('/'); + int i = path.lastIndexOf(PATH_SEPARATOR); if ( i < 0 ) { return new PathAndNode(path, ""); } if ( (i + 1) >= path.length() ) { - return new PathAndNode("/", ""); + return new PathAndNode(PATH_SEPARATOR, ""); } String node = path.substring(i + 1); - String parentPath = (i > 0) ? path.substring(0, i) : "/"; + String parentPath = (i > 0) ? path.substring(0, i) : PATH_SEPARATOR; return new PathAndNode(parentPath, node); } - private static final Splitter PATH_SPLITTER = Splitter.on('/').omitEmptyStrings(); + private static final Splitter PATH_SPLITTER = Splitter.on(PATH_SEPARATOR).omitEmptyStrings(); /** * Given a full path, return the the individual parts, without slashes. @@ -178,7 +184,7 @@ public class ZKPaths int pos = 1; // skip first slash, root is guaranteed to exist do { - pos = path.indexOf('/', pos + 1); + pos = path.indexOf(PATH_SEPARATOR, pos + 1); if ( pos == -1 ) { @@ -276,26 +282,26 @@ public class ZKPaths Collections.sort(sortedList); return sortedList; } - + /** - * Given a parent path and a child node, create a combined full path + * Given a parent path and a list of children nodes, create a combined full path * * @param parent the parent - * @param child the child + * @param children the children * @return full path */ - public static String makePath(String parent, String child) + public static String makePath(String parent, String... children) { StringBuilder path = new StringBuilder(); // Add parent piece, with no trailing slash. if ( (parent != null) && (parent.length() > 0) ) { - if ( !parent.startsWith("/") ) + if ( !parent.startsWith(PATH_SEPARATOR) ) { - path.append('/'); + path.append(PATH_SEPARATOR); } - if ( parent.endsWith("/") ) + if ( parent.endsWith(PATH_SEPARATOR) ) { path.append(parent.substring(0, parent.length() - 1)); } @@ -305,26 +311,43 @@ public class ZKPaths } } - if ( (child == null) || (child.length() == 0) || (child.equals("/")) ) + if (children == null || children.length == 0) { // Special case, empty parent and child if ( path.length() == 0 ) { - return "/"; + return PATH_SEPARATOR; } return path.toString(); } - // Now add the separator between parent and child. - path.append('/'); - - // Finally, add the child. - if ( child.startsWith("/") ) - { - path.append(child.substring(1)); - } - else + for (String child : children) { + if ( (child == null) || (child.length() == 0) || (child.equals(PATH_SEPARATOR)) ) + { + // Special case, empty parent and child + if ( path.length() == 0 ) + { + path.append(PATH_SEPARATOR); + } + + continue; + } + + // Now add the separator between parent and child. + path.append(PATH_SEPARATOR); + + if ( child.startsWith(PATH_SEPARATOR) ) + { + child = child.substring(1); + } + + if ( child.endsWith(PATH_SEPARATOR) ) + { + child = child.substring(0, child.length() - 1); + } + + // Finally, add the child. path.append(child); } http://git-wip-us.apache.org/repos/asf/curator/blob/01a23e9c/curator-client/src/test/java/org/apache/curator/utils/TestZKPaths.java ---------------------------------------------------------------------- diff --git a/curator-client/src/test/java/org/apache/curator/utils/TestZKPaths.java b/curator-client/src/test/java/org/apache/curator/utils/TestZKPaths.java index 04d07c5..2e8dc73 100644 --- a/curator-client/src/test/java/org/apache/curator/utils/TestZKPaths.java +++ b/curator-client/src/test/java/org/apache/curator/utils/TestZKPaths.java @@ -63,6 +63,16 @@ public class TestZKPaths Assert.assertEquals(ZKPaths.makePath("/foo", "bar"), "/foo/bar"); Assert.assertEquals(ZKPaths.makePath("foo", "/bar"), "/foo/bar"); Assert.assertEquals(ZKPaths.makePath("/foo", "/bar"), "/foo/bar"); + Assert.assertEquals(ZKPaths.makePath("/foo", "bar/"), "/foo/bar"); + Assert.assertEquals(ZKPaths.makePath("/foo/", "/bar/"), "/foo/bar"); + + Assert.assertEquals(ZKPaths.makePath("foo", "bar", "baz"), "/foo/bar/baz"); + Assert.assertEquals(ZKPaths.makePath("foo", "bar", "baz", "qux"), "/foo/bar/baz/qux"); + Assert.assertEquals(ZKPaths.makePath("/foo", "/bar", "/baz"), "/foo/bar/baz"); + Assert.assertEquals(ZKPaths.makePath("/foo/", "/bar/", "/baz/"), "/foo/bar/baz"); + Assert.assertEquals(ZKPaths.makePath("foo", null, null), "/foo"); + Assert.assertEquals(ZKPaths.makePath("foo", "bar", null), "/foo/bar"); + Assert.assertEquals(ZKPaths.makePath("foo", null, "baz"), "/foo/baz"); } @Test
