Updated Branches: refs/heads/master 87a609c33 -> 891f4fdd5
CAMEL-6843: Hazelcast Map Support Uses Wrong Verb "Envict" Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/891f4fdd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/891f4fdd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/891f4fdd Branch: refs/heads/master Commit: 891f4fdd5b3e8698c3ea5c05109911dff4ef4732 Parents: 87a609c Author: James Carman <jcar...@apache.org> Authored: Thu Oct 10 09:41:14 2013 -0400 Committer: James Carman <jcar...@apache.org> Committed: Thu Oct 10 09:41:35 2013 -0400 ---------------------------------------------------------------------- .../apache/camel/component/hazelcast/HazelcastConstants.java | 8 ++++++++ .../component/hazelcast/listener/CamelEntryListener.java | 2 +- .../camel/component/hazelcast/HazelcastMapConsumerTest.java | 6 +++--- .../component/hazelcast/HazelcastMultimapConsumerTest.java | 6 +++--- 4 files changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/891f4fdd/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 9f341fb..0bc2199 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,7 +76,15 @@ 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/891f4fdd/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 0549031..39385f1 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 @@ -36,7 +36,7 @@ public class CamelEntryListener extends CamelListener implements EntryListener<O } public void entryEvicted(EntryEvent<Object, Object> event) { - this.sendExchange(HazelcastConstants.ENVICTED, event.getKey(), event.getValue()); + this.sendExchange(HazelcastConstants.EVICTED, event.getKey(), event.getValue()); } public void entryRemoved(EntryEvent<Object, Object> event) { http://git-wip-us.apache.org/repos/asf/camel/blob/891f4fdd/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 5762120..71083ba 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 @@ -73,8 +73,8 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport { @Test @SuppressWarnings("unchecked") - public void testEnvict() throws InterruptedException { - MockEndpoint out = super.getMockEndpoint("mock:envicted"); + public void testEnict() throws InterruptedException { + MockEndpoint out = super.getMockEndpoint("mock:evicted"); out.expectedMessageCount(1); EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.EVICTED.getType(), "4711", "my-foo"); @@ -116,7 +116,7 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport { @Override public void configure() throws Exception { from(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)).log("object...").choice().when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)) - .log("...added").to("mock:added").when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ENVICTED)).log("...envicted").to("mock:envicted") + .log("...added").to("mock:added").when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.EVICTED)).log("...evicted").to("mock:evicted") .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.UPDATED)).log("...updated").to("mock:updated") .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.REMOVED)).log("...removed").to("mock:removed").otherwise().log("fail!"); } http://git-wip-us.apache.org/repos/asf/camel/blob/891f4fdd/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java index 55d4fc2..f99c3dd 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapConsumerTest.java @@ -77,8 +77,8 @@ public class HazelcastMultimapConsumerTest extends HazelcastCamelTestSupport { */ @Test @SuppressWarnings("unchecked") - public void testEnvict() throws InterruptedException { - MockEndpoint out = getMockEndpoint("mock:envicted"); + public void testEvict() throws InterruptedException { + MockEndpoint out = getMockEndpoint("mock:evicted"); out.expectedMessageCount(1); EntryEvent<Object, Object> event = new EntryEvent<Object, Object>("foo", null, EntryEventType.EVICTED.getType(), "4711", "my-foo"); @@ -107,7 +107,7 @@ public class HazelcastMultimapConsumerTest extends HazelcastCamelTestSupport { public void configure() throws Exception { from(String.format("hazelcast:%smm", HazelcastConstants.MULTIMAP_PREFIX)).log("object...").choice() .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)).log("...added").to("mock:added") - .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ENVICTED)).log("...envicted").to("mock:envicted") + .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.EVICTED)).log("...evicted").to("mock:evicted") .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.REMOVED)).log("...removed").to("mock:removed").otherwise().log("fail!"); } };
