Updated Branches: refs/heads/master d09924c11 -> 4c70f54b5
CAMEL-6759: camel-hazelcast uses Object instead of String as key. Thanks to Hrvoje Mustapic for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4c70f54b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4c70f54b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4c70f54b Branch: refs/heads/master Commit: 4c70f54b51ddca96bcbef2fd7d66b8a7ba158a74 Parents: d09924c Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Sep 17 13:55:09 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Sep 17 13:55:09 2013 +0200 ---------------------------------------------------------------------- .../hazelcast/listener/CamelEntryListener.java | 10 +++--- .../hazelcast/listener/CamelListener.java | 2 +- .../hazelcast/map/HazelcastMapConsumer.java | 2 +- .../hazelcast/map/HazelcastMapProducer.java | 14 ++++----- .../multimap/HazelcastMultimapConsumer.java | 2 +- .../multimap/HazelcastMultimapProducer.java | 12 ++++---- .../hazelcast/HazelcastMapConsumerTest.java | 14 ++++----- .../HazelcastMapProducerForSpringTest.java | 32 ++++++++++---------- .../hazelcast/HazelcastMapProducerTest.java | 6 ++-- .../HazelcastMultimapProducerForSpringTest.java | 30 +++++++++--------- .../HazelcastMultimapProducerTest.java | 6 ++-- 11 files changed, 65 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4c70f54b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java index cd52f58..0549031 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java @@ -25,25 +25,25 @@ import org.apache.camel.component.hazelcast.HazelcastDefaultConsumer; /** * */ -public class CamelEntryListener extends CamelListener implements EntryListener<String, Object> { +public class CamelEntryListener extends CamelListener implements EntryListener<Object, Object> { public CamelEntryListener(HazelcastDefaultConsumer consumer, String cacheName) { super(consumer, cacheName); } - public void entryAdded(EntryEvent<String, Object> event) { + public void entryAdded(EntryEvent<Object, Object> event) { this.sendExchange(HazelcastConstants.ADDED, event.getKey(), event.getValue()); } - public void entryEvicted(EntryEvent<String, Object> event) { + public void entryEvicted(EntryEvent<Object, Object> event) { this.sendExchange(HazelcastConstants.ENVICTED, event.getKey(), event.getValue()); } - public void entryRemoved(EntryEvent<String, Object> event) { + public void entryRemoved(EntryEvent<Object, Object> event) { this.sendExchange(HazelcastConstants.REMOVED, event.getKey(), event.getValue()); } - public void entryUpdated(EntryEvent<String, Object> event) { + public void entryUpdated(EntryEvent<Object, Object> event) { this.sendExchange(HazelcastConstants.UPDATED, event.getKey(), event.getValue()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/4c70f54b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java index e43100e..96c1ccf 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelListener.java @@ -31,7 +31,7 @@ public class CamelListener { this.consumer = consumer; } - protected void sendExchange(String operation, String key, Object value) { + protected void sendExchange(String operation, Object key, Object value) { Exchange exchange = consumer.getEndpoint().createExchange(); // set object to body http://git-wip-us.apache.org/repos/asf/camel/blob/4c70f54b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapConsumer.java index 7c65835..5833b05 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapConsumer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapConsumer.java @@ -29,7 +29,7 @@ public class HazelcastMapConsumer extends HazelcastDefaultConsumer { public HazelcastMapConsumer(HazelcastInstance hazelcastInstance, Endpoint endpoint, Processor processor, String cacheName) { super(hazelcastInstance, endpoint, processor, cacheName); - IMap<String, Object> cache = hazelcastInstance.getMap(cacheName); + IMap<Object, Object> cache = hazelcastInstance.getMap(cacheName); cache.addEntryListener(new CamelEntryListener(this, cacheName), true); } http://git-wip-us.apache.org/repos/asf/camel/blob/4c70f54b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java index c19d353..9d71243 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/map/HazelcastMapProducer.java @@ -30,7 +30,7 @@ import org.apache.camel.impl.DefaultProducer; public class HazelcastMapProducer extends DefaultProducer { - private final IMap<String, Object> cache; + private final IMap<Object, Object> cache; private final HazelcastComponentHelper helper = new HazelcastComponentHelper(); public HazelcastMapProducer(HazelcastInstance hazelcastInstance, HazelcastMapEndpoint endpoint, String cacheName) { @@ -43,12 +43,12 @@ public class HazelcastMapProducer extends DefaultProducer { Map<String, Object> headers = exchange.getIn().getHeaders(); // get header parameters - String oid = null; + Object oid = null; int operation = -1; String query = null; if (headers.containsKey(HazelcastConstants.OBJECT_ID)) { - oid = (String) headers.get(HazelcastConstants.OBJECT_ID); + oid = headers.get(HazelcastConstants.OBJECT_ID); } if (headers.containsKey(HazelcastConstants.OPERATION)) { @@ -107,7 +107,7 @@ public class HazelcastMapProducer extends DefaultProducer { /** * update an object in your cache (the whole object will be replaced) */ - private void update(String oid, Exchange exchange) { + private void update(Object oid, Exchange exchange) { Object body = exchange.getIn().getBody(); this.cache.lock(oid); this.cache.replace(oid, body); @@ -117,21 +117,21 @@ public class HazelcastMapProducer extends DefaultProducer { /** * remove an object from the cache */ - private void delete(String oid) { + private void delete(Object oid) { this.cache.remove(oid); } /** * find an object by the given id and give it back */ - private void get(String oid, Exchange exchange) { + private void get(Object oid, Exchange exchange) { exchange.getOut().setBody(this.cache.get(oid)); } /** * put a new object into the cache */ - private void put(String oid, Exchange exchange) { + private void put(Object oid, Exchange exchange) { Object body = exchange.getIn().getBody(); this.cache.put(oid, body); } http://git-wip-us.apache.org/repos/asf/camel/blob/4c70f54b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapConsumer.java index 191da3e..131317a 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapConsumer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapConsumer.java @@ -29,7 +29,7 @@ public class HazelcastMultimapConsumer extends HazelcastDefaultConsumer { public HazelcastMultimapConsumer(HazelcastInstance hazelcastInstance, Endpoint endpoint, Processor processor, String cacheName) { super(hazelcastInstance, endpoint, processor, cacheName); - MultiMap<String, Object> cache = hazelcastInstance.getMultiMap(cacheName); + MultiMap<Object, Object> cache = hazelcastInstance.getMultiMap(cacheName); cache.addEntryListener(new CamelEntryListener(this, cacheName), true); } http://git-wip-us.apache.org/repos/asf/camel/blob/4c70f54b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java index e81e060..047c985 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapProducer.java @@ -42,11 +42,11 @@ public class HazelcastMultimapProducer extends DefaultProducer { Map<String, Object> headers = exchange.getIn().getHeaders(); // get header parameters - String oid = null; + Object oid = null; int operation = -1; if (headers.containsKey(HazelcastConstants.OBJECT_ID)) { - oid = (String) headers.get(HazelcastConstants.OBJECT_ID); + oid = headers.get(HazelcastConstants.OBJECT_ID); } if (headers.containsKey(HazelcastConstants.OPERATION)) { @@ -82,20 +82,20 @@ public class HazelcastMultimapProducer extends DefaultProducer { HazelcastComponentHelper.copyHeaders(exchange); } - private void put(String oid, Exchange exchange) { + private void put(Object oid, Exchange exchange) { Object body = exchange.getIn().getBody(); this.cache.put(oid, body); } - private void get(String oid, Exchange exchange) { + private void get(Object oid, Exchange exchange) { exchange.getOut().setBody(this.cache.get(oid)); } - private void delete(String oid) { + private void delete(Object oid) { this.cache.remove(oid); } - private void removevalue(String oid, Exchange exchange) { + private void removevalue(Object oid, Exchange exchange) { this.cache.remove(oid, exchange.getIn().getBody()); } http://git-wip-us.apache.org/repos/asf/camel/blob/4c70f54b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java index 59f964d..8d3f604 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapConsumerTest.java @@ -29,7 +29,7 @@ import org.junit.Test; public class HazelcastMapConsumerTest extends CamelTestSupport { - private IMap<String, Object> map; + private IMap<Object, Object> map; @Override protected void doPostSetup() throws Exception { @@ -56,12 +56,12 @@ public class HazelcastMapConsumerTest extends CamelTestSupport { MockEndpoint out = super.getMockEndpoint("mock:envicted"); out.expectedMessageCount(5); - map.put("1", "my-foo-1"); - map.put("2", "my-foo-2"); - map.put("3", "my-foo-3"); - map.put("4", "my-foo-4"); - map.put("5", "my-foo-5"); - map.put("6", "my-foo-6"); + map.put(1, "my-foo-1"); + map.put(2, "my-foo-2"); + map.put(3, "my-foo-3"); + map.put(4, "my-foo-4"); + map.put(5, "my-foo-5"); + map.put(6, "my-foo-6"); assertMockEndpointsSatisfied(30000, TimeUnit.MILLISECONDS); } http://git-wip-us.apache.org/repos/asf/camel/blob/4c70f54b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java index fe0cab0..1ed9eee 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java @@ -31,7 +31,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class HazelcastMapProducerForSpringTest extends CamelSpringTestSupport implements Serializable { private static final long serialVersionUID = 1L; - private IMap<String, Object> map; + private IMap<Long, Object> map; @Override protected void doPostSetup() throws Exception { @@ -49,28 +49,28 @@ public class HazelcastMapProducerForSpringTest extends CamelSpringTestSupport im @Test public void testPut() throws InterruptedException { - template.sendBodyAndHeader("direct:put", "my-foo", HazelcastConstants.OBJECT_ID, "4711"); + template.sendBodyAndHeader("direct:put", "my-foo", HazelcastConstants.OBJECT_ID, 4711L); - assertTrue(map.containsKey("4711")); - assertEquals("my-foo", map.get("4711")); + assertTrue(map.containsKey(4711L)); + assertEquals("my-foo", map.get(4711L)); } @Test public void testUpdate() { - template.sendBodyAndHeader("direct:put", "my-foo", HazelcastConstants.OBJECT_ID, "4711"); + template.sendBodyAndHeader("direct:put", "my-foo", HazelcastConstants.OBJECT_ID, 4711L); - assertTrue(map.containsKey("4711")); - assertEquals("my-foo", map.get("4711")); + assertTrue(map.containsKey(4711L)); + assertEquals("my-foo", map.get(4711L)); - template.sendBodyAndHeader("direct:update", "my-fooo", HazelcastConstants.OBJECT_ID, "4711"); - assertEquals("my-fooo", map.get("4711")); + template.sendBodyAndHeader("direct:update", "my-fooo", HazelcastConstants.OBJECT_ID, 4711L); + assertEquals("my-fooo", map.get(4711L)); } @Test public void testGet() { - map.put("4711", "my-foo"); + map.put(4711L, "my-foo"); - template.sendBodyAndHeader("direct:get", null, HazelcastConstants.OBJECT_ID, "4711"); + template.sendBodyAndHeader("direct:get", null, HazelcastConstants.OBJECT_ID, 4711L); String body = consumer.receiveBody("seda:out", 5000, String.class); assertEquals("my-foo", body); @@ -78,18 +78,18 @@ public class HazelcastMapProducerForSpringTest extends CamelSpringTestSupport im @Test public void testDelete() { - map.put("4711", "my-foo"); + map.put(4711L, "my-foo"); assertEquals(1, map.size()); - template.sendBodyAndHeader("direct:delete", null, HazelcastConstants.OBJECT_ID, "4711"); + template.sendBodyAndHeader("direct:delete", null, HazelcastConstants.OBJECT_ID, 4711L); assertEquals(0, map.size()); } @Test public void testQuery() { - map.put("1", new Dummy("alpha", 1000)); - map.put("2", new Dummy("beta", 2000)); - map.put("3", new Dummy("gamma", 3000)); + map.put(1L, new Dummy("alpha", 1000)); + map.put(2L, new Dummy("beta", 2000)); + map.put(3L, new Dummy("gamma", 3000)); String q1 = "bar > 1000"; String q2 = "foo LIKE alp%"; http://git-wip-us.apache.org/repos/asf/camel/blob/4c70f54b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java index 441b70c..04fc428 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java @@ -30,7 +30,7 @@ import org.junit.Test; public class HazelcastMapProducerTest extends CamelTestSupport implements Serializable { private static final long serialVersionUID = 1L; - private IMap<String, Object> map; + private IMap<Object, Object> map; @Override protected void doPostSetup() throws Exception { @@ -71,10 +71,10 @@ public class HazelcastMapProducerTest extends CamelTestSupport implements Serial @Test public void testDelete() { - map.put("4711", "my-foo"); + map.put(4711, "my-foo"); assertEquals(1, map.size()); - template.sendBodyAndHeader("direct:delete", null, HazelcastConstants.OBJECT_ID, "4711"); + template.sendBodyAndHeader("direct:delete", null, HazelcastConstants.OBJECT_ID, 4711); assertEquals(0, map.size()); } http://git-wip-us.apache.org/repos/asf/camel/blob/4c70f54b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java index 6fcb337..8442669 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java @@ -29,7 +29,7 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; public class HazelcastMultimapProducerForSpringTest extends CamelSpringTestSupport { - private MultiMap<String, Object> map; + private MultiMap<Long, Object> map; @Override protected void doPostSetup() throws Exception { @@ -51,11 +51,11 @@ public class HazelcastMultimapProducerForSpringTest extends CamelSpringTestSuppo @Test public void testPut() throws InterruptedException { - template.sendBodyAndHeader("direct:put", "my-foo", HazelcastConstants.OBJECT_ID, "4711"); - template.sendBodyAndHeader("direct:put", "my-bar", HazelcastConstants.OBJECT_ID, "4711"); + template.sendBodyAndHeader("direct:put", "my-foo", HazelcastConstants.OBJECT_ID, 4711L); + template.sendBodyAndHeader("direct:put", "my-bar", HazelcastConstants.OBJECT_ID, 4711L); - assertTrue(map.containsKey("4711")); - Collection<Object> values = map.get("4711"); + assertTrue(map.containsKey(4711L)); + Collection<Object> values = map.get(4711L); assertTrue(values.contains("my-foo")); assertTrue(values.contains("my-bar")); @@ -63,22 +63,22 @@ public class HazelcastMultimapProducerForSpringTest extends CamelSpringTestSuppo @Test public void testRemoveValue() { - map.put("4711", "my-foo"); - map.put("4711", "my-bar"); + map.put(4711L, "my-foo"); + map.put(4711L, "my-bar"); - assertEquals(2, map.get("4711").size()); + assertEquals(2, map.get(4711L).size()); - template.sendBodyAndHeader("direct:removevalue", "my-foo", HazelcastConstants.OBJECT_ID, "4711"); + template.sendBodyAndHeader("direct:removevalue", "my-foo", HazelcastConstants.OBJECT_ID, 4711L); - assertEquals(1, map.get("4711").size()); - assertTrue(map.get("4711").contains("my-bar")); + assertEquals(1, map.get(4711L).size()); + assertTrue(map.get(4711L).contains("my-bar")); } @Test public void testGet() { - map.put("4711", "my-foo"); + map.put(4711L, "my-foo"); - template.sendBodyAndHeader("direct:get", null, HazelcastConstants.OBJECT_ID, "4711"); + template.sendBodyAndHeader("direct:get", null, HazelcastConstants.OBJECT_ID, 4711L); Collection<?> body = consumer.receiveBody("seda:out", 5000, Collection.class); assertTrue(body.contains("my-foo")); @@ -86,10 +86,10 @@ public class HazelcastMultimapProducerForSpringTest extends CamelSpringTestSuppo @Test public void testDelete() { - map.put("4711", "my-foo"); + map.put(4711L, "my-foo"); assertEquals(1, map.size()); - template.sendBodyAndHeader("direct:delete", null, HazelcastConstants.OBJECT_ID, "4711"); + template.sendBodyAndHeader("direct:delete", null, HazelcastConstants.OBJECT_ID, 4711L); assertEquals(0, map.size()); } http://git-wip-us.apache.org/repos/asf/camel/blob/4c70f54b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java index fea6824..8a4a742 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerTest.java @@ -29,7 +29,7 @@ import org.junit.Test; public class HazelcastMultimapProducerTest extends CamelTestSupport { - private MultiMap<String, Object> map; + private MultiMap<Object, Object> map; @Override protected void doPostSetup() throws Exception { @@ -81,10 +81,10 @@ public class HazelcastMultimapProducerTest extends CamelTestSupport { @Test public void testDelete() { - map.put("4711", "my-foo"); + map.put(4711, "my-foo"); assertEquals(1, map.size()); - template.sendBodyAndHeader("direct:delete", null, HazelcastConstants.OBJECT_ID, "4711"); + template.sendBodyAndHeader("direct:delete", null, HazelcastConstants.OBJECT_ID, 4711); assertEquals(0, map.size()); }
