Upgraded to latest hazelcast
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80a7ba82 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80a7ba82 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80a7ba82 Branch: refs/heads/master Commit: 80a7ba82282ebe0741a51b9bd68e5cd3cc69c321 Parents: 8388415 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jul 24 09:57:59 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jul 24 09:57:59 2014 +0200 ---------------------------------------------------------------------- components/camel-hazelcast/pom.xml | 2 +- .../component/hazelcast/HazelcastConstants.java | 8 ------- .../instance/HazelcastInstanceConsumer.java | 23 +++++++++++++++----- .../HazelcastInstanceConsumerTest.java | 4 ++-- parent/pom.xml | 2 +- 5 files changed, 21 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/80a7ba82/components/camel-hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml index 3bdf208..a1d3240 100644 --- a/components/camel-hazelcast/pom.xml +++ b/components/camel-hazelcast/pom.xml @@ -31,7 +31,7 @@ <properties> <camel.osgi.import.before.defaults> - com.hazelcast.*;version="[3.0.2,4)" + com.hazelcast.*;version="[3.2,4)" </camel.osgi.import.before.defaults> <camel.osgi.export.pkg> org.apache.camel.component.hazelcast.*;${camel.osgi.version}, http://git-wip-us.apache.org/repos/asf/camel/blob/80a7ba82/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java index 0bc2199..fa94b01 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java @@ -76,15 +76,7 @@ public final class HazelcastConstants { // listener actions public static final String REMOVED = "removed"; - - @Deprecated - /** - * @deprecated should have been 'evicted' not 'envicted'. Please use new {@link #EVICTED} constant. - */ - public static final String ENVICTED = "envicted"; - public static final String EVICTED = "evicted"; - public static final String UPDATED = "updated"; public static final String ADDED = "added"; http://git-wip-us.apache.org/repos/asf/camel/blob/80a7ba82/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceConsumer.java index 664272a..c510427 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceConsumer.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceConsumer.java @@ -16,10 +16,12 @@ */ package org.apache.camel.component.hazelcast.instance; +import java.net.InetSocketAddress; + import com.hazelcast.core.HazelcastInstance; +import com.hazelcast.core.MemberAttributeEvent; import com.hazelcast.core.MembershipEvent; import com.hazelcast.core.MembershipListener; - import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.hazelcast.HazelcastComponentHelper; @@ -45,21 +47,30 @@ public class HazelcastInstanceConsumer extends DefaultConsumer { this.sendExchange(event, HazelcastConstants.REMOVED); } + public void memberAttributeChanged(MemberAttributeEvent event) { + this.sendExchange(event, HazelcastConstants.UPDATED); + } + private void sendExchange(MembershipEvent event, String action) { Exchange exchange = getEndpoint().createExchange(); HazelcastComponentHelper.setListenerHeaders(exchange, HazelcastConstants.INSTANCE_LISTENER, action); // instance listener header values - exchange.getIn().setHeader(HazelcastConstants.INSTANCE_HOST, event.getMember().getInetSocketAddress().getHostName()); - exchange.getIn().setHeader(HazelcastConstants.INSTANCE_PORT, event.getMember().getInetSocketAddress().getPort()); + InetSocketAddress adr = event.getMember().getSocketAddress(); + if (adr != null) { + exchange.getIn().setHeader(HazelcastConstants.INSTANCE_HOST, adr.getHostName()); + exchange.getIn().setHeader(HazelcastConstants.INSTANCE_PORT, adr.getPort()); + } try { getProcessor().process(exchange); } catch (Exception e) { - if (exchange.getException() != null) { - getExceptionHandler().handleException("Error processing exchange for Hazelcast consumer on your Hazelcast cluster.", exchange, exchange.getException()); - } + exchange.setException(e); + } + + if (exchange.getException() != null) { + getExceptionHandler().handleException("Error processing exchange for Hazelcast consumer on your Hazelcast cluster.", exchange, exchange.getException()); } } http://git-wip-us.apache.org/repos/asf/camel/blob/80a7ba82/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java index 37ba293..49687d5 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastInstanceConsumerTest.java @@ -70,7 +70,7 @@ public class HazelcastInstanceConsumerTest extends HazelcastCamelTestSupport { MockEndpoint added = getMockEndpoint("mock:added"); added.setExpectedMessageCount(1); - when(member.getInetSocketAddress()).thenReturn(new InetSocketAddress("foo.bar", 12345)); + when(member.getSocketAddress()).thenReturn(new InetSocketAddress("foo.bar", 12345)); MembershipEvent event = new MembershipEvent(cluster, member, MembershipEvent.MEMBER_ADDED, null); argument.getValue().memberAdded(event); @@ -89,7 +89,7 @@ public class HazelcastInstanceConsumerTest extends HazelcastCamelTestSupport { MockEndpoint removed = getMockEndpoint("mock:removed"); removed.setExpectedMessageCount(1); - when(member.getInetSocketAddress()).thenReturn(new InetSocketAddress("foo.bar", 12345)); + when(member.getSocketAddress()).thenReturn(new InetSocketAddress("foo.bar", 12345)); MembershipEvent event = new MembershipEvent(cluster, member, MembershipEvent.MEMBER_REMOVED, null); argument.getValue().memberRemoved(event); http://git-wip-us.apache.org/repos/asf/camel/blob/80a7ba82/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 5a7ffa1..d8c5181 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -179,7 +179,7 @@ <hawtbuf-version>1.11</hawtbuf-version> <hawtdb-version>1.6</hawtdb-version> <hawtdispatch-version>1.21</hawtdispatch-version> - <hazelcast-version>3.0.3</hazelcast-version> + <hazelcast-version>3.2.4</hazelcast-version> <hbase-version>0.94.10</hbase-version> <hbase-bundle-version>0.94.6_1</hbase-bundle-version> <hibernate-validator-version>5.0.3.Final</hibernate-validator-version>
