cleaned up ModeledCacheEvent definition
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/aadb72b6 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/aadb72b6 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/aadb72b6 Branch: refs/heads/CURATOR-397 Commit: aadb72b62d6c781704f4ac977717c07a86a2694d Parents: bf43232 Author: randgalt <randg...@apache.org> Authored: Sun Apr 9 08:53:05 2017 -0500 Committer: randgalt <randg...@apache.org> Committed: Sun Apr 9 08:53:05 2017 -0500 ---------------------------------------------------------------------- .../details/recipes/ModeledNodeCacheImpl.java | 8 ++-- .../recipes/ModeledPathChildrenCacheImpl.java | 4 +- .../details/recipes/ModeledTreeCacheImpl.java | 4 +- .../modeled/recipes/ModeledCacheEvent.java | 6 +-- .../modeled/recipes/ModeledCacheListener.java | 2 +- .../modeled/recipes/TestModeledCaches.java | 42 ++++++++++---------- 6 files changed, 32 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/aadb72b6/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledNodeCacheImpl.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledNodeCacheImpl.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledNodeCacheImpl.java index e7bfb7c..5b89faf 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledNodeCacheImpl.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledNodeCacheImpl.java @@ -98,9 +98,9 @@ public class ModeledNodeCacheImpl<T> implements ModeledNodeCache<T>, ConnectionS } @Override - public Optional<ModeledCachedNode<T>> getNode() + public ModeledCachedNode<T> getNode() { - return Optional.empty(); + return null; } }; listenerMap.keySet().forEach(l -> l.event(null)); @@ -180,9 +180,9 @@ public class ModeledNodeCacheImpl<T> implements ModeledNodeCache<T>, ConnectionS } @Override - public Optional<ModeledCachedNode<T>> getNode() + public ModeledCachedNode<T> getNode() { - return currentData; + return currentData.orElse(null); } }; listener.event(event); http://git-wip-us.apache.org/repos/asf/curator/blob/aadb72b6/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledPathChildrenCacheImpl.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledPathChildrenCacheImpl.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledPathChildrenCacheImpl.java index ac7ebbb..b04cf02 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledPathChildrenCacheImpl.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledPathChildrenCacheImpl.java @@ -127,7 +127,7 @@ public class ModeledPathChildrenCacheImpl<T> implements ModeledPathChildrenCache { PathChildrenCacheListener pathChildrenCacheListener = (client, event) -> { ModeledCacheEventType eventType = toType(event.getType()); - Optional<ModeledCachedNode<T>> node = Optional.ofNullable(from(serializer, event.getData())); + ModeledCachedNode<T> node = from(serializer, event.getData()); ModeledCacheEvent<T> modeledEvent = new ModeledCacheEvent<T>() { @Override @@ -137,7 +137,7 @@ public class ModeledPathChildrenCacheImpl<T> implements ModeledPathChildrenCache } @Override - public Optional<ModeledCachedNode<T>> getNode() + public ModeledCachedNode<T> getNode() { return node; } http://git-wip-us.apache.org/repos/asf/curator/blob/aadb72b6/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledTreeCacheImpl.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledTreeCacheImpl.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledTreeCacheImpl.java index f5d4c1e..bf8899b 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledTreeCacheImpl.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/recipes/ModeledTreeCacheImpl.java @@ -97,7 +97,7 @@ public class ModeledTreeCacheImpl<T> implements ModeledTreeCache<T> { TreeCacheListener treeCacheListener = (client, event) -> { ModeledCacheEventType eventType = toType(event.getType()); - Optional<ModeledCachedNode<T>> node = Optional.ofNullable(from(serializer, event.getData())); + ModeledCachedNode<T> node = from(serializer, event.getData()); ModeledCacheEvent<T> wrappedEvent = new ModeledCacheEvent<T>() { @Override @@ -107,7 +107,7 @@ public class ModeledTreeCacheImpl<T> implements ModeledTreeCache<T> } @Override - public Optional<ModeledCachedNode<T>> getNode() + public ModeledCachedNode<T> getNode() { return node; } http://git-wip-us.apache.org/repos/asf/curator/blob/aadb72b6/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/recipes/ModeledCacheEvent.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/recipes/ModeledCacheEvent.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/recipes/ModeledCacheEvent.java index b84b1c3..469d8d6 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/recipes/ModeledCacheEvent.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/recipes/ModeledCacheEvent.java @@ -18,8 +18,6 @@ */ package org.apache.curator.x.async.modeled.recipes; -import java.util.Optional; - /** * Abstracts a cache event */ @@ -33,9 +31,9 @@ public interface ModeledCacheEvent<T> ModeledCacheEventType getType(); /** - * Cached node if appropriate for the event + * Cached node if appropriate for the event (i.e. NODE_* events) * * @return node */ - Optional<ModeledCachedNode<T>> getNode(); + ModeledCachedNode<T> getNode(); } http://git-wip-us.apache.org/repos/asf/curator/blob/aadb72b6/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/recipes/ModeledCacheListener.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/recipes/ModeledCacheListener.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/recipes/ModeledCacheListener.java index c3660a9..7b82e72 100644 --- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/recipes/ModeledCacheListener.java +++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/recipes/ModeledCacheListener.java @@ -79,6 +79,6 @@ public interface ModeledCacheListener<T> */ static <T> Predicate<ModeledCacheEvent<T>> hasModelFilter() { - return event -> event.getNode().isPresent() && (event.getNode().get().getModel() != null); + return event -> (event.getNode() != null) && (event.getNode().getModel() != null); } } http://git-wip-us.apache.org/repos/asf/curator/blob/aadb72b6/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/recipes/TestModeledCaches.java ---------------------------------------------------------------------- diff --git a/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/recipes/TestModeledCaches.java b/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/recipes/TestModeledCaches.java index 5f748fd..51114f0 100644 --- a/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/recipes/TestModeledCaches.java +++ b/curator-x-async/src/test/java/org/apache/curator/x/async/modeled/recipes/TestModeledCaches.java @@ -90,23 +90,23 @@ public class TestModeledCaches extends CompletableBaseClassForTests ModeledCacheEvent<TestModel> event = events.poll(timing.milliseconds(), TimeUnit.MILLISECONDS); Assert.assertNotNull(event); Assert.assertEquals(event.getType(), ModeledCacheEventType.NODE_UPDATED); - Assert.assertTrue(event.getNode().isPresent()); - Assert.assertEquals(event.getNode().get().getPath(), path); - Assert.assertEquals(event.getNode().get().getModel(), model1); - Assert.assertEquals(event.getNode().get().getStat(), stat); + Assert.assertNotNull(event.getNode()); + Assert.assertEquals(event.getNode().getPath(), path); + Assert.assertEquals(event.getNode().getModel(), model1); + Assert.assertEquals(event.getNode().getStat(), stat); timing.sleepABit(); Assert.assertEquals(events.size(), 0); modeled.update(model2); event = events.poll(timing.milliseconds(), TimeUnit.MILLISECONDS); - Assert.assertTrue(event.getNode().isPresent()); - Assert.assertEquals(event.getNode().get().getPath(), path); - Assert.assertEquals(event.getNode().get().getModel(), model2); + Assert.assertNotNull(event.getNode()); + Assert.assertEquals(event.getNode().getPath(), path); + Assert.assertEquals(event.getNode().getModel(), model2); modeled.delete(); event = events.poll(timing.milliseconds(), TimeUnit.MILLISECONDS); - Assert.assertFalse(event.getNode().isPresent()); + Assert.assertNull(event.getNode()); } } @@ -132,23 +132,23 @@ public class TestModeledCaches extends CompletableBaseClassForTests Assert.assertNotNull(event2); Assert.assertEquals(event1.getType(), ModeledCacheEventType.NODE_ADDED); Assert.assertEquals(event2.getType(), ModeledCacheEventType.NODE_ADDED); - Assert.assertEquals(event1.getNode().isPresent() ? event1.getNode().get().getModel() : null, model1); - Assert.assertEquals(event2.getNode().isPresent() ? event2.getNode().get().getModel() : null, model2); - Assert.assertEquals(event1.getNode().get().getPath(), path.at("1")); - Assert.assertEquals(event2.getNode().get().getPath(), path.at("2")); + Assert.assertEquals((event1.getNode() != null) ? event1.getNode().getModel() : null, model1); + Assert.assertEquals((event2.getNode() != null) ? event2.getNode().getModel() : null, model2); + Assert.assertEquals(event1.getNode().getPath(), path.at("1")); + Assert.assertEquals(event2.getNode().getPath(), path.at("2")); modeled.at("1").delete(); event1 = events.poll(timing.milliseconds(), TimeUnit.MILLISECONDS); Assert.assertNotNull(event1); Assert.assertEquals(event1.getType(), ModeledCacheEventType.NODE_REMOVED); - Assert.assertEquals(event1.getNode().get().getPath(), path.at("1")); + Assert.assertEquals(event1.getNode().getPath(), path.at("1")); modeled.at("2").update(model3); event1 = events.poll(timing.milliseconds(), TimeUnit.MILLISECONDS); Assert.assertNotNull(event1); Assert.assertEquals(event1.getType(), ModeledCacheEventType.NODE_UPDATED); - Assert.assertEquals(event1.getNode().get().getPath(), path.at("2")); - Assert.assertEquals(event1.getNode().isPresent() ? event1.getNode().get().getModel() : null, model3); + Assert.assertEquals(event1.getNode().getPath(), path.at("2")); + Assert.assertEquals((event1.getNode() != null) ? event1.getNode().getModel() : null, model3); cache.getListenable().removeListener(listener); modeled.at("2").delete(); @@ -181,12 +181,12 @@ public class TestModeledCaches extends CompletableBaseClassForTests Assert.assertEquals(event1.getType(), ModeledCacheEventType.NODE_ADDED); Assert.assertEquals(event2.getType(), ModeledCacheEventType.NODE_ADDED); Assert.assertEquals(event3.getType(), ModeledCacheEventType.NODE_ADDED); - Assert.assertEquals(event1.getNode().isPresent() ? event1.getNode().get().getModel() : null, model1); - Assert.assertEquals(event2.getNode().isPresent() ? event2.getNode().get().getModel() : null, model2); - Assert.assertEquals(event3.getNode().isPresent() ? event3.getNode().get().getModel() : null, model3); - Assert.assertEquals(event1.getNode().get().getPath(), path.at("1")); - Assert.assertEquals(event2.getNode().get().getPath(), path.at("1").at("2")); - Assert.assertEquals(event3.getNode().get().getPath(), path.at("1").at("2").at("3")); + Assert.assertEquals((event1.getNode() != null) ? event1.getNode().getModel() : null, model1); + Assert.assertEquals((event2.getNode() != null) ? event2.getNode().getModel() : null, model2); + Assert.assertEquals((event3.getNode() != null) ? event3.getNode().getModel() : null, model3); + Assert.assertEquals(event1.getNode().getPath(), path.at("1")); + Assert.assertEquals(event2.getNode().getPath(), path.at("1").at("2")); + Assert.assertEquals(event3.getNode().getPath(), path.at("1").at("2").at("3")); } } }
