You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/05/12 13:40:08 UTC
[1/3] camel git commit: CAMEL-11268: Removed specific Infinispan
JGroups version property
Repository: camel
Updated Branches:
refs/heads/master f3f07dc5e -> dbdab9173
CAMEL-11268: Removed specific Infinispan JGroups version property
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d8800aca
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d8800aca
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d8800aca
Branch: refs/heads/master
Commit: d8800aca154b307b85cb55722d08cba1e8500beb
Parents: 9530370
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri May 12 15:19:17 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri May 12 15:20:44 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d8800aca/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 324dbba..ea60f2a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -356,7 +356,6 @@
<jettison-version>1.3.8</jettison-version>
<jgit-version>4.7.0.201704051617-r</jgit-version>
<jgroups-version>4.0.3.Final</jgroups-version>
- <jgroups-infinispan-version>3.6.13.Final</jgroups-infinispan-version>
<libthrift-version>0.9.3</libthrift-version>
<jibx-version>1.2.6</jibx-version>
<jing-bundle-version>20030619_5</jing-bundle-version>
[3/3] camel git commit: CAMEL-11268: Fixed CS
Posted by ac...@apache.org.
CAMEL-11268: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbdab917
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbdab917
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbdab917
Branch: refs/heads/master
Commit: dbdab9173b57010fb4a8dc5ecca37d63b92004a2
Parents: d8800ac
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri May 12 15:34:16 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri May 12 15:34:16 2017 +0200
----------------------------------------------------------------------
.../infinispan/InfinispanProducer.java | 20 ++++++++++----------
.../infinispan/InfinispanProducerTest.java | 10 +++++-----
...ocalAggregationRepositoryOperationsTest.java | 2 +-
...nfinispanLocalAggregationRepositoryTest.java | 2 +-
...finispanDefaultIdempotentRepositoryTest.java | 7 +++----
.../InfinispanIdempotentRepositoryTest.java | 4 ++--
6 files changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
index a1bd132..c1ccda2 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
@@ -272,11 +272,11 @@ public class InfinispanProducer extends HeaderSelectorProducer {
final CompletableFuture<Boolean> resultRemoveAsyncKeyValue;
if (ObjectHelper.isEmpty(value)) {
- resultRemoveAsyncKey = cache.removeAsync(key);
+ resultRemoveAsyncKey = cache.removeAsync(key);
setResult(message, resultRemoveAsyncKey);
} else {
- resultRemoveAsyncKeyValue = cache.removeAsync(key, value);
- setResult(message, resultRemoveAsyncKeyValue);
+ resultRemoveAsyncKeyValue = cache.removeAsync(key, value);
+ setResult(message, resultRemoveAsyncKeyValue);
}
}
@@ -339,33 +339,33 @@ public class InfinispanProducer extends HeaderSelectorProducer {
TimeUnit maxIdleTimeUnit = message.getHeader(InfinispanConstants.MAX_IDLE_TIME_UNIT, TimeUnit.class);
if (ObjectHelper.isEmpty(oldValue)) {
- resultWithNewValue = cache.replaceAsync(key, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit);
+ resultWithNewValue = cache.replaceAsync(key, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit);
setResult(message, resultWithNewValue);
} else {
- resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit);
+ resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit);
setResult(message, resultWithNewAndOldValue);
}
} else {
if (ObjectHelper.isEmpty(oldValue)) {
- resultWithNewValue = cache.replaceAsync(key, value, lifespan, timeUnit);
+ resultWithNewValue = cache.replaceAsync(key, value, lifespan, timeUnit);
setResult(message, resultWithNewValue);
} else {
- resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit);
+ resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit);
setResult(message, resultWithNewAndOldValue);
}
}
} else {
if (ObjectHelper.isEmpty(oldValue)) {
- resultWithNewValue = cache.replaceAsync(key, value);
+ resultWithNewValue = cache.replaceAsync(key, value);
setResult(message, resultWithNewValue);
} else {
- resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value);
+ resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value);
setResult(message, resultWithNewAndOldValue);
}
}
}
-
+
@InvokeOnHeader("SIZE")
@InvokeOnHeader(InfinispanConstants.SIZE)
void onSize(Message message) {
http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
index 1343516..d26744a 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
@@ -120,7 +120,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
waitFor(new Condition() {
@Override
public boolean isSatisfied() throws Exception {
- CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
+ CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
Object value = currentCache().get(KEY_ONE);
return resultPutAsync.isDone() && value.equals(VALUE_ONE);
}
@@ -146,7 +146,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
waitFor(new Condition() {
@Override
public boolean isSatisfied() throws Exception {
- CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
+ CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
return resultPutAsync.isDone() && currentCache().get(KEY_ONE).toString().equals(VALUE_ONE);
}
}, 1000);
@@ -347,7 +347,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
waitFor(new Condition() {
@Override
public boolean isSatisfied() throws Exception {
- CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
+ CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
return resultPutAsync.isDone() && currentCache().get(KEY_ONE).equals(VALUE_ONE);
}
}, 2000);
@@ -368,7 +368,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
waitFor(new Condition() {
@Override
public boolean isSatisfied() throws Exception {
- CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
+ CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
return resultPutAsync.isDone() && currentCache().get(KEY_ONE).equals(VALUE_ONE);
}
}, 100);
@@ -393,7 +393,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
waitFor(new Condition() {
@Override
public boolean isSatisfied() throws Exception {
- CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
+ CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
return resultPutAsync.isDone() && currentCache().get(KEY_ONE).equals(VALUE_ONE);
}
}, 500);
http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java
index c10bdd4..95ac0b6 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java
@@ -45,7 +45,7 @@ public class InfinispanLocalAggregationRepositoryOperationsTest {
@BeforeClass
public static void starting() throws Exception {
- Configuration conf = new ConfigurationBuilder().build();
+ Configuration conf = new ConfigurationBuilder().build();
aggregationRepository = new InfinispanLocalAggregationRepository();
aggregationRepository.setConfiguration(conf);
aggregationRepository.start();
http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java
index 1c35d89..536f81f 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java
@@ -43,7 +43,7 @@ public class InfinispanLocalAggregationRepositoryTest extends CamelTestSupport {
@Test
public void checkAggregationFromOneRoute() throws Exception {
- Configuration conf = new ConfigurationBuilder().build();
+ Configuration conf = new ConfigurationBuilder().build();
final InfinispanLocalAggregationRepository repoOne =
new InfinispanLocalAggregationRepository();
repoOne.setConfiguration(conf);
http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java
index 0425aec..4bd7fb0 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java
@@ -16,19 +16,18 @@
*/
package org.apache.camel.component.infinispan.processor.idempotent;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
+import org.infinispan.manager.DefaultCacheManager;
import org.junit.Test;
import static org.jgroups.util.Util.assertFalse;
import static org.jgroups.util.Util.assertTrue;
-import org.infinispan.configuration.cache.ConfigurationBuilder;
-import org.infinispan.manager.DefaultCacheManager;
-
public class InfinispanDefaultIdempotentRepositoryTest {
@Test
public void createsRepositoryUsingInternalCache() throws Exception {
- DefaultCacheManager basicCacheContainer = new DefaultCacheManager(new ConfigurationBuilder().build());
+ DefaultCacheManager basicCacheContainer = new DefaultCacheManager(new ConfigurationBuilder().build());
InfinispanIdempotentRepository repository = InfinispanIdempotentRepository.infinispanIdempotentRepository(basicCacheContainer, "default");
assertFalse(repository.contains("One"));
http://git-wip-us.apache.org/repos/asf/camel/blob/dbdab917/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java
index 86e9485..e604d7f 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java
@@ -40,8 +40,8 @@ public class InfinispanIdempotentRepositoryTest {
@Before
public void setUp() throws Exception {
- GlobalConfiguration global = new GlobalConfigurationBuilder().globalJmxStatistics().allowDuplicateDomains(true).build();
- Configuration conf = new ConfigurationBuilder().build();
+ GlobalConfiguration global = new GlobalConfigurationBuilder().globalJmxStatistics().allowDuplicateDomains(true).build();
+ Configuration conf = new ConfigurationBuilder().build();
basicCacheContainer = new DefaultCacheManager(global, conf);
basicCacheContainer.start();
idempotentRepository = InfinispanIdempotentRepository.infinispanIdempotentRepository(basicCacheContainer, cacheName);
[2/3] camel git commit: CAMEL-11268: Upgrade camel-infinispan to
support Infinispan 9.x
Posted by ac...@apache.org.
CAMEL-11268: Upgrade camel-infinispan to support Infinispan 9.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9530370f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9530370f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9530370f
Branch: refs/heads/master
Commit: 9530370f7642a79b67f7bc4b999cfcae6c193305
Parents: f3f07dc
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri May 12 11:06:24 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri May 12 15:20:44 2017 +0200
----------------------------------------------------------------------
components/camel-infinispan/pom.xml | 11 +++++
.../infinispan/InfinispanProducer.java | 44 ++++++++++++--------
.../infinispan/InfinispanQueryBuilder.java | 2 +-
.../InfinispanConfigurationTestIT.java | 12 +-----
.../infinispan/InfinispanContinuousQueryIT.java | 6 +--
.../infinispan/InfinispanProducerTest.java | 20 ++++-----
.../InfinispanRemoteQueryProducerIT.java | 4 +-
.../infinispan/InfinispanTestSupport.java | 4 +-
.../InfinispanEmbeddedRoutePolicyTest.java | 3 +-
...ocalAggregationRepositoryOperationsTest.java | 6 ++-
...nfinispanLocalAggregationRepositoryTest.java | 6 ++-
...finispanDefaultIdempotentRepositoryTest.java | 6 ++-
.../InfinispanIdempotentRepositoryTest.java | 10 +++--
parent/pom.xml | 2 +-
.../features/src/main/resources/features.xml | 3 +-
15 files changed, 85 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/pom.xml b/components/camel-infinispan/pom.xml
index 0c89b8a..cd243a4 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -57,6 +57,11 @@
<artifactId>infinispan-client-hotrod</artifactId>
<version>${infinispan-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-remote-query-client</artifactId>
+ <version>${infinispan-version}</version>
+ </dependency>
<!-- testing -->
<dependency>
@@ -83,6 +88,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-marshaller-protostuff</artifactId>
+ <version>${infinispan-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.infinispan.server</groupId>
<artifactId>infinispan-server-testsuite</artifactId>
<version>${infinispan-version}</version>
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
index b370f14..a1bd132 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.infinispan;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import org.apache.camel.InvokeOnHeader;
@@ -25,8 +26,8 @@ import org.apache.camel.component.infinispan.remote.InfinispanRemoteOperation;
import org.apache.camel.impl.HeaderSelectorProducer;
import org.apache.camel.util.ObjectHelper;
import org.infinispan.commons.api.BasicCache;
-import org.infinispan.commons.util.concurrent.NotifyingFuture;
import org.infinispan.query.dsl.Query;
+import org.jgroups.util.NotifyingFuture;
public class InfinispanProducer extends HeaderSelectorProducer {
private final String cacheName;
@@ -90,7 +91,7 @@ public class InfinispanProducer extends HeaderSelectorProducer {
final BasicCache<Object, Object> cache = manager.getCache(message, this.cacheName);
final Object key = message.getHeader(InfinispanConstants.KEY);
final Object value = message.getHeader(InfinispanConstants.VALUE);
- final NotifyingFuture result;
+ final CompletableFuture<Object> result;
if (hasLifespan(message)) {
long lifespan = message.getHeader(InfinispanConstants.LIFESPAN_TIME, long.class);
@@ -139,7 +140,7 @@ public class InfinispanProducer extends HeaderSelectorProducer {
void onPutAllAsync(Message message) {
final BasicCache<Object, Object> cache = manager.getCache(message, this.cacheName);
final Map<Object, Object> map = message.getHeader(InfinispanConstants.MAP, Map.class);
- final NotifyingFuture result;
+ final CompletableFuture<Void> result;
if (hasLifespan(message)) {
long lifespan = message.getHeader(InfinispanConstants.LIFESPAN_TIME, long.class);
@@ -193,7 +194,7 @@ public class InfinispanProducer extends HeaderSelectorProducer {
final BasicCache<Object, Object> cache = manager.getCache(message, this.cacheName);
final Object key = message.getHeader(InfinispanConstants.KEY);
final Object value = message.getHeader(InfinispanConstants.VALUE);
- final NotifyingFuture result;
+ final CompletableFuture<Object> result;
if (hasLifespan(message)) {
long lifespan = message.getHeader(InfinispanConstants.LIFESPAN_TIME, long.class);
@@ -267,15 +268,16 @@ public class InfinispanProducer extends HeaderSelectorProducer {
final BasicCache<Object, Object> cache = manager.getCache(message, this.cacheName);
final Object key = message.getHeader(InfinispanConstants.KEY);
final Object value = message.getHeader(InfinispanConstants.VALUE);
- final NotifyingFuture result;
+ final CompletableFuture<Object> resultRemoveAsyncKey;
+ final CompletableFuture<Boolean> resultRemoveAsyncKeyValue;
if (ObjectHelper.isEmpty(value)) {
- result = cache.removeAsync(key);
+ resultRemoveAsyncKey = cache.removeAsync(key);
+ setResult(message, resultRemoveAsyncKey);
} else {
- result = cache.removeAsync(key, value);
+ resultRemoveAsyncKeyValue = cache.removeAsync(key, value);
+ setResult(message, resultRemoveAsyncKeyValue);
}
-
- setResult(message, result);
}
@InvokeOnHeader("REPLACE")
@@ -325,7 +327,8 @@ public class InfinispanProducer extends HeaderSelectorProducer {
final Object key = message.getHeader(InfinispanConstants.KEY);
final Object value = message.getHeader(InfinispanConstants.VALUE);
final Object oldValue = message.getHeader(InfinispanConstants.OLD_VALUE);
- final NotifyingFuture result;
+ final CompletableFuture<Object> resultWithNewValue;
+ final CompletableFuture<Boolean> resultWithNewAndOldValue;
if (hasLifespan(message)) {
long lifespan = message.getHeader(InfinispanConstants.LIFESPAN_TIME, long.class);
@@ -336,26 +339,31 @@ public class InfinispanProducer extends HeaderSelectorProducer {
TimeUnit maxIdleTimeUnit = message.getHeader(InfinispanConstants.MAX_IDLE_TIME_UNIT, TimeUnit.class);
if (ObjectHelper.isEmpty(oldValue)) {
- result = cache.replaceAsync(key, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit);
+ resultWithNewValue = cache.replaceAsync(key, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit);
+ setResult(message, resultWithNewValue);
} else {
- result = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit);
+ resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit, maxIdle, maxIdleTimeUnit);
+ setResult(message, resultWithNewAndOldValue);
}
} else {
if (ObjectHelper.isEmpty(oldValue)) {
- result = cache.replaceAsync(key, value, lifespan, timeUnit);
+ resultWithNewValue = cache.replaceAsync(key, value, lifespan, timeUnit);
+ setResult(message, resultWithNewValue);
} else {
- result = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit);
+ resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value, lifespan, timeUnit);
+ setResult(message, resultWithNewAndOldValue);
}
}
} else {
if (ObjectHelper.isEmpty(oldValue)) {
- result = cache.replaceAsync(key, value);
+ resultWithNewValue = cache.replaceAsync(key, value);
+ setResult(message, resultWithNewValue);
} else {
- result = cache.replaceAsync(key, oldValue, value);
+ resultWithNewAndOldValue = cache.replaceAsync(key, oldValue, value);
+ setResult(message, resultWithNewAndOldValue);
}
}
- setResult(message, result);
}
@InvokeOnHeader("SIZE")
@@ -379,7 +387,7 @@ public class InfinispanProducer extends HeaderSelectorProducer {
@InvokeOnHeader(InfinispanConstants.CLEAR_ASYNC)
void onCLearAsync(Message message) {
final BasicCache<Object, Object> cache = manager.getCache(message, this.cacheName);
- final NotifyingFuture result = cache.clearAsync();
+ final CompletableFuture<Void> result = cache.clearAsync();
setResult(message, result);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanQueryBuilder.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanQueryBuilder.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanQueryBuilder.java
index 828b470..03617b8 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanQueryBuilder.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanQueryBuilder.java
@@ -20,5 +20,5 @@ import org.infinispan.query.dsl.Query;
import org.infinispan.query.dsl.QueryFactory;
public interface InfinispanQueryBuilder {
- Query build(QueryFactory<Query> queryFactory);
+ Query build(QueryFactory queryFactory);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConfigurationTestIT.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConfigurationTestIT.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConfigurationTestIT.java
index 88d8ceb..5e25e81 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConfigurationTestIT.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConfigurationTestIT.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.infinispan;
import org.infinispan.cache.impl.DecoratedCache;
import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.commons.api.BasicCache;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
import org.jgroups.util.UUID;
import org.junit.Test;
@@ -33,22 +34,13 @@ public class InfinispanConfigurationTestIT {
public void embeddedCacheWithFlagsTest() throws Exception {
InfinispanConfiguration configuration = new InfinispanConfiguration();
configuration.setHosts("localhost");
- configuration.setCacheContainer(new DefaultCacheManager(true));
- configuration.setFlags(
- org.infinispan.context.Flag.SKIP_CACHE_LOAD,
- org.infinispan.context.Flag.SKIP_CACHE_STORE
- );
+ configuration.setCacheContainer(new DefaultCacheManager(new ConfigurationBuilder().build(), true));
InfinispanManager manager = new InfinispanManager(configuration);
manager.start();
BasicCache<Object, Object> cache = manager.getCache("misc_cache");
assertNotNull(cache);
- assertTrue(cache instanceof DecoratedCache);
-
- DecoratedCache<Object, Object> decoratedCache = (DecoratedCache<Object, Object>)cache;
- assertTrue(decoratedCache.getFlags().contains(org.infinispan.context.Flag.SKIP_CACHE_LOAD));
- assertTrue(decoratedCache.getFlags().contains(org.infinispan.context.Flag.SKIP_CACHE_STORE));
manager.getCacheContainer().stop();
manager.stop();
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
index 6386b36..e3a8e17 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanContinuousQueryIT.java
@@ -45,7 +45,7 @@ public class InfinispanContinuousQueryIT extends CamelTestSupport {
private static final InfinispanQueryBuilder CONTINUOUS_QUERY_BUILDER = new InfinispanQueryBuilder() {
@Override
- public Query build(QueryFactory<Query> queryFactory) {
+ public Query build(QueryFactory queryFactory) {
return queryFactory.from(User.class)
.having("name").like("CQ%")
.toBuilder().build();
@@ -54,7 +54,7 @@ public class InfinispanContinuousQueryIT extends CamelTestSupport {
private static final InfinispanQueryBuilder CONTINUOUS_QUERY_BUILDER_NO_MATCH = new InfinispanQueryBuilder() {
@Override
- public Query build(QueryFactory<Query> queryFactory) {
+ public Query build(QueryFactory queryFactory) {
return queryFactory.from(User.class)
.having("name").like("%TEST%")
.toBuilder().build();
@@ -63,7 +63,7 @@ public class InfinispanContinuousQueryIT extends CamelTestSupport {
private static final InfinispanQueryBuilder CONTINUOUS_QUERY_BUILDER_ALL = new InfinispanQueryBuilder() {
@Override
- public Query build(QueryFactory<Query> queryFactory) {
+ public Query build(QueryFactory queryFactory) {
return queryFactory.from(User.class)
.having("name").like("%Q0%")
.toBuilder().build();
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
index 80c2ed9..1343516 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanProducerTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.infinispan;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
@@ -25,7 +26,6 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.infinispan.util.Condition;
import org.infinispan.Cache;
-import org.infinispan.commons.util.concurrent.NotifyingFuture;
import org.infinispan.stats.Stats;
import org.junit.Test;
@@ -98,7 +98,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
waitFor(new Condition() {
@Override
public boolean isSatisfied() throws Exception {
- NotifyingFuture resultPutAsync = exchange.getIn().getBody(NotifyingFuture.class);
+ CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
Object value = currentCache().get(KEY_ONE);
return resultPutAsync.isDone() && value.toString().equals(VALUE_ONE);
}
@@ -120,7 +120,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
waitFor(new Condition() {
@Override
public boolean isSatisfied() throws Exception {
- NotifyingFuture resultPutAsync = exchange.getIn().getBody(NotifyingFuture.class);
+ CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
Object value = currentCache().get(KEY_ONE);
return resultPutAsync.isDone() && value.equals(VALUE_ONE);
}
@@ -146,7 +146,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
waitFor(new Condition() {
@Override
public boolean isSatisfied() throws Exception {
- NotifyingFuture resultPutAsync = exchange.getIn().getBody(NotifyingFuture.class);
+ CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
return resultPutAsync.isDone() && currentCache().get(KEY_ONE).toString().equals(VALUE_ONE);
}
}, 1000);
@@ -347,7 +347,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
waitFor(new Condition() {
@Override
public boolean isSatisfied() throws Exception {
- NotifyingFuture resultPutAsync = exchange.getIn().getBody(NotifyingFuture.class);
+ CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
return resultPutAsync.isDone() && currentCache().get(KEY_ONE).equals(VALUE_ONE);
}
}, 2000);
@@ -368,7 +368,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
waitFor(new Condition() {
@Override
public boolean isSatisfied() throws Exception {
- NotifyingFuture resultPutAsync = exchange.getIn().getBody(NotifyingFuture.class);
+ CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
return resultPutAsync.isDone() && currentCache().get(KEY_ONE).equals(VALUE_ONE);
}
}, 100);
@@ -393,7 +393,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
waitFor(new Condition() {
@Override
public boolean isSatisfied() throws Exception {
- NotifyingFuture resultPutAsync = exchange.getIn().getBody(NotifyingFuture.class);
+ CompletableFuture<Object> resultPutAsync = exchange.getIn().getBody(CompletableFuture.class);
return resultPutAsync.isDone() && currentCache().get(KEY_ONE).equals(VALUE_ONE);
}
}, 500);
@@ -808,7 +808,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
});
Thread.sleep(100);
- NotifyingFuture fut = exchange.getIn().getBody(NotifyingFuture.class);
+ CompletableFuture<Object> fut = exchange.getIn().getBody(CompletableFuture.class);
assertTrue(fut.isDone());
Object value = currentCache().get(KEY_ONE);
@@ -848,7 +848,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
});
Thread.sleep(100);
- NotifyingFuture fut = exchange.getIn().getBody(NotifyingFuture.class);
+ CompletableFuture<Object> fut = exchange.getIn().getBody(CompletableFuture.class);
assertTrue(fut.isDone());
Object value = currentCache().get(KEY_ONE);
@@ -956,7 +956,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
});
Thread.sleep(100);
- NotifyingFuture fut = exchange.getIn().getBody(NotifyingFuture.class);
+ CompletableFuture<Object> fut = exchange.getIn().getBody(CompletableFuture.class);
assertTrue(fut.isDone());
assertTrue(currentCache().isEmpty());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java
index 0848271..1239c61 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteQueryProducerIT.java
@@ -51,7 +51,7 @@ public class InfinispanRemoteQueryProducerIT extends CamelTestSupport {
private static final InfinispanQueryBuilder NO_RESULT_QUERY_BUILDER = new InfinispanQueryBuilder() {
@Override
- public Query build(QueryFactory<Query> queryFactory) {
+ public Query build(QueryFactory queryFactory) {
return queryFactory.from(User.class)
.having("name").like("%abc%")
.toBuilder().build();
@@ -60,7 +60,7 @@ public class InfinispanRemoteQueryProducerIT extends CamelTestSupport {
private static final InfinispanQueryBuilder WITH_RESULT_QUERY_BUILDER = new InfinispanQueryBuilder() {
@Override
- public Query build(QueryFactory<Query> queryFactory) {
+ public Query build(QueryFactory queryFactory) {
return queryFactory.from(User.class)
.having("name").like("%A")
.toBuilder().build();
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java
index 59af67f..635bec7 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanTestSupport.java
@@ -20,6 +20,8 @@ import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.infinispan.commons.api.BasicCache;
import org.infinispan.commons.api.BasicCacheContainer;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
+import org.infinispan.configuration.global.GlobalConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.test.TestingUtil;
import org.infinispan.util.ControlledTimeService;
@@ -38,7 +40,7 @@ public class InfinispanTestSupport extends CamelTestSupport {
@Override
@Before
public void setUp() throws Exception {
- basicCacheContainer = new DefaultCacheManager();
+ basicCacheContainer = new DefaultCacheManager(new ConfigurationBuilder().build());
basicCacheContainer.start();
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanEmbeddedRoutePolicyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanEmbeddedRoutePolicyTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanEmbeddedRoutePolicyTest.java
index b029638..b348946 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanEmbeddedRoutePolicyTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanEmbeddedRoutePolicyTest.java
@@ -17,12 +17,13 @@
package org.apache.camel.component.infinispan.policy;
import org.infinispan.commons.api.BasicCacheContainer;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
public class InfinispanEmbeddedRoutePolicyTest extends InfinispanRoutePolicyTestBase {
@Override
protected BasicCacheContainer createCacheManager() throws Exception {
- return new DefaultCacheManager(true);
+ return new DefaultCacheManager(new ConfigurationBuilder().build());
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java
index f1265c7..c10bdd4 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryOperationsTest.java
@@ -23,6 +23,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.DefaultExchangeHolder;
+import org.infinispan.configuration.cache.Configuration;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -43,7 +45,9 @@ public class InfinispanLocalAggregationRepositoryOperationsTest {
@BeforeClass
public static void starting() throws Exception {
- aggregationRepository = new InfinispanLocalAggregationRepository("pippo");
+ Configuration conf = new ConfigurationBuilder().build();
+ aggregationRepository = new InfinispanLocalAggregationRepository();
+ aggregationRepository.setConfiguration(conf);
aggregationRepository.start();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java
index 5090c20..1c35d89 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/aggregate/InfinispanLocalAggregationRepositoryTest.java
@@ -24,6 +24,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.infinispan.configuration.cache.Configuration;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.junit.Test;
@@ -41,8 +43,10 @@ public class InfinispanLocalAggregationRepositoryTest extends CamelTestSupport {
@Test
public void checkAggregationFromOneRoute() throws Exception {
+ Configuration conf = new ConfigurationBuilder().build();
final InfinispanLocalAggregationRepository repoOne =
- new InfinispanLocalAggregationRepository("pippo");
+ new InfinispanLocalAggregationRepository();
+ repoOne.setConfiguration(conf);
final int completionSize = 4;
final String correlator = "CORRELATOR";
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java
index c4877e4..0425aec 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanDefaultIdempotentRepositoryTest.java
@@ -21,11 +21,15 @@ import org.junit.Test;
import static org.jgroups.util.Util.assertFalse;
import static org.jgroups.util.Util.assertTrue;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
+import org.infinispan.manager.DefaultCacheManager;
+
public class InfinispanDefaultIdempotentRepositoryTest {
@Test
public void createsRepositoryUsingInternalCache() throws Exception {
- InfinispanIdempotentRepository repository = InfinispanIdempotentRepository.infinispanIdempotentRepository();
+ DefaultCacheManager basicCacheContainer = new DefaultCacheManager(new ConfigurationBuilder().build());
+ InfinispanIdempotentRepository repository = InfinispanIdempotentRepository.infinispanIdempotentRepository(basicCacheContainer, "default");
assertFalse(repository.contains("One"));
assertFalse(repository.remove("One"));
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java
index 36c6196..86e9485 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepositoryTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.infinispan.processor.idempotent;
import org.infinispan.commons.api.BasicCache;
import org.infinispan.commons.api.BasicCacheContainer;
+import org.infinispan.configuration.cache.Configuration;
+import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.configuration.global.GlobalConfiguration;
import org.infinispan.configuration.global.GlobalConfigurationBuilder;
import org.infinispan.manager.DefaultCacheManager;
@@ -30,15 +32,17 @@ import static org.jgroups.util.Util.assertTrue;
public class InfinispanIdempotentRepositoryTest {
- public static final GlobalConfiguration GLOBAL_CONFIGURATION = new GlobalConfigurationBuilder().globalJmxStatistics().allowDuplicateDomains(true).build();
+ public static final GlobalConfiguration GLOBAL_CONFIGURATION = new GlobalConfigurationBuilder().build();
protected BasicCacheContainer basicCacheContainer;
protected InfinispanIdempotentRepository idempotentRepository;
- protected String cacheName = "test";
+ protected String cacheName = "default";
@Before
public void setUp() throws Exception {
- basicCacheContainer = new DefaultCacheManager(GLOBAL_CONFIGURATION);
+ GlobalConfiguration global = new GlobalConfigurationBuilder().globalJmxStatistics().allowDuplicateDomains(true).build();
+ Configuration conf = new ConfigurationBuilder().build();
+ basicCacheContainer = new DefaultCacheManager(global, conf);
basicCacheContainer.start();
idempotentRepository = InfinispanIdempotentRepository.infinispanIdempotentRepository(basicCacheContainer, cacheName);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2e73ec9..324dbba 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -287,7 +287,7 @@
<ibatis-version>2.3.4.726</ibatis-version>
<ical4j-version>1.0.7</ical4j-version>
<ignite-version>1.9.0</ignite-version>
- <infinispan-version>8.2.6.Final</infinispan-version>
+ <infinispan-version>9.0.0.Final</infinispan-version>
<influx-java-driver-version>2.5</influx-java-driver-version>
<influx-java-driver-bundle-version>2.5_1</influx-java-driver-bundle-version>
<influx-guava-version>20.0</influx-guava-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/9530370f/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 61b570c..69bf7ef 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -914,7 +914,8 @@
<bundle dependency='true'>mvn:org.infinispan/infinispan-commons/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-query-dsl/${infinispan-version}</bundle>
<bundle dependency='true'>mvn:org.infinispan/infinispan-client-hotrod/${infinispan-version}</bundle>
- <bundle dependency='true'>mvn:org.jgroups/jgroups/${jgroups-infinispan-version}</bundle>
+ <bundle dependency='true'>mvn:org.jgroups/jgroups/${jgroups-version}</bundle>
+ <bundle dependency='true'>mvn:com.github.ben-manes.caffeine/caffeine/${caffeine-version}</bundle>
<bundle dependency='true'>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.jboss.marshalling/jboss-marshalling-osgi/${jboss-marshalling-version}</bundle>
<bundle dependency='true'>wrap:mvn:org.jboss.marshalling/jboss-marshalling-river/${jboss-marshalling-version}</bundle>