You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/05/03 02:37:44 UTC
curator git commit: pub-sub example is now working - needs copious
docs
Repository: curator
Updated Branches:
refs/heads/CURATOR-397 713bf4670 -> 0917e314b
pub-sub example is now working - needs copious docs
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/0917e314
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/0917e314
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/0917e314
Branch: refs/heads/CURATOR-397
Commit: 0917e314b4cbb75e24e86c942b9d6501f84e8572
Parents: 713bf46
Author: randgalt <ra...@apache.org>
Authored: Tue May 2 21:37:38 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Tue May 2 21:37:38 2017 -0500
----------------------------------------------------------------------
curator-examples/src/main/java/pubsub/SubPubTest.java | 12 ++++++------
.../modeled/details/CachedModeledFrameworkImpl.java | 2 +-
.../x/async/modeled/details/ModeledCacheImpl.java | 11 +++++++----
.../x/async/modeled/details/ModeledFrameworkImpl.java | 2 +-
4 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/0917e314/curator-examples/src/main/java/pubsub/SubPubTest.java
----------------------------------------------------------------------
diff --git a/curator-examples/src/main/java/pubsub/SubPubTest.java b/curator-examples/src/main/java/pubsub/SubPubTest.java
index 48d9d0b..32bd578 100644
--- a/curator-examples/src/main/java/pubsub/SubPubTest.java
+++ b/curator-examples/src/main/java/pubsub/SubPubTest.java
@@ -120,7 +120,7 @@ public class SubPubTest implements Closeable
case 0:
{
Instance instance = new Instance(nextId(), random(InstanceType.values()), random(hostnames), random(ports));
- System.out.println("Publishing instance");
+ System.out.println("Publishing 1 instance");
publisher.publishInstance(instance);
break;
}
@@ -130,7 +130,7 @@ public class SubPubTest implements Closeable
List<Instance> instances = IntStream.range(1, 10)
.mapToObj(__ -> new Instance(nextId(), random(InstanceType.values()), random(hostnames), random(ports)))
.collect(Collectors.toList());
- System.out.println("Publishing instances");
+ System.out.println(String.format("Publishing %d instances", instances.size()));
publisher.publishInstances(instances);
break;
}
@@ -138,7 +138,7 @@ public class SubPubTest implements Closeable
case 2:
{
LocationAvailable locationAvailable = new LocationAvailable(nextId(), random(Priority.values()), random(locations), random(durations));
- System.out.println("Publishing locationAvailable");
+ System.out.println("Publishing 1 locationAvailable");
publisher.publishLocationAvailable(random(groups), locationAvailable);
break;
}
@@ -148,7 +148,7 @@ public class SubPubTest implements Closeable
List<LocationAvailable> locationsAvailable = IntStream.range(1, 10)
.mapToObj(__ -> new LocationAvailable(nextId(), random(Priority.values()), random(locations), random(durations)))
.collect(Collectors.toList());
- System.out.println("Publishing locationsAvailable");
+ System.out.println(String.format("Publishing %d locationsAvailable", locationsAvailable.size()));
publisher.publishLocationsAvailable(random(groups), locationsAvailable);
break;
}
@@ -156,7 +156,7 @@ public class SubPubTest implements Closeable
case 4:
{
UserCreated userCreated = new UserCreated(nextId(), random(Priority.values()), random(locations), random(positions));
- System.out.println("Publishing userCreated");
+ System.out.println("Publishing 1 øuserCreated");
publisher.publishUserCreated(random(groups), userCreated);
break;
}
@@ -166,7 +166,7 @@ public class SubPubTest implements Closeable
List<UserCreated> usersCreated = IntStream.range(1, 10)
.mapToObj(__ -> new UserCreated(nextId(), random(Priority.values()), random(locations), random(positions)))
.collect(Collectors.toList());
- System.out.println("Publishing usersCreated");
+ System.out.println(String.format("Publishing %d usersCreated", usersCreated.size()));
publisher.publishUsersCreated(random(groups), usersCreated);
break;
}
http://git-wip-us.apache.org/repos/asf/curator/blob/0917e314/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 6e3b2e8..af0c153 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
@@ -44,7 +44,7 @@ class CachedModeledFrameworkImpl<T> implements CachedModeledFramework<T>
CachedModeledFrameworkImpl(ModeledFramework<T> client)
{
- this(client, new ModeledCacheImpl<>(client.unwrap().unwrap(), client.modelSpec().path(), client.modelSpec().serializer(), client.modelSpec().createOptions().contains(CreateOption.compress)));
+ this(client, new ModeledCacheImpl<>(client.unwrap().unwrap(), client.modelSpec()));
}
private CachedModeledFrameworkImpl(ModeledFramework<T> client, ModeledCacheImpl<T> cache)
http://git-wip-us.apache.org/repos/asf/curator/blob/0917e314/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCacheImpl.java
----------------------------------------------------------------------
diff --git a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCacheImpl.java b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCacheImpl.java
index f0e4fe8..472b1d4 100644
--- a/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCacheImpl.java
+++ b/curator-x-async/src/main/java/org/apache/curator/x/async/modeled/details/ModeledCacheImpl.java
@@ -24,7 +24,9 @@ import org.apache.curator.framework.listen.ListenerContainer;
import org.apache.curator.framework.recipes.cache.TreeCache;
import org.apache.curator.framework.recipes.cache.TreeCacheEvent;
import org.apache.curator.framework.recipes.cache.TreeCacheListener;
+import org.apache.curator.x.async.api.CreateOption;
import org.apache.curator.x.async.modeled.ModelSerializer;
+import org.apache.curator.x.async.modeled.ModelSpec;
import org.apache.curator.x.async.modeled.ZPath;
import org.apache.curator.x.async.modeled.cached.ModeledCache;
import org.apache.curator.x.async.modeled.cached.ModeledCacheListener;
@@ -55,12 +57,13 @@ class ModeledCacheImpl<T> implements TreeCacheListener, ModeledCache<T>
}
}
- ModeledCacheImpl(CuratorFramework client, ZPath path, ModelSerializer<T> serializer, boolean compressed)
+ ModeledCacheImpl(CuratorFramework client, ModelSpec<T> modelSpec)
{
- this.serializer = serializer;
- cache = TreeCache.newBuilder(client, path.fullPath())
+ this.serializer = modelSpec.serializer();
+ cache = TreeCache.newBuilder(client, modelSpec.path().fullPath())
.setCacheData(false)
- .setDataIsCompressed(compressed)
+ .setDataIsCompressed(modelSpec.createOptions().contains(CreateOption.compress))
+ .setCreateParentNodes(modelSpec.createOptions().contains(CreateOption.createParentsIfNeeded) || modelSpec.createOptions().contains(CreateOption.createParentsAsContainers))
.build();
}
http://git-wip-us.apache.org/repos/asf/curator/blob/0917e314/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 cc10272..b3c5db8 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
@@ -275,7 +275,7 @@ public class ModeledFrameworkImpl<T> implements ModeledFramework<T>
{
return client.transactionOp()
.create()
- .withOptions(modelSpec.createMode(), modelSpec.aclList(), modelSpec.createOptions().contains(CreateOption.compress), modelSpec.ttl())
+ .withOptions(modelSpec.createMode(), fixAclList(modelSpec.aclList()), modelSpec.createOptions().contains(CreateOption.compress), modelSpec.ttl())
.forPath(modelSpec.path().fullPath(), modelSpec.serializer().serialize(model));
}