You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/10/19 23:55:46 UTC
git commit: Upgraded to infinispan 6.0.0.CR1,
polished it's component's codebase a bit and resolved the reported
compiler warnings of it.
Updated Branches:
refs/heads/master 3d543dc78 -> 5b0d4822d
Upgraded to infinispan 6.0.0.CR1, polished it's component's codebase a bit and resolved the reported compiler warnings of it.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b0d4822
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b0d4822
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b0d4822
Branch: refs/heads/master
Commit: 5b0d4822d8eda3c5c9c4101f8090979958609111
Parents: 3d543dc
Author: Babak Vahdat <bv...@apache.org>
Authored: Sat Oct 19 23:55:35 2013 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sat Oct 19 23:55:35 2013 +0200
----------------------------------------------------------------------
.../component/infinispan/InfinispanComponent.java | 1 +
.../component/infinispan/InfinispanEndpoint.java | 7 +++----
.../component/infinispan/InfinispanOperation.java | 15 +++++++--------
.../component/infinispan/InfinispanProducer.java | 11 +++++++----
.../infinispan/InfinispanSyncEventListener.java | 2 +-
.../idempotent/InfinispanIdempotentRepository.java | 7 +++++++
.../infinispan/InfinispanComponentTest.java | 1 +
.../component/infinispan/InfinispanConsumerTest.java | 1 +
.../component/infinispan/InfinispanProducerTest.java | 1 +
.../infinispan/InfinispanRemoteProducerTest.java | 3 ++-
.../infinispan/InfinispanSyncConsumerTest.java | 6 +-----
parent/pom.xml | 2 +-
12 files changed, 33 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java
index 6da833d..cb2a6c8 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanComponent.java
@@ -23,6 +23,7 @@ import org.apache.camel.impl.DefaultComponent;
public class InfinispanComponent extends DefaultComponent {
+ @Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
InfinispanConfiguration configuration = new InfinispanConfiguration();
configuration.setHost(remaining);
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanEndpoint.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanEndpoint.java
index bf5409b..8680c26 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanEndpoint.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanEndpoint.java
@@ -27,23 +27,22 @@ public class InfinispanEndpoint extends DefaultEndpoint {
public InfinispanEndpoint() {
}
- public InfinispanEndpoint(String endpointUri) {
- super(endpointUri);
- }
-
public InfinispanEndpoint(String uri, InfinispanComponent component, InfinispanConfiguration configuration) {
super(uri, component);
this.configuration = configuration;
}
+ @Override
public Producer createProducer() throws Exception {
return new InfinispanProducer(this, configuration);
}
+ @Override
public Consumer createConsumer(Processor processor) throws Exception {
return new InfinispanConsumer(this, processor, configuration);
}
+ @Override
public boolean isSingleton() {
return true;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
index 98cbc83..ae8e18d 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanOperation.java
@@ -18,15 +18,14 @@ package org.apache.camel.component.infinispan;
import org.apache.camel.Exchange;
import org.infinispan.commons.api.BasicCache;
-import org.infinispan.commons.api.BasicCacheContainer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class InfinispanOperation {
private static final transient Logger LOGGER = LoggerFactory.getLogger(InfinispanOperation.class);
- private BasicCache cache;
+ private final BasicCache<Object, Object> cache;
- public InfinispanOperation(BasicCache cache) {
+ public InfinispanOperation(BasicCache<Object, Object> cache) {
this.cache = cache;
}
@@ -47,19 +46,19 @@ public class InfinispanOperation {
enum Operation {
PUT {
@Override
- void execute(BasicCache cache, Exchange exchange) {
+ void execute(BasicCache<Object, Object> cache, Exchange exchange) {
Object result = cache.put(getKey(exchange), getValue(exchange));
setResult(result, exchange);
}
}, GET {
@Override
- void execute(BasicCache cache, Exchange exchange) {
+ void execute(BasicCache<Object, Object> cache, Exchange exchange) {
Object result = cache.get(getKey(exchange));
setResult(result, exchange);
}
}, REMOVE {
@Override
- void execute(BasicCache cache, Exchange exchange) {
+ void execute(BasicCache<Object, Object> cache, Exchange exchange) {
Object result = cache.remove(getKey(exchange));
setResult(result, exchange);
}
@@ -67,7 +66,7 @@ public class InfinispanOperation {
}, CLEAR {
@Override
- void execute(BasicCache cache, Exchange exchange) {
+ void execute(BasicCache<Object, Object> cache, Exchange exchange) {
cache.clear();
}
};
@@ -84,7 +83,7 @@ public class InfinispanOperation {
return exchange.getIn().getHeader(InfinispanConstants.VALUE);
}
- abstract void execute(BasicCache cache, Exchange exchange);
+ abstract void execute(BasicCache<Object, Object> cache, Exchange exchange);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/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 d5bc623..9e3037c 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
@@ -19,6 +19,8 @@ package org.apache.camel.component.infinispan;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
import org.infinispan.client.hotrod.RemoteCacheManager;
+import org.infinispan.client.hotrod.configuration.Configuration;
+import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.infinispan.commons.api.BasicCache;
import org.infinispan.commons.api.BasicCacheContainer;
import org.slf4j.Logger;
@@ -26,7 +28,7 @@ import org.slf4j.LoggerFactory;
public class InfinispanProducer extends DefaultProducer {
private static final transient Logger LOGGER = LoggerFactory.getLogger(InfinispanProducer.class);
- private InfinispanConfiguration configuration;
+ private final InfinispanConfiguration configuration;
private BasicCacheContainer cacheContainer;
private boolean isManagedCacheContainer;
@@ -35,6 +37,7 @@ public class InfinispanProducer extends DefaultProducer {
this.configuration = configuration;
}
+ @Override
public void process(Exchange exchange) throws Exception {
new InfinispanOperation(getCache(exchange)).process(exchange);
}
@@ -43,8 +46,8 @@ public class InfinispanProducer extends DefaultProducer {
protected void doStart() throws Exception {
cacheContainer = configuration.getCacheContainer();
if (cacheContainer == null) {
- cacheContainer = new RemoteCacheManager(configuration.getHost());
- cacheContainer.start();
+ Configuration config = new ConfigurationBuilder().classLoader(Thread.currentThread().getContextClassLoader()).addServers(configuration.getHost()).build();
+ cacheContainer = new RemoteCacheManager(config, true);
isManagedCacheContainer = true;
}
super.doStart();
@@ -58,7 +61,7 @@ public class InfinispanProducer extends DefaultProducer {
super.doStop();
}
- private BasicCache getCache(Exchange exchange) {
+ private BasicCache<Object, Object> getCache(Exchange exchange) {
String cacheName = exchange.getIn().getHeader(InfinispanConstants.CACHE_NAME, String.class);
if (cacheName == null) {
cacheName = configuration.getCacheName();
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanSyncEventListener.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanSyncEventListener.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanSyncEventListener.java
index 1930d90..2ae6f00 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanSyncEventListener.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanSyncEventListener.java
@@ -50,7 +50,7 @@ public class InfinispanSyncEventListener {
@CacheEntryPassivated
@CacheEntryRemoved
@CacheEntryVisited
- public void processEvent(CacheEntryEvent event) {
+ public void processEvent(CacheEntryEvent<Object, Object> event) {
logger.trace("Received CacheEntryEvent [{}]", event);
if (eventTypes == null || eventTypes.isEmpty() || eventTypes.contains(event.getType().toString())) {
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepository.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepository.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepository.java
index a85ed25..8960628 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepository.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/processor/idempotent/InfinispanIdempotentRepository.java
@@ -59,17 +59,20 @@ public class InfinispanIdempotentRepository extends ServiceSupport implements Id
return new InfinispanIdempotentRepository();
}
+ @Override
@ManagedOperation(description = "Adds the key to the store")
public boolean add(Object key) {
Boolean put = getCache().put(key, true);
return put == null;
}
+ @Override
@ManagedOperation(description = "Does the store contain the given key")
public boolean contains(Object key) {
return getCache().containsKey(key);
}
+ @Override
@ManagedOperation(description = "Remove the key from the store")
public boolean remove(Object key) {
return getCache().remove(key) != null;
@@ -80,18 +83,22 @@ public class InfinispanIdempotentRepository extends ServiceSupport implements Id
return cacheName;
}
+ @Override
public boolean confirm(Object key) {
return true;
}
+ @Override
protected void doStart() throws Exception {
// noop
}
+ @Override
protected void doStop() throws Exception {
// noop
}
+ @Override
protected void doShutdown() throws Exception {
super.doShutdown();
if (isManagedCacheContainer) {
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java
index 548029e..576155c 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanComponentTest.java
@@ -52,6 +52,7 @@ public class InfinispanComponentTest extends InfinispanTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
+ @Override
public void configure() {
from("infinispan://localhost?cacheContainer=#cacheContainer&eventTypes=CACHE_ENTRY_CREATED")
.to("mock:result");
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerTest.java
index 1152570..e9d5e3c 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanConsumerTest.java
@@ -47,6 +47,7 @@ public class InfinispanConsumerTest extends InfinispanTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
+ @Override
public void configure() {
from("infinispan://localhost?cacheContainer=#cacheContainer&sync=false&eventTypes=CACHE_ENTRY_CREATED")
.to("mock:result");
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/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 5e5251d..e31fd92 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
@@ -122,6 +122,7 @@ public class InfinispanProducerTest extends InfinispanTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
+ @Override
public void configure() {
from("direct:start")
.to("infinispan://localhost?cacheContainer=#cacheContainer");
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteProducerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteProducerTest.java
index b872deb..941ad52 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteProducerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanRemoteProducerTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
import org.junit.Test;
-@Ignore //start local server with: ./bin/startServer.sh -r hotrod
+@Ignore("start a local server with: ./bin/standalone.sh")
public class InfinispanRemoteProducerTest extends CamelTestSupport {
@Test
@@ -42,6 +42,7 @@ public class InfinispanRemoteProducerTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
+ @Override
public void configure() {
from("direct:start")
.to("infinispan://localhost");
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanSyncConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanSyncConsumerTest.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanSyncConsumerTest.java
index 0c9bdd0..5862da4 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanSyncConsumerTest.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/InfinispanSyncConsumerTest.java
@@ -17,12 +17,8 @@
package org.apache.camel.component.infinispan;
import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
-import org.apache.camel.util.AsyncProcessorConverterHelper;
import org.junit.Test;
public class InfinispanSyncConsumerTest extends InfinispanTestSupport {
@@ -42,9 +38,9 @@ public class InfinispanSyncConsumerTest extends InfinispanTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
+ @Override
public void configure() {
from("infinispan://localhost?cacheContainer=#cacheContainer&sync=false&eventTypes=CACHE_ENTRY_CREATED")
-
.delayer(500)
.to("mock:result");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5b0d4822/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 226053a..b1bca55 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -185,7 +185,7 @@
<ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
<ibatis-version>2.3.4.726</ibatis-version>
<ical4j-version>1.0.5.2</ical4j-version>
- <infinispan-version>6.0.0.Beta2</infinispan-version>
+ <infinispan-version>6.0.0.CR1</infinispan-version>
<irclib-bundle-version>1.10_5</irclib-bundle-version>
<irclib-version>1.10</irclib-version>
<isorelax-bundle-version>20050913_4</isorelax-bundle-version>