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/11 14:02:03 UTC
curator git commit: Updated sub/pub test to use new resolving
features so that at() isn't necessary
Repository: curator
Updated Branches:
refs/heads/CURATOR-397 6ea7221ab -> 05cab2ec5
Updated sub/pub test to use new resolving features so that at() isn't necessary
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/05cab2ec
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/05cab2ec
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/05cab2ec
Branch: refs/heads/CURATOR-397
Commit: 05cab2ec57208d3aa87202ff2d4f44146d5ba6b5
Parents: 6ea7221
Author: randgalt <ra...@apache.org>
Authored: Thu May 11 16:01:59 2017 +0200
Committer: randgalt <ra...@apache.org>
Committed: Thu May 11 16:01:59 2017 +0200
----------------------------------------------------------------------
curator-examples/src/main/java/pubsub/Clients.java | 6 +++---
curator-examples/src/main/java/pubsub/Publisher.java | 14 ++++----------
curator-examples/src/main/java/pubsub/Subscriber.java | 6 ++++--
3 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/05cab2ec/curator-examples/src/main/java/pubsub/Clients.java
----------------------------------------------------------------------
diff --git a/curator-examples/src/main/java/pubsub/Clients.java b/curator-examples/src/main/java/pubsub/Clients.java
index 345c644..c0a8136 100644
--- a/curator-examples/src/main/java/pubsub/Clients.java
+++ b/curator-examples/src/main/java/pubsub/Clients.java
@@ -41,7 +41,7 @@ public class Clients
public static final TypedModeledFramework2<LocationAvailable, Group, Priority> locationAvailableClient = TypedModeledFramework2.from(
ModeledFramework.builder(),
builder(LocationAvailable.class),
- "/root/pubsub/messages/locations/{group}/{priority}"
+ "/root/pubsub/messages/locations/{group}/{priority}/{id}"
);
/**
@@ -50,7 +50,7 @@ public class Clients
public static final TypedModeledFramework2<UserCreated, Group, Priority> userCreatedClient = TypedModeledFramework2.from(
ModeledFramework.builder(),
builder(UserCreated.class),
- "/root/pubsub/messages/users/{group}/{priority}"
+ "/root/pubsub/messages/users/{group}/{priority}/{id}"
);
/**
@@ -59,7 +59,7 @@ public class Clients
public static final TypedModeledFramework<Instance, InstanceType> instanceClient = TypedModeledFramework.from(
ModeledFramework.builder(),
builder(Instance.class),
- "/root/pubsub/instances/{instance-type}"
+ "/root/pubsub/instances/{instance-type}/{id}"
);
private static <T> ModelSpecBuilder<T> builder(Class<T> clazz)
http://git-wip-us.apache.org/repos/asf/curator/blob/05cab2ec/curator-examples/src/main/java/pubsub/Publisher.java
----------------------------------------------------------------------
diff --git a/curator-examples/src/main/java/pubsub/Publisher.java b/curator-examples/src/main/java/pubsub/Publisher.java
index e471262..5c8f7af 100644
--- a/curator-examples/src/main/java/pubsub/Publisher.java
+++ b/curator-examples/src/main/java/pubsub/Publisher.java
@@ -51,9 +51,7 @@ public class Publisher
*/
public void publishInstance(Instance instance)
{
- ModeledFramework<Instance> resolvedClient = Clients.instanceClient
- .resolved(client, instance.getType()) // this resolves to the parent path
- .at(instance); // this resolves to a child node - uses the Instance's id because Instance extends NodeName
+ ModeledFramework<Instance> resolvedClient = Clients.instanceClient.resolved(client, instance.getType());
resolvedClient.set(instance).exceptionally(e -> {
log.error("Could not publish instance: " + instance, e);
return null;
@@ -69,8 +67,7 @@ public class Publisher
{
List<CuratorOp> operations = instances.stream()
.map(instance -> Clients.instanceClient
- .resolved(client, instance.getType()) // this resolves to the parent path
- .at(instance) // this resolves to a child node - uses the Instance's id because Instance extends NodeName
+ .resolved(client, instance.getType())
.createOp(instance)
)
.collect(Collectors.toList());
@@ -126,9 +123,7 @@ public class Publisher
private <T extends Message> void publishMessage(TypedModeledFramework2<T, Group, Priority> typedClient, Group group, T message)
{
- ModeledFramework<T> resolvedClient = typedClient
- .resolved(client, group, message.getPriority())
- .at(message);
+ ModeledFramework<T> resolvedClient = typedClient.resolved(client, group, message.getPriority());
resolvedClient.set(message).exceptionally(e -> {
log.error("Could not publish message: " + message, e);
return null;
@@ -139,8 +134,7 @@ public class Publisher
{
List<CuratorOp> operations = messages.stream()
.map(message -> typedClient
- .resolved(client, group, message.getPriority()) // this resolves to the parent path
- .at(message) // this resolves to a child node - uses the Message's id because Message extends NodeName
+ .resolved(client, group, message.getPriority())
.createOp(message)
)
.collect(Collectors.toList());
http://git-wip-us.apache.org/repos/asf/curator/blob/05cab2ec/curator-examples/src/main/java/pubsub/Subscriber.java
----------------------------------------------------------------------
diff --git a/curator-examples/src/main/java/pubsub/Subscriber.java b/curator-examples/src/main/java/pubsub/Subscriber.java
index df7ee4c..d71b863 100644
--- a/curator-examples/src/main/java/pubsub/Subscriber.java
+++ b/curator-examples/src/main/java/pubsub/Subscriber.java
@@ -71,7 +71,8 @@ public class Subscriber
public CachedModeledFramework<Instance> startInstanceSubscriber(InstanceType instanceType)
{
CachedModeledFramework<Instance> resolved = Clients.instanceClient
- .resolved(client, instanceType) // resolves to the parent path - models are children of this path
+ .resolved(client, instanceType)
+ .parent() // resolves to the parent path - models are children of this path
.cached(); // makes a cached modeled instance
resolved.start();
return resolved;
@@ -80,7 +81,8 @@ public class Subscriber
private <T extends Message> CachedModeledFramework<T> startSubscriber(TypedModeledFramework2<T, Group, Priority> typedClient, Group group, Priority priority)
{
CachedModeledFramework<T> resolved = typedClient
- .resolved(client, group, priority) // resolves to the parent path - models are children of this path
+ .resolved(client, group, priority)
+ .parent() // resolves to the parent path - models are children of this path
.cached(); // makes a cached modeled instance
resolved.start();
return resolved;