http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java index fa56f5d..3b36b42 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastCamelTestSupport.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.hazelcast; +import java.util.ArrayList; +import java.util.List; import com.hazelcast.core.HazelcastInstance; import org.apache.camel.CamelContext; import org.apache.camel.test.junit4.CamelTestSupport; @@ -23,6 +25,7 @@ import org.junit.After; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import static org.mockito.Mockito.*; + public class HazelcastCamelTestSupport extends CamelTestSupport { @Mock @@ -32,9 +35,7 @@ public class HazelcastCamelTestSupport extends CamelTestSupport { protected CamelContext createCamelContext() throws Exception { MockitoAnnotations.initMocks(this); CamelContext context = super.createCamelContext(); - HazelcastComponent hazelcastComponent = new HazelcastComponent(context); - hazelcastComponent.setHazelcastInstance(hazelcastInstance); - context.addComponent("hazelcast", hazelcastComponent); + HazelcastCamelTestHelper.registerHazelcastComponents(context, hazelcastInstance); trainHazelcastInstance(hazelcastInstance); return context; }
http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastConfigurationTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastConfigurationTest.java index 181b670..17df4b7 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastConfigurationTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastConfigurationTest.java @@ -24,6 +24,7 @@ import com.hazelcast.config.Config; import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; import org.apache.camel.CamelContext; +import org.apache.camel.component.hazelcast.map.HazelcastMapComponent; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.SimpleRegistry; import org.junit.After; @@ -54,14 +55,14 @@ public class HazelcastConfigurationTest { context = new DefaultCamelContext(); context.start(); - HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context, "hazelcast:map:my-cache-1?hazelcastInstanceName=" + instanceName); - HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context, "hazelcast:map:my-cache-2?hazelcastInstanceName=" + instanceName); + HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context, "hazelcast-map:my-cache-1?hazelcastInstanceName=" + instanceName); + HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context, "hazelcast-map:my-cache-2?hazelcastInstanceName=" + instanceName); Assert.assertNotNull(endpoint1.getHazelcastInstance()); Assert.assertNotNull(endpoint2.getHazelcastInstance()); Assert.assertTrue(endpoint1.getHazelcastInstance() == endpoint2.getHazelcastInstance()); - HazelcastComponent component = context.getComponent("hazelcast", HazelcastComponent.class); + HazelcastMapComponent component = context.getComponent("hazelcast-map", HazelcastMapComponent.class); Assert.assertNull(component.getHazelcastInstance()); for (HazelcastDefaultEndpoint endpoint : Arrays.asList(endpoint1, endpoint2)) { @@ -87,14 +88,14 @@ public class HazelcastConfigurationTest { context = new DefaultCamelContext(); context.start(); - HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context, "hazelcast:map:my-cache-1"); - HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context, "hazelcast:map:my-cache-2"); + HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context, "hazelcast-map:my-cache-1"); + HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context, "hazelcast-map:my-cache-2"); Assert.assertNotNull(endpoint1.getHazelcastInstance()); Assert.assertNotNull(endpoint2.getHazelcastInstance()); Assert.assertTrue(endpoint1.getHazelcastInstance() != endpoint2.getHazelcastInstance()); - HazelcastComponent component = context.getComponent("hazelcast", HazelcastComponent.class); + HazelcastMapComponent component = context.getComponent("hazelcast-map", HazelcastMapComponent.class); Assert.assertNull(component.getHazelcastInstance()); for (HazelcastDefaultEndpoint endpoint : Arrays.asList(endpoint1, endpoint2)) { @@ -119,14 +120,14 @@ public class HazelcastConfigurationTest { context = new DefaultCamelContext(); context.start(); - HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context, "hazelcast:map:my-cache-1?hazelcastConfigUri=classpath:hazelcast-named.xml"); - HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context, "hazelcast:map:my-cache-2?hazelcastConfigUri=classpath:hazelcast-named.xml"); + HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context, "hazelcast-map:my-cache-1?hazelcastConfigUri=classpath:hazelcast-named.xml"); + HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context, "hazelcast-map:my-cache-2?hazelcastConfigUri=classpath:hazelcast-named.xml"); Assert.assertNotNull(endpoint1.getHazelcastInstance()); Assert.assertNotNull(endpoint2.getHazelcastInstance()); Assert.assertTrue(endpoint1.getHazelcastInstance() == endpoint2.getHazelcastInstance()); - HazelcastComponent component = context.getComponent("hazelcast", HazelcastComponent.class); + HazelcastMapComponent component = context.getComponent("hazelcast-map", HazelcastMapComponent.class); Assert.assertNull(component.getHazelcastInstance()); HazelcastInstance hz = endpoint1.getHazelcastInstance(); @@ -150,14 +151,14 @@ public class HazelcastConfigurationTest { context = new DefaultCamelContext(); context.start(); - HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context, "hazelcast:map:my-cache-1?hazelcastConfigUri=classpath:hazelcast-custom.xml"); - HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context, "hazelcast:map:my-cache-2?hazelcastConfigUri=classpath:hazelcast-custom.xml"); + HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context, "hazelcast-map:my-cache-1?hazelcastConfigUri=classpath:hazelcast-custom.xml"); + HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context, "hazelcast-map:my-cache-2?hazelcastConfigUri=classpath:hazelcast-custom.xml"); Assert.assertNotNull(endpoint1.getHazelcastInstance()); Assert.assertNotNull(endpoint2.getHazelcastInstance()); Assert.assertTrue(endpoint1.getHazelcastInstance() != endpoint2.getHazelcastInstance()); - HazelcastComponent component = context.getComponent("hazelcast", HazelcastComponent.class); + HazelcastMapComponent component = context.getComponent("hazelcast-map", HazelcastMapComponent.class); Assert.assertNull(component.getHazelcastInstance()); for (HazelcastDefaultEndpoint endpoint : Arrays.asList(endpoint1, endpoint2)) { @@ -191,12 +192,12 @@ public class HazelcastConfigurationTest { context = new DefaultCamelContext(reg); context.start(); - context.getEndpoint("hazelcast:map:my-cache?hazelcastConfig=#my-config"); + context.getEndpoint("hazelcast-map:my-cache?hazelcastConfig=#my-config"); - HazelcastDefaultEndpoint endpoint = getHzEndpoint(context, "hazelcast:map:my-cache?hazelcastConfig=#my-config"); + HazelcastDefaultEndpoint endpoint = getHzEndpoint(context, "hazelcast-map:my-cache?hazelcastConfig=#my-config"); Assert.assertNotNull(endpoint.getHazelcastInstance()); - HazelcastComponent component = context.getComponent("hazelcast", HazelcastComponent.class); + HazelcastMapComponent component = context.getComponent("hazelcast-map", HazelcastMapComponent.class); Assert.assertNull(component.getHazelcastInstance()); HazelcastInstance hz = endpoint.getHazelcastInstance(); @@ -255,17 +256,17 @@ public class HazelcastConfigurationTest { reg.put(customConfig.getInstanceName(), customConfig); reg.put(sharedConfig.getInstanceName(), hzShared); - HazelcastComponent component = new HazelcastComponent(); + HazelcastMapComponent component = new HazelcastMapComponent(); component.setHazelcastInstance(hzComponent); context = new DefaultCamelContext(reg); - context.addComponent("hazelcast", component); + context.addComponent("hazelcast-map", component); context.start(); - HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context, "hazelcast:map:my-cache-1?hazelcastInstanceName=" + namedConfig.getInstanceName()); - HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context, "hazelcast:map:my-cache-2?hazelcastConfig=#" + customConfig.getInstanceName()); - HazelcastDefaultEndpoint endpoint3 = getHzEndpoint(context, "hazelcast:map:my-cache-2?hazelcastInstance=#" + sharedConfig.getInstanceName()); - HazelcastDefaultEndpoint endpoint4 = getHzEndpoint(context, "hazelcast:map:my-cache-4"); + HazelcastDefaultEndpoint endpoint1 = getHzEndpoint(context, "hazelcast-map:my-cache-1?hazelcastInstanceName=" + namedConfig.getInstanceName()); + HazelcastDefaultEndpoint endpoint2 = getHzEndpoint(context, "hazelcast-map:my-cache-2?hazelcastConfig=#" + customConfig.getInstanceName()); + HazelcastDefaultEndpoint endpoint3 = getHzEndpoint(context, "hazelcast-map:my-cache-2?hazelcastInstance=#" + sharedConfig.getInstanceName()); + HazelcastDefaultEndpoint endpoint4 = getHzEndpoint(context, "hazelcast-map:my-cache-4"); Assert.assertNotNull(endpoint1.getHazelcastInstance()); Assert.assertNotNull(endpoint2.getHazelcastInstance()); http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastErrorMessagesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastErrorMessagesTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastErrorMessagesTest.java index ec365e6..fe5ad87 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastErrorMessagesTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastErrorMessagesTest.java @@ -44,7 +44,7 @@ public class HazelcastErrorMessagesTest extends HazelcastCamelTestSupport { public void testAtomicNumberConsumer() { RouteBuilder builder = new RouteBuilder() { public void configure() throws Exception { - from("hazelcast:atomicvalue:foo").to("seda:out"); + from("hazelcast-atomicvalue:foo").to("seda:out"); } }; try { @@ -52,7 +52,7 @@ public class HazelcastErrorMessagesTest extends HazelcastCamelTestSupport { context.start(); fail("Should have thrown exception"); } catch (Exception e) { - assertTrue(e.getMessage().contains("You cannot send messages to this endpoint: hazelcast://atomicvalue:foo")); + assertTrue(e.getMessage().contains("You cannot send messages to this endpoint: hazelcast-atomicvalue://foo")); } } @@ -60,7 +60,7 @@ public class HazelcastErrorMessagesTest extends HazelcastCamelTestSupport { public void testInstanceProducer() { RouteBuilder builder = new RouteBuilder() { public void configure() throws Exception { - from("direct:foo").to("hazelcast:instance:foo"); + from("direct:foo").to("hazelcast-instance:foo"); } }; @@ -69,7 +69,7 @@ public class HazelcastErrorMessagesTest extends HazelcastCamelTestSupport { context.start(); fail("Should have thrown exception"); } catch (Exception e) { - assertTrue(e.getMessage().contains("You cannot send messages to this endpoint: hazelcast://instance:foo")); + assertTrue(e.getMessage().contains("You cannot send messages to this endpoint: hazelcast-instance://foo")); } } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/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 49687d5..df37300 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 @@ -108,7 +108,7 @@ public class HazelcastInstanceConsumerTest extends HazelcastCamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from(String.format("hazelcast:%sfoo", HazelcastConstants.INSTANCE_PREFIX)).log("instance...").choice() + from(String.format("hazelcast-%sfoo", HazelcastConstants.INSTANCE_PREFIX)).log("instance...").choice() .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)).log("...added").to("mock:added").otherwise().log("...removed").to("mock:removed"); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java index d4d52df..71c56a0 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListConsumerTest.java @@ -86,7 +86,7 @@ public class HazelcastListConsumerTest extends HazelcastCamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from(String.format("hazelcast:%sfoo", HazelcastConstants.LIST_PREFIX)).log("object...").choice().when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)) + from(String.format("hazelcast-%sfoo", HazelcastConstants.LIST_PREFIX)).log("object...").choice().when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)) .log("...added").to("mock:added").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/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java index 616cd19..f5092c7 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastListProducerTest.java @@ -144,31 +144,31 @@ public class HazelcastListProducerTest extends HazelcastCamelTestSupport { @Override public void configure() throws Exception { - from("direct:addInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).toF("hazelcast:%sbar", HazelcastConstants.LIST_PREFIX); + from("direct:addInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).toF("hazelcast-%sbar", HazelcastConstants.LIST_PREFIX); - from("direct:add").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.ADD_OPERATION)).toF("hazelcast:%sbar", HazelcastConstants.LIST_PREFIX); + from("direct:add").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.ADD_OPERATION)).toF("hazelcast-%sbar", HazelcastConstants.LIST_PREFIX); - from("direct:set").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.SETVALUE_OPERATION)).toF("hazelcast:%sbar", HazelcastConstants.LIST_PREFIX); + from("direct:set").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.SETVALUE_OPERATION)).toF("hazelcast-%sbar", HazelcastConstants.LIST_PREFIX); - from("direct:get").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.GET_OPERATION)).toF("hazelcast:%sbar", HazelcastConstants.LIST_PREFIX) + from("direct:get").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.GET_OPERATION)).toF("hazelcast-%sbar", HazelcastConstants.LIST_PREFIX) .to("seda:out"); from("direct:removevalue").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.REMOVEVALUE_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.LIST_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.LIST_PREFIX)); - from("direct:clear").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CLEAR_OPERATION)).toF("hazelcast:%sbar", HazelcastConstants.LIST_PREFIX); + from("direct:clear").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CLEAR_OPERATION)).toF("hazelcast-%sbar", HazelcastConstants.LIST_PREFIX); from("direct:addAll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.ADD_ALL_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.LIST_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.LIST_PREFIX)); from("direct:removeAll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.REMOVE_ALL_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.LIST_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.LIST_PREFIX)); from("direct:retainAll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.RETAIN_ALL_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.LIST_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.LIST_PREFIX)); - from("direct:addWithOperationNumber").toF("hazelcast:%sbar?operation=%s", HazelcastConstants.LIST_PREFIX, HazelcastConstants.ADD_OPERATION); - from("direct:addWithOperationName").toF("hazelcast:%sbar?operation=add", HazelcastConstants.LIST_PREFIX); + from("direct:addWithOperationNumber").toF("hazelcast-%sbar?operation=%s", HazelcastConstants.LIST_PREFIX, HazelcastConstants.ADD_OPERATION); + from("direct:addWithOperationName").toF("hazelcast-%sbar?operation=add", HazelcastConstants.LIST_PREFIX); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/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 ca8ab32..fa65710 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 @@ -126,7 +126,7 @@ public class HazelcastMapConsumerTest extends HazelcastCamelTestSupport { return new RouteBuilder() { @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)) + 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.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/bf10d278/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 f8d3e02..91600c8 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 @@ -254,44 +254,44 @@ public class HazelcastMapProducerTest extends HazelcastCamelTestSupport implemen @Override public void configure() throws Exception { - from("direct:putInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)); + from("direct:putInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)); - from("direct:put").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUT_OPERATION)).to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)); + from("direct:put").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUT_OPERATION)).to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)); from("direct:putIfAbsent").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUT_IF_ABSENT_OPERATION)) - .to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)); + .to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)); - from("direct:update").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.UPDATE_OPERATION)).to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)); + from("direct:update").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.UPDATE_OPERATION)).to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)); - from("direct:get").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.GET_OPERATION)).to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)) + from("direct:get").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.GET_OPERATION)).to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)) .to("seda:out"); - from("direct:getAll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.GET_ALL_OPERATION)).to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)) + from("direct:getAll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.GET_ALL_OPERATION)).to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)) .to("seda:out"); - from("direct:delete").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.DELETE_OPERATION)).to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)); + from("direct:delete").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.DELETE_OPERATION)).to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)); - from("direct:query").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.QUERY_OPERATION)).to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)) + from("direct:query").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.QUERY_OPERATION)).to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)) .to("seda:out"); - from("direct:clear").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CLEAR_OPERATION)).to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)); + from("direct:clear").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CLEAR_OPERATION)).to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)); - from("direct:evict").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.EVICT_OPERATION)).to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)) + from("direct:evict").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.EVICT_OPERATION)).to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)) .to("seda:out"); - from("direct:evictAll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.EVICT_ALL_OPERATION)).to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)) + from("direct:evictAll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.EVICT_ALL_OPERATION)).to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)) .to("seda:out"); from("direct:containsKey").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CONTAINS_KEY_OPERATION)) - .to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)) + .to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)) .to("seda:out"); from("direct:containsValue").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CONTAINS_VALUE_OPERATION)) - .to(String.format("hazelcast:%sfoo", HazelcastConstants.MAP_PREFIX)) + .to(String.format("hazelcast-%sfoo", HazelcastConstants.MAP_PREFIX)) .to("seda:out"); - from("direct:putWithOperationNumber").toF("hazelcast:%sfoo?operation=%s", HazelcastConstants.MAP_PREFIX, HazelcastConstants.PUT_OPERATION); - from("direct:putWithOperationName").toF("hazelcast:%sfoo?operation=put", HazelcastConstants.MAP_PREFIX); + from("direct:putWithOperationNumber").toF("hazelcast-%sfoo?operation=%s", HazelcastConstants.MAP_PREFIX, HazelcastConstants.PUT_OPERATION); + from("direct:putWithOperationName").toF("hazelcast-%sfoo?operation=put", HazelcastConstants.MAP_PREFIX); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/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 f99c3dd..a4bbbad 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 @@ -105,7 +105,7 @@ public class HazelcastMultimapConsumerTest extends HazelcastCamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from(String.format("hazelcast:%smm", HazelcastConstants.MULTIMAP_PREFIX)).log("object...").choice() + 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.EVICTED)).log("...evicted").to("mock:evicted") .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/bf10d278/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 5d44c80..151980d 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 @@ -140,33 +140,33 @@ public class HazelcastMultimapProducerTest extends HazelcastCamelTestSupport { @Override public void configure() throws Exception { - from("direct:putInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast:%sbar", HazelcastConstants.MULTIMAP_PREFIX)); + from("direct:putInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast-%sbar", HazelcastConstants.MULTIMAP_PREFIX)); - from("direct:put").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUT_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.MULTIMAP_PREFIX)); + from("direct:put").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUT_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.MULTIMAP_PREFIX)); from("direct:removevalue").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.REMOVEVALUE_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.MULTIMAP_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.MULTIMAP_PREFIX)); - from("direct:get").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.GET_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.MULTIMAP_PREFIX)) + from("direct:get").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.GET_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.MULTIMAP_PREFIX)) .to("seda:out"); - from("direct:delete").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.DELETE_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.MULTIMAP_PREFIX)); + from("direct:delete").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.DELETE_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.MULTIMAP_PREFIX)); - from("direct:clear").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CLEAR_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.MULTIMAP_PREFIX)); + from("direct:clear").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CLEAR_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.MULTIMAP_PREFIX)); from("direct:valueCount").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.VALUE_COUNT_OPERATION)) - .to(String.format("hazelcast:%sbar", HazelcastConstants.MULTIMAP_PREFIX)); + .to(String.format("hazelcast-%sbar", HazelcastConstants.MULTIMAP_PREFIX)); from("direct:containsKey").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CONTAINS_KEY_OPERATION)) - .to(String.format("hazelcast:%sbar", HazelcastConstants.MULTIMAP_PREFIX)) + .to(String.format("hazelcast-%sbar", HazelcastConstants.MULTIMAP_PREFIX)) .to("seda:out"); from("direct:containsValue").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CONTAINS_VALUE_OPERATION)) - .to(String.format("hazelcast:%sbar", HazelcastConstants.MULTIMAP_PREFIX)) + .to(String.format("hazelcast-%sbar", HazelcastConstants.MULTIMAP_PREFIX)) .to("seda:out"); - from("direct:putWithOperationNumber").toF("hazelcast:%sbar?operation=%s", HazelcastConstants.MULTIMAP_PREFIX, HazelcastConstants.PUT_OPERATION); - from("direct:putWithOperationName").toF("hazelcast:%sbar?operation=put", HazelcastConstants.MULTIMAP_PREFIX); + from("direct:putWithOperationNumber").toF("hazelcast-%sbar?operation=%s", HazelcastConstants.MULTIMAP_PREFIX, HazelcastConstants.PUT_OPERATION); + from("direct:putWithOperationName").toF("hazelcast-%sbar?operation=put", HazelcastConstants.MULTIMAP_PREFIX); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java index 762450a..65309d6 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueConsumerTest.java @@ -90,7 +90,7 @@ public class HazelcastQueueConsumerTest extends HazelcastCamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from(String.format("hazelcast:%sfoo", HazelcastConstants.QUEUE_PREFIX)).log("object...").choice().when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)) + from(String.format("hazelcast-%sfoo", HazelcastConstants.QUEUE_PREFIX)).log("object...").choice().when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)) .log("...added").to("mock:added").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/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java index 24a4a78..4e0504f 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java @@ -145,32 +145,32 @@ public class HazelcastQueueProducerTest extends HazelcastCamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:no-operation").to(String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX)); + from("direct:no-operation").to(String.format("hazelcast-%sbar", HazelcastConstants.QUEUE_PREFIX)); - from("direct:putInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX)); + from("direct:putInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast-%sbar", HazelcastConstants.QUEUE_PREFIX)); - from("direct:put").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUT_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX)); + from("direct:put").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUT_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.QUEUE_PREFIX)); - from("direct:add").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.ADD_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX)); + from("direct:add").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.ADD_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.QUEUE_PREFIX)); - from("direct:offer").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.OFFER_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX)); + from("direct:offer").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.OFFER_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.QUEUE_PREFIX)); - from("direct:poll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.POLL_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX)); + from("direct:poll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.POLL_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.QUEUE_PREFIX)); - from("direct:peek").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PEEK_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX)); + from("direct:peek").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PEEK_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.QUEUE_PREFIX)); from("direct:removevalue").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.REMOVEVALUE_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.QUEUE_PREFIX)); from("direct:remainingCapacity").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.REMAINING_CAPACITY_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.QUEUE_PREFIX)); from("direct:drainTo").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.DRAIN_TO_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.QUEUE_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.QUEUE_PREFIX)); - from("direct:putWithOperationNumber").toF(String.format("hazelcast:%sbar?operation=%s", HazelcastConstants.QUEUE_PREFIX, HazelcastConstants.PUT_OPERATION)); + from("direct:putWithOperationNumber").toF(String.format("hazelcast-%sbar?operation=%s", HazelcastConstants.QUEUE_PREFIX, HazelcastConstants.PUT_OPERATION)); - from("direct:putWithOperationName").toF(String.format("hazelcast:%sbar?operation=put", HazelcastConstants.QUEUE_PREFIX)); + from("direct:putWithOperationName").toF(String.format("hazelcast-%sbar?operation=put", HazelcastConstants.QUEUE_PREFIX)); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java index d6b0ecc..0d3af1a 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicConsumerTest.java @@ -74,7 +74,7 @@ public class HazelcastReliableTopicConsumerTest extends HazelcastCamelTestSuppor return new RouteBuilder() { @Override public void configure() throws Exception { - from(String.format("hazelcast:%sfoo?reliable=true", HazelcastConstants.TOPIC_PREFIX)).log("object...") + from(String.format("hazelcast-%sfoo?reliable=true", HazelcastConstants.TOPIC_PREFIX)).log("object...") .choice() .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.RECEIVED)) .log("...received").to("mock:received") http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java index 196c6f6..88ee672 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReliableTopicProducerTest.java @@ -68,11 +68,11 @@ public class HazelcastReliableTopicProducerTest extends HazelcastCamelTestSuppor return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:no-operation").to(String.format("hazelcast:%sbar?reliable=true", HazelcastConstants.TOPIC_PREFIX)); + from("direct:no-operation").to(String.format("hazelcast-%sbar?reliable=true", HazelcastConstants.TOPIC_PREFIX)); - from("direct:publishInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast:%sbar?reliable=true", HazelcastConstants.TOPIC_PREFIX)); + from("direct:publishInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast-%sbar?reliable=true", HazelcastConstants.TOPIC_PREFIX)); - from("direct:publish").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUBLISH_OPERATION)).to(String.format("hazelcast:%sbar?reliable=true", + from("direct:publish").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUBLISH_OPERATION)).to(String.format("hazelcast-%sbar?reliable=true", HazelcastConstants.TOPIC_PREFIX)); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java index c4a4140..c7ef1cc 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapConsumerTest.java @@ -105,7 +105,7 @@ public class HazelcastReplicatedmapConsumerTest extends HazelcastCamelTestSuppor return new RouteBuilder() { @Override public void configure() throws Exception { - from(String.format("hazelcast:%srm", HazelcastConstants.REPLICATEDMAP_PREFIX)).log("object...").choice() + from(String.format("hazelcast-%srm", HazelcastConstants.REPLICATEDMAP_PREFIX)).log("object...").choice() .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)).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.REMOVED)).log("...removed").to("mock:removed").otherwise().log("fail!"); http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java index 3addc29..5484643 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastReplicatedmapProducerTest.java @@ -128,29 +128,29 @@ public class HazelcastReplicatedmapProducerTest extends HazelcastCamelTestSuppor @Override public void configure() throws Exception { - from("direct:putInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast:%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)); + from("direct:putInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast-%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)); - from("direct:put").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUT_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)); + from("direct:put").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUT_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)); - from("direct:get").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.GET_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)) + from("direct:get").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.GET_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)) .to("seda:out"); from("direct:delete").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.DELETE_OPERATION)) - .to(String.format("hazelcast:%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)); + .to(String.format("hazelcast-%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)); from("direct:clear").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CLEAR_OPERATION)) - .to(String.format("hazelcast:%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)); + .to(String.format("hazelcast-%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)); from("direct:containsKey").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CONTAINS_KEY_OPERATION)) - .to(String.format("hazelcast:%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)) + .to(String.format("hazelcast-%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)) .to("seda:out"); from("direct:containsValue").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CONTAINS_VALUE_OPERATION)) - .to(String.format("hazelcast:%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)) + .to(String.format("hazelcast-%sbar", HazelcastConstants.REPLICATEDMAP_PREFIX)) .to("seda:out"); - from("direct:putWithOperationNumber").toF("hazelcast:%sbar?operation=%s", HazelcastConstants.REPLICATEDMAP_PREFIX, HazelcastConstants.PUT_OPERATION); - from("direct:putWithOperationName").toF("hazelcast:%sbar?operation=put", HazelcastConstants.REPLICATEDMAP_PREFIX); + from("direct:putWithOperationNumber").toF("hazelcast-%sbar?operation=%s", HazelcastConstants.REPLICATEDMAP_PREFIX, HazelcastConstants.PUT_OPERATION); + from("direct:putWithOperationName").toF("hazelcast-%sbar?operation=put", HazelcastConstants.REPLICATEDMAP_PREFIX); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java index 2d5bb5f..b389175 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastRingbufferProducerTest.java @@ -85,19 +85,19 @@ public class HazelcastRingbufferProducerTest extends HazelcastCamelTestSupport { public void configure() throws Exception { from("direct:readonceHead").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.READ_ONCE_HEAD_OPERATION)).to( - String.format("hazelcast:%sfoo", HazelcastConstants.RINGBUFFER_PREFIX)); + String.format("hazelcast-%sfoo", HazelcastConstants.RINGBUFFER_PREFIX)); from("direct:readonceTail").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.READ_ONCE_TAIL_OPERATION)).to( - String.format("hazelcast:%sfoo", HazelcastConstants.RINGBUFFER_PREFIX)); + String.format("hazelcast-%sfoo", HazelcastConstants.RINGBUFFER_PREFIX)); from("direct:add").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.ADD_OPERATION)).to( - String.format("hazelcast:%sfoo", HazelcastConstants.RINGBUFFER_PREFIX)); + String.format("hazelcast-%sfoo", HazelcastConstants.RINGBUFFER_PREFIX)); from("direct:capacity").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.GET_CAPACITY_OPERATION)).to( - String.format("hazelcast:%sfoo", HazelcastConstants.RINGBUFFER_PREFIX)); + String.format("hazelcast-%sfoo", HazelcastConstants.RINGBUFFER_PREFIX)); from("direct:remainingCapacity").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.REMAINING_CAPACITY_OPERATION)).to( - String.format("hazelcast:%sfoo", HazelcastConstants.RINGBUFFER_PREFIX)); + String.format("hazelcast-%sfoo", HazelcastConstants.RINGBUFFER_PREFIX)); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java index 1b12a75..51ca05a 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConcurrentConsumersTest.java @@ -39,7 +39,7 @@ public class HazelcastSedaConcurrentConsumersTest extends CamelTestSupport { mock.expectedMessageCount(bodyCount); for (int i = 0; i < bodyCount; i++) { - template.sendBody("hazelcast:seda:foo?concurrentConsumers=4", "test"); + template.sendBody("hazelcast-seda:foo?concurrentConsumers=4", "test"); } assertMockEndpointsSatisfied(); @@ -51,7 +51,7 @@ public class HazelcastSedaConcurrentConsumersTest extends CamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("hazelcast:seda:foo?concurrentConsumers=4").threads(6).to("mock:result"); + from("hazelcast-seda:foo?concurrentConsumers=4").threads(6).to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java index 43eb8f9..2cf74c7 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaConfigurationTest.java @@ -24,12 +24,12 @@ public class HazelcastSedaConfigurationTest extends CamelTestSupport { @Test public void createEndpointWithTransferExchange() throws Exception { - HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint) context.getEndpoint("hazelcast:seda:foo?transferExchange=true"); + HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint) context.getEndpoint("hazelcast-seda:foo?transferExchange=true"); assertEquals("Invalid queue name", "foo", hzlqEndpoint.getConfiguration().getQueueName()); assertTrue("Default value of concurrent consumers is invalid", hzlqEndpoint.getConfiguration().isTransferExchange()); - hzlqEndpoint = (HazelcastSedaEndpoint) context.getEndpoint("hazelcast:seda:foo?transferExchange=false"); + hzlqEndpoint = (HazelcastSedaEndpoint) context.getEndpoint("hazelcast-seda:foo?transferExchange=false"); assertEquals("Invalid queue name", "foo", hzlqEndpoint.getConfiguration().getQueueName()); assertFalse("Default value of concurrent consumers is invalid", hzlqEndpoint.getConfiguration().isTransferExchange()); @@ -37,7 +37,7 @@ public class HazelcastSedaConfigurationTest extends CamelTestSupport { @Test public void createEndpointWithNoParams() throws Exception { - HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint) context.getEndpoint("hazelcast:seda:foo"); + HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint) context.getEndpoint("hazelcast-seda:foo"); assertEquals("Invalid queue name", "foo", hzlqEndpoint.getConfiguration().getQueueName()); assertEquals("Default value of concurrent consumers is invalid", 1, hzlqEndpoint.getConfiguration().getConcurrentConsumers()); @@ -46,7 +46,7 @@ public class HazelcastSedaConfigurationTest extends CamelTestSupport { @Test public void createEndpointWithConcurrentConsumersParam() throws Exception { - HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint) context.getEndpoint("hazelcast:seda:foo?concurrentConsumers=4"); + HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint) context.getEndpoint("hazelcast-seda:foo?concurrentConsumers=4"); assertEquals("Invalid queue name", "foo", hzlqEndpoint.getConfiguration().getQueueName()); assertEquals("Value of concurrent consumers is invalid", 4, hzlqEndpoint.getConfiguration().getConcurrentConsumers()); @@ -55,7 +55,7 @@ public class HazelcastSedaConfigurationTest extends CamelTestSupport { @Test public void createEndpointWithPoolIntevalParam() throws Exception { - HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint) context.getEndpoint("hazelcast:seda:foo?pollTimeout=4000"); + HazelcastSedaEndpoint hzlqEndpoint = (HazelcastSedaEndpoint) context.getEndpoint("hazelcast-seda:foo?pollTimeout=4000"); assertEquals("Invalid queue name", "foo", hzlqEndpoint.getConfiguration().getQueueName()); assertEquals("Default value of concurrent consumers is invalid", 1, hzlqEndpoint.getConfiguration().getConcurrentConsumers()); http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java index 27a8c99..96bdb66 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaFIFOTest.java @@ -46,7 +46,7 @@ public class HazelcastSedaFIFOTest extends CamelTestSupport { mock.expectedMessageCount(bodyCount); for (int i = 0; i < bodyCount; i++) { - template.sendBody("hazelcast:seda:foo", "test" + i); + template.sendBody("hazelcast-seda:foo", "test" + i); } assertMockEndpointsSatisfied(); @@ -58,7 +58,7 @@ public class HazelcastSedaFIFOTest extends CamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("hazelcast:seda:foo").to("mock:result"); + from("hazelcast-seda:foo").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java index 4ca3d6e..ab26ebe 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOnlyTest.java @@ -50,9 +50,9 @@ public class HazelcastSedaInOnlyTest extends CamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:foo").to("hazelcast:seda:foo"); + from("direct:foo").to("hazelcast-seda:foo"); - from("hazelcast:seda:foo").to("mock:result"); + from("hazelcast-seda:foo").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java index 76fa70c..3c144b8 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTest.java @@ -49,9 +49,9 @@ public class HazelcastSedaInOutTest extends CamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:foo").to("hazelcast:seda:foo"); + from("direct:foo").to("hazelcast-seda:foo"); - from("hazelcast:seda:foo").to("mock:result"); + from("hazelcast-seda:foo").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTransactedTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTransactedTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTransactedTest.java index ae8daee..5bf5f77 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTransactedTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaInOutTransactedTest.java @@ -25,9 +25,9 @@ public class HazelcastSedaInOutTransactedTest extends HazelcastSedaInOutTest { return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:foo").to("hazelcast:seda:foo"); + from("direct:foo").to("hazelcast-seda:foo"); - from("hazelcast:seda:foo?transacted=true").to("mock:result"); + from("hazelcast-seda:foo?transacted=true").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java index 9bec3d7..980b15b 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaSpringSupportTest.java @@ -34,7 +34,7 @@ public class HazelcastSedaSpringSupportTest extends CamelSpringTestSupport { public void simpleSend() throws Exception { mock.expectedMessageCount(1); - template.sendBody("hazelcast:seda:foo", "test"); + template.sendBody("hazelcast-seda:foo", "test"); assertMockEndpointsSatisfied(); } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java index e3faaa7..e0e9474 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSedaTransferExchangeTest.java @@ -65,11 +65,11 @@ public class HazelcastSedaTransferExchangeTest extends CamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:foo").to("hazelcast:seda:foo"); + from("direct:foo").to("hazelcast-seda:foo"); - from("direct:foobar").to("hazelcast:seda:foo?transferExchange=true"); + from("direct:foobar").to("hazelcast-seda:foo?transferExchange=true"); - from("hazelcast:seda:foo").to("mock:result"); + from("hazelcast-seda:foo").to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java index 64dc4e6..3265856 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetConsumerTest.java @@ -87,7 +87,7 @@ public class HazelcastSetConsumerTest extends HazelcastCamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from(String.format("hazelcast:%sfoo", HazelcastConstants.SET_PREFIX)).log("object...").choice().when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)) + from(String.format("hazelcast-%sfoo", HazelcastConstants.SET_PREFIX)).log("object...").choice().when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.ADDED)) .log("...added").to("mock:added").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/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java index 91c615c..ec21e2e 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastSetProducerTest.java @@ -118,26 +118,26 @@ public class HazelcastSetProducerTest extends HazelcastCamelTestSupport { @Override public void configure() throws Exception { - from("direct:addInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).toF("hazelcast:%sbar", HazelcastConstants.SET_PREFIX); + from("direct:addInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).toF("hazelcast-%sbar", HazelcastConstants.SET_PREFIX); - from("direct:add").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.ADD_OPERATION)).toF("hazelcast:%sbar", HazelcastConstants.SET_PREFIX); + from("direct:add").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.ADD_OPERATION)).toF("hazelcast-%sbar", HazelcastConstants.SET_PREFIX); from("direct:removevalue").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.REMOVEVALUE_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.SET_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.SET_PREFIX)); - from("direct:clear").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CLEAR_OPERATION)).toF("hazelcast:%sbar", HazelcastConstants.SET_PREFIX); + from("direct:clear").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.CLEAR_OPERATION)).toF("hazelcast-%sbar", HazelcastConstants.SET_PREFIX); from("direct:addAll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.ADD_ALL_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.SET_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.SET_PREFIX)); from("direct:removeAll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.REMOVE_ALL_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.SET_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.SET_PREFIX)); from("direct:retainAll").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.RETAIN_ALL_OPERATION)).to( - String.format("hazelcast:%sbar", HazelcastConstants.SET_PREFIX)); + String.format("hazelcast-%sbar", HazelcastConstants.SET_PREFIX)); - from("direct:addWithOperationNumber").toF("hazelcast:%sbar?operation=%s", HazelcastConstants.SET_PREFIX, HazelcastConstants.ADD_OPERATION); - from("direct:addWithOperationName").toF("hazelcast:%sbar?operation=add", HazelcastConstants.SET_PREFIX); + from("direct:addWithOperationNumber").toF("hazelcast-%sbar?operation=%s", HazelcastConstants.SET_PREFIX, HazelcastConstants.ADD_OPERATION); + from("direct:addWithOperationName").toF("hazelcast-%sbar?operation=add", HazelcastConstants.SET_PREFIX); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java index c833f88..9be9c05 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicConsumerTest.java @@ -74,7 +74,7 @@ public class HazelcastTopicConsumerTest extends HazelcastCamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from(String.format("hazelcast:%sfoo", HazelcastConstants.TOPIC_PREFIX)).log("object...") + from(String.format("hazelcast-%sfoo", HazelcastConstants.TOPIC_PREFIX)).log("object...") .choice() .when(header(HazelcastConstants.LISTENER_ACTION).isEqualTo(HazelcastConstants.RECEIVED)) .log("...received").to("mock:received") http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java index 37f1750..dff2014 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastTopicProducerTest.java @@ -68,11 +68,11 @@ public class HazelcastTopicProducerTest extends HazelcastCamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:no-operation").to(String.format("hazelcast:%sbar", HazelcastConstants.TOPIC_PREFIX)); + from("direct:no-operation").to(String.format("hazelcast-%sbar", HazelcastConstants.TOPIC_PREFIX)); - from("direct:publishInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast:%sbar", HazelcastConstants.TOPIC_PREFIX)); + from("direct:publishInvalid").setHeader(HazelcastConstants.OPERATION, constant("bogus")).to(String.format("hazelcast-%sbar", HazelcastConstants.TOPIC_PREFIX)); - from("direct:publish").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUBLISH_OPERATION)).to(String.format("hazelcast:%sbar", HazelcastConstants.TOPIC_PREFIX)); + from("direct:publish").setHeader(HazelcastConstants.OPERATION, constant(HazelcastConstants.PUBLISH_OPERATION)).to(String.format("hazelcast-%sbar", HazelcastConstants.TOPIC_PREFIX)); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml index 46e74aa..fa84ed7 100644 --- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml +++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-atomicnumber.xml @@ -30,7 +30,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>setvalue</constant> </setHeader> - <to uri="hazelcast:atomicvalue:foo" /> + <to uri="hazelcast-atomicvalue:foo" /> </route> <route> @@ -38,7 +38,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>get</constant> </setHeader> - <to uri="hazelcast:atomicvalue:foo" /> + <to uri="hazelcast-atomicvalue:foo" /> </route> <route> @@ -46,7 +46,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>increment</constant> </setHeader> - <to uri="hazelcast:atomicvalue:foo" /> + <to uri="hazelcast-atomicvalue:foo" /> </route> <route> @@ -54,7 +54,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>decrement</constant> </setHeader> - <to uri="hazelcast:atomicvalue:foo" /> + <to uri="hazelcast-atomicvalue:foo" /> </route> <route> @@ -62,7 +62,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>compareAndSet</constant> </setHeader> - <to uri="hazelcast:atomicvalue:foo" /> + <to uri="hazelcast-atomicvalue:foo" /> </route> <route> @@ -70,7 +70,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>getAndAdd</constant> </setHeader> - <to uri="hazelcast:atomicvalue:foo" /> + <to uri="hazelcast-atomicvalue:foo" /> </route> <route> @@ -78,7 +78,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>destroy</constant> </setHeader> - <to uri="hazelcast:atomicvalue:foo" /> + <to uri="hazelcast-atomicvalue:foo" /> </route> </camelContext> http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-name-reference.xml ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-name-reference.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-name-reference.xml index 6143b2f..2d0ba79 100644 --- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-name-reference.xml +++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-name-reference.xml @@ -40,7 +40,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>put</constant> </setHeader> - <to uri="hazelcast:map:testmap?hazelcastInstanceName=HZ.INSTANCE"/> + <to uri="hazelcast-map:testmap?hazelcastInstanceName=HZ.INSTANCE"/> </route> <route id="testHazelcastInstanceBeanRefGet"> @@ -48,7 +48,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>get</constant> </setHeader> - <to uri="hazelcast:map:testmap?hazelcastInstanceName=HZ.INSTANCE"/> + <to uri="hazelcast-map:testmap?hazelcastInstanceName=HZ.INSTANCE"/> <to uri="seda:out" /> </route> </camelContext> http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml index 06e8151..50b912a 100644 --- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml +++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-hazelcast-instance-reference.xml @@ -39,7 +39,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>put</constant> </setHeader> - <to uri="hazelcast:map:testmap?hazelcastInstance=#hazelcastInstance"/> + <to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/> </route> <route id="testHazelcastInstanceBeanRefGet"> @@ -47,7 +47,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>get</constant> </setHeader> - <to uri="hazelcast:map:testmap?hazelcastInstance=#hazelcastInstance"/> + <to uri="hazelcast-map:testmap?hazelcastInstance=#hazelcastInstance"/> <to uri="seda:out" /> </route> </camelContext> http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml index a1289de..1b3b155 100644 --- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml +++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-map.xml @@ -30,7 +30,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>put</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> </route> <route> @@ -38,7 +38,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>update</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> </route> <route> @@ -46,7 +46,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>get</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> <to uri="seda:out" /> </route> @@ -55,7 +55,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>delete</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> </route> <route> @@ -63,7 +63,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>query</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> <to uri="seda:out" /> </route> @@ -72,7 +72,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>putIfAbsent</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> </route> <route> @@ -80,7 +80,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>getAll</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> <to uri="seda:out" /> </route> @@ -89,7 +89,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>clear</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> </route> <route> @@ -97,7 +97,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>evict</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> <to uri="seda:out" /> </route> @@ -106,7 +106,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>evictAll</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> <to uri="seda:out" /> </route> @@ -115,7 +115,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>containsKey</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> <to uri="seda:out" /> </route> @@ -124,7 +124,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>containsValue</constant> </setHeader> - <to uri="hazelcast:map:foo" /> + <to uri="hazelcast-map:foo" /> <to uri="seda:out" /> </route> </camelContext> http://git-wip-us.apache.org/repos/asf/camel/blob/bf10d278/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml index 017a1aa..7f80997 100644 --- a/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml +++ b/components/camel-hazelcast/src/test/resources/META-INF/spring/test-camel-context-multimap.xml @@ -30,7 +30,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>put</constant> </setHeader> - <to uri="hazelcast:multimap:bar" /> + <to uri="hazelcast-multimap:bar" /> </route> <route> @@ -38,7 +38,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>removevalue</constant> </setHeader> - <to uri="hazelcast:multimap:bar" /> + <to uri="hazelcast-multimap:bar" /> </route> <route> @@ -46,7 +46,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>get</constant> </setHeader> - <to uri="hazelcast:multimap:bar" /> + <to uri="hazelcast-multimap:bar" /> <to uri="seda:out" /> </route> @@ -55,7 +55,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>delete</constant> </setHeader> - <to uri="hazelcast:multimap:bar" /> + <to uri="hazelcast-multimap:bar" /> </route> <route> @@ -63,7 +63,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>valueCount</constant> </setHeader> - <to uri="hazelcast:multimap:bar" /> + <to uri="hazelcast-multimap:bar" /> </route> <route> @@ -71,7 +71,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>containsKey</constant> </setHeader> - <to uri="hazelcast:multimap:bar" /> + <to uri="hazelcast-multimap:bar" /> <to uri="seda:out" /> </route> @@ -80,7 +80,7 @@ <setHeader headerName="CamelHazelcastOperationType"> <constant>containsValue</constant> </setHeader> - <to uri="hazelcast:multimap:bar" /> + <to uri="hazelcast-multimap:bar" /> <to uri="seda:out" /> </route>
