You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/03/10 10:55:44 UTC
camel git commit: CAMEL-9691 - camel-infinispan : cleanup uri options
Repository: camel
Updated Branches:
refs/heads/master ff758c93f -> bf191d4e8
CAMEL-9691 - camel-infinispan : cleanup uri options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bf191d4e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf191d4e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf191d4e
Branch: refs/heads/master
Commit: bf191d4e845b99f5335851bd7a946cb3c18aedf7
Parents: ff758c9
Author: lburgazzoli <lb...@gmail.com>
Authored: Thu Mar 10 10:48:43 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 10 10:55:37 2016 +0100
----------------------------------------------------------------------
.../infinispan/InfinispanConfiguration.java | 23 +++++++++++++-------
.../InfinispanConsumerEmbeddedHandler.java | 5 ++---
.../InfinispanClusteredConsumerTest.java | 4 ++--
3 files changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bf191d4e/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
index e60fed0..473a267 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java
@@ -35,8 +35,15 @@ public class InfinispanConfiguration {
private BasicCacheContainer cacheContainer;
@UriParam
private String cacheName;
- @UriParam(label = "producer", defaultValue = "put", enums = "put,putAll,putIfAbsent,putAsync,putAllAsync,putIfAbsentAsync,get,containsKey,containsValue,remove,removeAsync,"
- + "replace,replaceAsync,clear,clearAsync,size")
+ @UriParam(label = "producer", defaultValue = "put", enums =
+ "put,putAll,putIfAbsent,putAsync,putAllAsync,putIfAbsentAsync,"
+ + "get,"
+ + "containsKey,containsValue,"
+ + "remove,removeAsync,"
+ + "replace,replaceAsync,"
+ + "size,"
+ + "clear,clearAsync,"
+ + "query")
private String command;
@UriParam(label = "consumer", defaultValue = "true")
private boolean sync = true;
@@ -45,8 +52,8 @@ public class InfinispanConfiguration {
@UriParam(label = "consumer")
private InfinispanCustomListener customListener;
@UriParam(label = "consumer", defaultValue = "false")
- private boolean clustered;
- @UriParam(label = "advanced")
+ private boolean clusteredListener;
+ @UriParam
private InfinispanQueryBuilder queryBuilder;
public String getCommand() {
@@ -111,12 +118,12 @@ public class InfinispanConfiguration {
/**
* If true, the listener will be installed for the entire cluster
*/
- public boolean isClustered() {
- return clustered;
+ public boolean isClusteredListener() {
+ return clusteredListener;
}
- public void setClustered(boolean clustered) {
- this.clustered = clustered;
+ public void setClusteredListener(boolean clusteredListener) {
+ this.clusteredListener = clusteredListener;
}
public Set<String> getEventTypes() {
http://git-wip-us.apache.org/repos/asf/camel/blob/bf191d4e/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanConsumerEmbeddedHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanConsumerEmbeddedHandler.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanConsumerEmbeddedHandler.java
index 712dec8..113c073 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanConsumerEmbeddedHandler.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/embedded/InfinispanConsumerEmbeddedHandler.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.infinispan.embedded;
import org.apache.camel.component.infinispan.InfinispanConfiguration;
import org.apache.camel.component.infinispan.InfinispanConsumer;
import org.apache.camel.component.infinispan.InfinispanConsumerHandler;
-import org.apache.camel.component.infinispan.InfinispanCustomListener;
import org.apache.camel.component.infinispan.InfinispanEventListener;
import org.infinispan.Cache;
@@ -36,8 +35,8 @@ public final class InfinispanConsumerEmbeddedHandler implements InfinispanConsum
InfinispanEventListener listener;
if (configuration.hasCustomListener()) {
listener = configuration.getCustomListener();
- ((InfinispanCustomListener)listener).setInfinispanConsumer(consumer);
- } else if (configuration.isClustered()) {
+ listener.setInfinispanConsumer(consumer);
+ } else if (configuration.isClusteredListener()) {
if (configuration.isSync()) {
listener = new InfinispanSyncClusteredEventListener(consumer, configuration.getEventTypes());
} else {
http://git-wip-us.apache.org/repos/asf/camel/blob/bf191d4e/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
index ab02821..85879f1 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanClusteredConsumerTest.java
@@ -95,9 +95,9 @@ public class InfinispanClusteredConsumerTest extends InfinispanClusterTestSuppor
return new RouteBuilder() {
@Override
public void configure() {
- from("infinispan://localhost?cacheContainer=#cacheContainer&clustered=true&eventTypes=CACHE_ENTRY_CREATED")
+ from("infinispan://localhost?cacheContainer=#cacheContainer&clusteredListener=true&eventTypes=CACHE_ENTRY_CREATED")
.to("mock:resultCreated");
- from("infinispan://localhost?cacheContainer=#cacheContainer&clustered=true&eventTypes=CACHE_ENTRY_EXPIRED")
+ from("infinispan://localhost?cacheContainer=#cacheContainer&clusteredListener=true&eventTypes=CACHE_ENTRY_EXPIRED")
.to("mock:resultExpired");
}
};