Repository: curator Updated Branches: refs/heads/CURATOR-397 05cab2ec5 -> 3338c05c9
renamed at() to child() Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/3338c05c Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/3338c05c Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/3338c05c Branch: refs/heads/CURATOR-397 Commit: 3338c05c997068c93fe4f889f4d0c1ee3fc3a776 Parents: 05cab2e Author: randgalt <[email protected]> Authored: Thu May 11 16:03:53 2017 +0200 Committer: randgalt <[email protected]> Committed: Thu May 11 16:03:53 2017 +0200 ---------------------------------------------------------------------- .../main/java/modeled/ModeledCuratorExamples.java | 4 ++-- .../apache/curator/x/async/modeled/ModelSpec.java | 2 +- .../curator/x/async/modeled/ModeledFramework.java | 2 +- .../org/apache/curator/x/async/modeled/ZPath.java | 2 +- .../modeled/cached/CachedModeledFramework.java | 2 +- .../modeled/details/CachedModeledFrameworkImpl.java | 4 ++-- .../x/async/modeled/details/ModelSpecImpl.java | 4 ++-- .../async/modeled/details/ModeledFrameworkImpl.java | 6 +++--- .../curator/x/async/modeled/details/ZPathImpl.java | 2 +- .../x/async/modeled/TestCachedModeledFramework.java | 8 ++++---- .../x/async/modeled/TestModeledFramework.java | 8 ++++---- .../apache/curator/x/async/modeled/TestZPath.java | 16 ++++++++-------- 12 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-examples/src/main/java/modeled/ModeledCuratorExamples.java ---------------------------------------------------------------------- diff --git a/curator-examples/src/main/java/modeled/ModeledCuratorExamples.java b/curator-examples/src/main/java/modeled/ModeledCuratorExamples.java index 2259b0f..e7e363c 100644 --- a/curator-examples/src/main/java/modeled/ModeledCuratorExamples.java +++ b/curator-examples/src/main/java/modeled/ModeledCuratorExamples.java @@ -43,7 +43,7 @@ public class ModeledCuratorExamples public static void createOrUpdate(ModeledFramework<PersonModel> modeled, PersonModel model) { // change the affected path to be modeled's base path plus id: i.e. "/example/path/{id}" - ModeledFramework<PersonModel> atId = modeled.at(model.getId().getId()); + ModeledFramework<PersonModel> atId = modeled.child(model.getId().getId()); // by default ModeledFramework instances update the node if it already exists // so this will either create or update the node @@ -53,7 +53,7 @@ public class ModeledCuratorExamples public static void readPerson(ModeledFramework<PersonModel> modeled, String id, Consumer<PersonModel> receiver) { // read the person with the given ID and asynchronously call the receiver after it is read - modeled.at(id).read().whenComplete((person, exception) -> { + modeled.child(id).read().whenComplete((person, exception) -> { if ( exception != null ) { exception.printStackTrace(); // handle the error http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModelSpec.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModelSpec.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModelSpec.java index 652eabd..2fe5242 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModelSpec.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModelSpec.java @@ -91,7 +91,7 @@ public interface ModelSpec<T> extends Resolvable * @param child child node. * @return new Modeled Spec instance */ - ModelSpec<T> at(Object child); + ModelSpec<T> child(Object child); /** * <p> http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledFramework.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledFramework.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledFramework.java index 42447d8..d9ce43d 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledFramework.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ModeledFramework.java @@ -129,7 +129,7 @@ public interface ModeledFramework<T> * @param child child node. * @return new Modeled Curator instance */ - ModeledFramework<T> at(Object child); + ModeledFramework<T> child(Object child); /** * <p> http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ZPath.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ZPath.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ZPath.java index 0e32023..70ac536 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ZPath.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/ZPath.java @@ -223,7 +223,7 @@ public interface ZPath extends Resolvable * @param child child node name * @return ZPath */ - ZPath at(Object child); + ZPath child(Object child); /** * Return this ZPath's parent http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/cached/CachedModeledFramework.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/cached/CachedModeledFramework.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/cached/CachedModeledFramework.java index 27bd57e..c08394a 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/cached/CachedModeledFramework.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/cached/CachedModeledFramework.java @@ -65,7 +65,7 @@ public interface CachedModeledFramework<T> extends ModeledFramework<T>, Closeabl * {@inheritDoc} */ @Override - CachedModeledFramework<T> at(Object child); + CachedModeledFramework<T> child(Object child); /** * {@inheritDoc} http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/CachedModeledFrameworkImpl.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/CachedModeledFrameworkImpl.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/CachedModeledFrameworkImpl.java index 4cfb70c..5ab925a 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/CachedModeledFrameworkImpl.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/CachedModeledFrameworkImpl.java @@ -123,9 +123,9 @@ class CachedModeledFrameworkImpl<T> implements CachedModeledFramework<T> } @Override - public CachedModeledFramework<T> at(Object child) + public CachedModeledFramework<T> child(Object child) { - return new CachedModeledFrameworkImpl<>(client.at(child), cache, executor, asyncDefaultMode); + return new CachedModeledFrameworkImpl<>(client.child(child), cache, executor, asyncDefaultMode); } @Override http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModelSpecImpl.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModelSpecImpl.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModelSpecImpl.java index b75fa12..58405eb 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModelSpecImpl.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModelSpecImpl.java @@ -58,9 +58,9 @@ public class ModelSpecImpl<T> implements ModelSpec<T>, SchemaValidator } @Override - public ModelSpec<T> at(Object child) + public ModelSpec<T> child(Object child) { - return withPath(path.at(child)); + return withPath(path.child(child)); } @Override http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledFrameworkImpl.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledFrameworkImpl.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledFrameworkImpl.java index abd6af7..453112d 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledFrameworkImpl.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledFrameworkImpl.java @@ -245,7 +245,7 @@ public class ModeledFrameworkImpl<T> implements ModeledFramework<T> } else { - modelStage.complete(children.stream().map(path::at).collect(Collectors.toList())); + modelStage.complete(children.stream().map(path::child).collect(Collectors.toList())); } }); return modelStage; @@ -269,9 +269,9 @@ public class ModeledFrameworkImpl<T> implements ModeledFramework<T> } @Override - public ModeledFramework<T> at(Object child) + public ModeledFramework<T> child(Object child) { - ModelSpec<T> newModelSpec = modelSpec.at(child); + ModelSpec<T> newModelSpec = modelSpec.child(child); return new ModeledFrameworkImpl<>( client, dslClient, http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ZPathImpl.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ZPathImpl.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ZPathImpl.java index 35a6bd2..f91b221 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ZPathImpl.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ZPathImpl.java @@ -108,7 +108,7 @@ public class ZPathImpl implements ZPath } @Override - public ZPath at(Object child) + public ZPath child(Object child) { return new ZPathImpl(nodes, NodeName.nameFrom(child)); } http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestCachedModeledFramework.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestCachedModeledFramework.java b/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestCachedModeledFramework.java index dc1138e..49821e2 100644 --- a/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestCachedModeledFramework.java +++ b/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestCachedModeledFramework.java @@ -56,7 +56,7 @@ public class TestCachedModeledFramework extends TestModeledFrameworkBase Assert.assertNotEquals(Thread.currentThread(), completionThread.get(), "Should be different threads"); completionThread.set(null); - complete(client.at("foo").read().whenCompleteAsync((v, e) -> completionThread.set((e != null) ? Thread.currentThread() : null))); + complete(client.child("foo").read().whenCompleteAsync((v, e) -> completionThread.set((e != null) ? Thread.currentThread() : null))); Assert.assertNotNull(completionThread.get()); Assert.assertNotEquals(Thread.currentThread(), completionThread.get(), "Should be different threads"); completionThread.set(null); @@ -93,7 +93,7 @@ public class TestCachedModeledFramework extends TestModeledFrameworkBase Assert.assertEquals(ourThread.get(), completionThread.get(), "Should be our thread"); completionThread.set(null); - complete(client.at("foo").read().whenCompleteAsync((v, e) -> completionThread.set((e != null) ? Thread.currentThread() : null))); + complete(client.child("foo").read().whenCompleteAsync((v, e) -> completionThread.set((e != null) ? Thread.currentThread() : null))); Assert.assertEquals(ourThread.get(), completionThread.get(), "Should be our thread"); completionThread.set(null); } @@ -150,13 +150,13 @@ public class TestCachedModeledFramework extends TestModeledFrameworkBase ModeledCacheListener<TestModel> listener = (t, p, s, m) -> semaphore.release(); client.listenable().addListener(listener.postInitializedOnly()); - complete(client.at("1").set(model1)); // set before cache is started + complete(client.child("1").set(model1)); // set before cache is started client.start(); try { Assert.assertFalse(timing.forSleepingABit().acquireSemaphore(semaphore)); - client.at("2").set(model2); // set before cache is started + client.child("2").set(model2); // set before cache is started Assert.assertTrue(timing.acquireSemaphore(semaphore)); } finally http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestModeledFramework.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestModeledFramework.java b/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestModeledFramework.java index 4a08a2b..9157d6f 100644 --- a/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestModeledFramework.java +++ b/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestModeledFramework.java @@ -85,11 +85,11 @@ public class TestModeledFramework extends TestModeledFrameworkBase { TestModel model = new TestModel("John", "Galt", "1 Galt's Gulch", 42, BigInteger.valueOf(1)); ModeledFramework<TestModel> client = ModeledFramework.builder(async, modelSpec).build(); - complete(client.at("one").set(model)); - complete(client.at("two").set(model)); - complete(client.at("three").set(model)); + complete(client.child("one").set(model)); + complete(client.child("two").set(model)); + complete(client.child("three").set(model)); - Set<ZPath> expected = Sets.newHashSet(path.at("one"), path.at("two"), path.at("three")); + Set<ZPath> expected = Sets.newHashSet(path.child("one"), path.child("two"), path.child("three")); complete(client.children(), (children, e) -> Assert.assertEquals(Sets.newHashSet(children), expected)); } http://git-wip-us.apache.org/repos/asf/curator/blob/3338c05c/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestZPath.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestZPath.java b/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestZPath.java index 5136282..d2c24da 100644 --- a/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestZPath.java +++ b/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/TestZPath.java @@ -33,25 +33,25 @@ public class TestZPath Assert.assertEquals(ZPath.root.nodeName(), ZKPaths.PATH_SEPARATOR); Assert.assertEquals(ZPath.root, ZPathImpl.root); Assert.assertTrue(ZPath.root.isRoot()); - Assert.assertEquals(ZPath.root.at("foo").parent(), ZPath.root); - Assert.assertTrue(ZPath.root.at("foo").parent().isRoot()); + Assert.assertEquals(ZPath.root.child("foo").parent(), ZPath.root); + Assert.assertTrue(ZPath.root.child("foo").parent().isRoot()); } @Test public void testBasic() { - ZPath path = ZPath.root.at("one").at("two"); + ZPath path = ZPath.root.child("one").child("two"); Assert.assertFalse(path.isRoot()); - Assert.assertEquals(path, ZPath.root.at("one").at("two")); - Assert.assertNotEquals(path, ZPath.root.at("onex").at("two")); + Assert.assertEquals(path, ZPath.root.child("one").child("two")); + Assert.assertNotEquals(path, ZPath.root.child("onex").child("two")); Assert.assertEquals(path.nodeName(), "two"); Assert.assertEquals(path.fullPath(), "/one/two"); Assert.assertEquals(path.parent().fullPath(), "/one"); Assert.assertEquals(path.fullPath(), "/one/two"); // call twice to test the internal cache Assert.assertEquals(path.parent().fullPath(), "/one"); // call twice to test the internal cache - Assert.assertTrue(path.startsWith(ZPath.root.at("one"))); - Assert.assertFalse(path.startsWith(ZPath.root.at("two"))); + Assert.assertTrue(path.startsWith(ZPath.root.child("one"))); + Assert.assertFalse(path.startsWith(ZPath.root.child("two"))); ZPath checkIdLike = ZPath.parse("/one/{two}/three"); Assert.assertTrue(checkIdLike.isResolved()); @@ -65,7 +65,7 @@ public class TestZPath public void testParsing() { Assert.assertEquals(ZPath.parse("/"), ZPath.root); - Assert.assertEquals(ZPath.parse("/one/two/three"), ZPath.root.at("one").at("two").at("three")); + Assert.assertEquals(ZPath.parse("/one/two/three"), ZPath.root.child("one").child("two").child("three")); Assert.assertEquals(ZPath.parse("/one/two/three"), ZPath.from("one", "two", "three")); Assert.assertEquals(ZPath.parseWithIds("/one/{id}/two/{id}"), ZPath.from("one", parameter(), "two", parameter())); }
