CAMEL-7620: Rest DSL. Fixed tests due recent changes.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ff842d3b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff842d3b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff842d3b Branch: refs/heads/master Commit: ff842d3b0422628323c92fa23a7c85241b1c81f2 Parents: ff39d84 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 6 17:53:33 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Aug 7 08:58:41 2014 +0200 ---------------------------------------------------------------------- .../component/rest/FromRestUriPrefixTest.java | 10 ++--- .../impl/MultipleLifecycleStrategyTest.java | 2 +- .../ManagedFromRestGetEmbeddedRouteTest.java | 4 +- .../management/ManagedFromRestGetTest.java | 4 +- ...roducerRouteAddRemoveRegisterAlwaysTest.java | 6 +-- .../management/ManagedRouteAddRemoveTest.java | 42 ++++++++++---------- .../org/apache/camel/model/simpleRest.xml | 2 +- .../src/test/resources/test-rest.xml | 4 +- .../restlet/SpringRestRestletPojoInOutTest.xml | 2 +- .../spring/LifecycleStrategyInjectionTest.java | 2 +- .../MultipleLifecycleStrategyInjectionTest.java | 2 +- .../apache/camel/component/rest/RestRefTest.xml | 4 +- .../rest/SpringFromRestConfigurationTest.xml | 4 +- .../rest/SpringFromRestGetEmbeddedRouteTest.xml | 4 +- .../component/rest/SpringFromRestGetTest.xml | 4 +- .../rest/SpringFromRestUriPrefixTest.xml | 6 +-- .../component/rest/FromRestUriPrefixTest.java | 6 +-- .../rest/FromRestConfigurationTest.xml | 4 +- .../rest/FromRestGetEmbeddedRouteTest.xml | 4 +- .../component/rest/FromRestGetTest.xml | 4 +- .../component/rest/FromRestUriPrefixTest.xml | 6 +-- .../blueprint/component/rest/RestRefTest.xml | 4 +- 22 files changed, 65 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java index 790226d..7eade0c 100644 --- a/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/rest/FromRestUriPrefixTest.java @@ -31,8 +31,8 @@ public class FromRestUriPrefixTest extends FromRestGetTest { assertEquals("/say/", rest.getPath()); assertEquals(3, rest.getVerbs().size()); assertEquals("/hello", rest.getVerbs().get(0).getUri()); - assertEquals("bye", rest.getVerbs().get(1).getUri()); - assertEquals("/bye", rest.getVerbs().get(2).getUri()); + assertEquals("/bye", rest.getVerbs().get(1).getUri()); + assertEquals("/hi", rest.getVerbs().get(2).getUri()); ToDefinition to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getTo()); assertEquals("direct:hello", to.getUri()); to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(1).getTo()); @@ -40,7 +40,7 @@ public class FromRestUriPrefixTest extends FromRestGetTest { // the rest becomes routes and the input is a seda endpoint created by the DummyRestConsumerFactory getMockEndpoint("mock:update").expectedMessageCount(1); - template.sendBody("seda:post-say-bye", "I was here"); + template.sendBody("seda:post-say-hi", "I was here"); assertMockEndpointsSatisfied(); String out = template.requestBody("seda:get-say-hello", "Me", String.class); @@ -57,8 +57,8 @@ public class FromRestUriPrefixTest extends FromRestGetTest { // we have logic to cleanup those paths so there is only one / between the paths rest("/say/") .get("/hello").to("direct:hello") - .get("bye").consumes("application/json").to("direct:bye") - .post("/bye").to("mock:update"); + .get("/bye").consumes("application/json").to("direct:bye") + .post("/hi").to("mock:update"); from("direct:hello") .transform().constant("Hello World"); http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java b/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java index dd417ac..0907c1f 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java @@ -51,7 +51,7 @@ public class MultipleLifecycleStrategyTest extends TestSupport { context.stop(); List<String> expectedEvents = Arrays.asList("onContextStart", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", - "onServiceAdd", "onServiceAdd", "onComponentAdd", "onEndpointAdd", "onComponentRemove", "onContextStop"); + "onServiceAdd", "onServiceAdd", "onServiceAdd", "onComponentAdd", "onEndpointAdd", "onComponentRemove", "onContextStop"); assertEquals(expectedEvents, dummy1.getEvents()); assertEquals(expectedEvents, dummy2.getEvents()); http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetEmbeddedRouteTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetEmbeddedRouteTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetEmbeddedRouteTest.java index 9e09b89..bfce4a1 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetEmbeddedRouteTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetEmbeddedRouteTest.java @@ -49,8 +49,8 @@ public class ManagedFromRestGetEmbeddedRouteTest extends ManagementTestSupport { log.info(xml); assertTrue(xml.contains("<rests")); - assertTrue(xml.contains("<rest uri=\"/say/hello\">")); - assertTrue(xml.contains("<rest uri=\"/say/bye\">")); + assertTrue(xml.contains("<rest path=\"/say/hello\">")); + assertTrue(xml.contains("<rest path=\"/say/bye\">")); assertTrue(xml.contains("</rest>")); assertTrue(xml.contains("<get>")); assertTrue(xml.contains("<route")); http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java index d1c627e..6bc98be 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedFromRestGetTest.java @@ -49,8 +49,8 @@ public class ManagedFromRestGetTest extends ManagementTestSupport { log.info(xml); assertTrue(xml.contains("<rests")); - assertTrue(xml.contains("<rest uri=\"/say/hello\">")); - assertTrue(xml.contains("<rest uri=\"/say/bye\">")); + assertTrue(xml.contains("<rest path=\"/say/hello\">")); + assertTrue(xml.contains("<rest path=\"/say/bye\">")); assertTrue(xml.contains("</rest>")); assertTrue(xml.contains("<get>")); assertTrue(xml.contains("application/json")); http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java index 1a807b4..60432b1 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java @@ -49,7 +49,7 @@ public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementT // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // number of producers ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*"); @@ -74,7 +74,7 @@ public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementT // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // but as its recipient list which is dynamic-to we add new producers because we have register always namesP = mbeanServer.queryNames(onP, null); @@ -89,7 +89,7 @@ public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementT // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // and we still have the other producers, but not the one from the 2nd route that was removed namesP = mbeanServer.queryNames(onP, null); http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java index 58c0176..4ba5c04 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java @@ -59,7 +59,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=services,*"); Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // number of producers ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*"); @@ -84,7 +84,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // but we should have one more producer namesP = mbeanServer.queryNames(onP, null); @@ -99,7 +99,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // and the 2nd producer should be removed namesP = mbeanServer.queryNames(onP, null); @@ -119,7 +119,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // number of producers ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*"); @@ -144,7 +144,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // but as its recipient list which is dynamic-to we do not add a new producer namesP = mbeanServer.queryNames(onP, null); @@ -159,7 +159,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // and we still have the original producer namesP = mbeanServer.queryNames(onP, null); @@ -179,7 +179,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // number of producers ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*"); @@ -204,7 +204,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // but as its recipient list which is dynamic-to we do not add a new producer namesP = mbeanServer.queryNames(onP, null); @@ -219,7 +219,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // and we still have the original producer namesP = mbeanServer.queryNames(onP, null); @@ -239,7 +239,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); log.info("Adding 2nd route"); @@ -269,7 +269,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // now stop and remove the 2nd route log.info("Stopping 2nd route"); @@ -281,7 +281,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); log.info("Shutting down..."); } @@ -297,7 +297,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); log.info("Adding 2nd route"); @@ -328,7 +328,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // now stop and remove the 2nd route log.info("Stopping 2nd route"); @@ -340,7 +340,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); log.info("Shutting down..."); } @@ -356,7 +356,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); log.info("Adding 2nd route"); @@ -385,7 +385,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // now stop and remove the 2nd route log.info("Stopping 2nd route"); @@ -397,7 +397,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); log.info("Shutting down..."); } @@ -413,7 +413,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); log.info("Adding 2nd route"); @@ -443,7 +443,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); // now stop and remove the 2nd route log.info("Stopping 2nd route"); @@ -455,7 +455,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(7, names.size()); + assertEquals(8, names.size()); log.info("Shutting down..."); } http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/camel-core/src/test/resources/org/apache/camel/model/simpleRest.xml ---------------------------------------------------------------------- diff --git a/camel-core/src/test/resources/org/apache/camel/model/simpleRest.xml b/camel-core/src/test/resources/org/apache/camel/model/simpleRest.xml index de6ba7f..ea99960 100644 --- a/camel-core/src/test/resources/org/apache/camel/model/simpleRest.xml +++ b/camel-core/src/test/resources/org/apache/camel/model/simpleRest.xml @@ -18,7 +18,7 @@ <rests xmlns="http://camel.apache.org/schema/spring"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <rest uri="/users"> + <rest path="/users"> <get uri="/view/{id}"> <to uri="direct:getUser"/> </get> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-blueprint/src/test/resources/test-rest.xml ---------------------------------------------------------------------- diff --git a/components/camel-blueprint/src/test/resources/test-rest.xml b/components/camel-blueprint/src/test/resources/test-rest.xml index f2a4598..b372d71 100644 --- a/components/camel-blueprint/src/test/resources/test-rest.xml +++ b/components/camel-blueprint/src/test/resources/test-rest.xml @@ -23,12 +23,12 @@ <restConfiguration component="dummy-rest" host="localhost" port="9090"/> - <rest uri="/say/hello"> + <rest path="/say/hello"> <get> <to uri="direct:hello"/> </get> </rest> - <rest uri="/say/bye"> + <rest path="/say/bye"> <get> <to uri="direct:bye"/> </get> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-restlet/src/test/resources/org/apache/camel/component/restlet/SpringRestRestletPojoInOutTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-restlet/src/test/resources/org/apache/camel/component/restlet/SpringRestRestletPojoInOutTest.xml b/components/camel-restlet/src/test/resources/org/apache/camel/component/restlet/SpringRestRestletPojoInOutTest.xml index 5b2d6be..56558c7 100644 --- a/components/camel-restlet/src/test/resources/org/apache/camel/component/restlet/SpringRestRestletPojoInOutTest.xml +++ b/components/camel-restlet/src/test/resources/org/apache/camel/component/restlet/SpringRestRestletPojoInOutTest.xml @@ -33,7 +33,7 @@ <restConfiguration bindingMode="auto" component="restlet"/> - <rest uri="/users"> + <rest path="/users"> <post uri="/lives" type="org.apache.camel.component.restlet.UserPojo" outType="org.apache.camel.component.restlet.CountryPojo"> <route> <bean beanType="org.apache.camel.component.restlet.UserService" method="livesWhere"/> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java index 4a9c3bb..5f41504 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java @@ -32,7 +32,7 @@ public class LifecycleStrategyInjectionTest extends SpringTestSupport { } public void testInjectedStrategy() throws Exception { - assertEquals(2, context.getLifecycleStrategies().size()); + assertEquals(3, context.getLifecycleStrategies().size()); assertIsInstanceOf(DummyLifecycleStrategy.class, context.getLifecycleStrategies().get(1)); } http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java index 92c54b9..eae218a 100644 --- a/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java +++ b/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java @@ -32,7 +32,7 @@ public class MultipleLifecycleStrategyInjectionTest extends SpringTestSupport { } public void testInjectedStrategy() throws Exception { - assertEquals(3, context.getLifecycleStrategies().size()); + assertEquals(4, context.getLifecycleStrategies().size()); assertIsInstanceOf(DummyLifecycleStrategy.class, context.getLifecycleStrategies().get(1)); assertIsInstanceOf(DummyLifecycleStrategy.class, context.getLifecycleStrategies().get(2)); } http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml index c381953..9d87eaa 100644 --- a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml +++ b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml @@ -26,7 +26,7 @@ <bean id="dummy-rest" class="org.apache.camel.component.rest.DummyRestConsumerFactory"/> <restContext id="myCoolRest" xmlns="http://camel.apache.org/schema/spring";> - <rest uri="/say/hello"> + <rest path="/say/hello"> <get> <to uri="direct:hello"/> </get> @@ -37,7 +37,7 @@ <restContextRef ref="myCoolRest"/> - <rest uri="/say/bye"> + <rest path="/say/bye"> <get consumes="application/json"> <to uri="direct:bye"/> </get> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml index 5a41c65..2be2f49 100644 --- a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml +++ b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml @@ -34,12 +34,12 @@ <consumerProperty key="pollTimeout" value="1000"/> </restConfiguration> - <rest uri="/say/hello"> + <rest path="/say/hello"> <get> <to uri="direct:hello"/> </get> </rest> - <rest uri="/say/bye"> + <rest path="/say/bye"> <get consumes="application/json"> <to uri="direct:bye"/> </get> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.xml index 4961e7e..6d365ba 100644 --- a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.xml +++ b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.xml @@ -27,7 +27,7 @@ <camelContext xmlns="http://camel.apache.org/schema/spring";> - <rest uri="/say/hello"> + <rest path="/say/hello"> <get> <route> <to uri="mock:hello"/> @@ -37,7 +37,7 @@ </route> </get> </rest> - <rest uri="/say/bye"> + <rest path="/say/bye"> <get consumes="application/json"> <route> <to uri="mock:bye"/> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml index 4fa30ec..fc83f40 100644 --- a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml +++ b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml @@ -27,12 +27,12 @@ <camelContext xmlns="http://camel.apache.org/schema/spring";> - <rest uri="/say/hello"> + <rest path="/say/hello"> <get> <to uri="direct:hello"/> </get> </rest> - <rest uri="/say/bye"> + <rest path="/say/bye"> <get consumes="application/json"> <to uri="direct:bye"/> </get> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml index c2a8aa7..b0b07e2 100644 --- a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml +++ b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml @@ -27,14 +27,14 @@ <camelContext xmlns="http://camel.apache.org/schema/spring";> - <rest uri="/say/"> + <rest path="/say/"> <get uri="/hello"> <to uri="direct:hello"/> </get> - <get uri="bye" consumes="application/json"> + <get uri="/bye" consumes="application/json"> <to uri="direct:bye"/> </get> - <post uri="/bye"> + <post uri="/hi"> <to uri="mock:update"/> </post> </rest> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java index 2fd6d3e..11417ca 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.java @@ -42,8 +42,8 @@ public class FromRestUriPrefixTest extends CamelBlueprintTestSupport { assertEquals("/say/", rest.getPath()); assertEquals(3, rest.getVerbs().size()); assertEquals("/hello", rest.getVerbs().get(0).getUri()); - assertEquals("bye", rest.getVerbs().get(1).getUri()); - assertEquals("/bye", rest.getVerbs().get(2).getUri()); + assertEquals("/bye", rest.getVerbs().get(1).getUri()); + assertEquals("/hi", rest.getVerbs().get(2).getUri()); ToDefinition to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(0).getTo()); assertEquals("direct:hello", to.getUri()); to = assertIsInstanceOf(ToDefinition.class, rest.getVerbs().get(1).getTo()); @@ -51,7 +51,7 @@ public class FromRestUriPrefixTest extends CamelBlueprintTestSupport { // the rest becomes routes and the input is a seda endpoint created by the DummyRestConsumerFactory getMockEndpoint("mock:update").expectedMessageCount(1); - template.sendBody("seda:post-say-bye", "I was here"); + template.sendBody("seda:post-say-hi", "I was here"); assertMockEndpointsSatisfied(); String out = template.requestBody("seda:get-say-hello", "Me", String.class); http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestConfigurationTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestConfigurationTest.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestConfigurationTest.xml index cd1f3cd..0c8c8f9 100644 --- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestConfigurationTest.xml +++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestConfigurationTest.xml @@ -32,12 +32,12 @@ <consumerProperty key="pollTimeout" value="1000"/> </restConfiguration> - <rest uri="/say/hello"> + <rest path="/say/hello"> <get> <to uri="direct:hello"/> </get> </rest> - <rest uri="/say/bye"> + <rest path="/say/bye"> <get consumes="application/json"> <to uri="direct:bye"/> </get> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetEmbeddedRouteTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetEmbeddedRouteTest.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetEmbeddedRouteTest.xml index 3a1fb99..8d9e5be 100644 --- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetEmbeddedRouteTest.xml +++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetEmbeddedRouteTest.xml @@ -25,7 +25,7 @@ <camelContext xmlns="http://camel.apache.org/schema/blueprint";> - <rest uri="/say/hello"> + <rest path="/say/hello"> <get> <route> <to uri="mock:hello"/> @@ -35,7 +35,7 @@ </route> </get> </rest> - <rest uri="/say/bye"> + <rest path="/say/bye"> <get consumes="application/json"> <route> <to uri="mock:bye"/> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.xml index 578ed92..f0e8c56 100644 --- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.xml +++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestGetTest.xml @@ -25,12 +25,12 @@ <camelContext xmlns="http://camel.apache.org/schema/blueprint";> - <rest uri="/say/hello"> + <rest path="/say/hello"> <get> <to uri="direct:hello"/> </get> </rest> - <rest uri="/say/bye"> + <rest path="/say/bye"> <get consumes="application/json"> <to uri="direct:bye"/> </get> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.xml index 2319f0d..7dc42ea 100644 --- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.xml +++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/FromRestUriPrefixTest.xml @@ -25,14 +25,14 @@ <camelContext xmlns="http://camel.apache.org/schema/blueprint";> - <rest uri="/say/"> + <rest path="/say/"> <get uri="/hello"> <to uri="direct:hello"/> </get> - <get uri="bye" consumes="application/json"> + <get uri="/bye" consumes="application/json"> <to uri="direct:bye"/> </get> - <post uri="/bye"> + <post uri="/hi"> <to uri="mock:update"/> </post> </rest> http://git-wip-us.apache.org/repos/asf/camel/blob/ff842d3b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/RestRefTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/RestRefTest.xml b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/RestRefTest.xml index c12c6e3..f1fd55f 100644 --- a/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/RestRefTest.xml +++ b/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/component/rest/RestRefTest.xml @@ -24,7 +24,7 @@ <bean id="dummy-rest" class="org.apache.camel.test.blueprint.component.rest.DummyRestConsumerFactory"/> <restContext id="myCoolRest" xmlns="http://camel.apache.org/schema/blueprint";> - <rest uri="/say/hello"> + <rest path="/say/hello"> <get> <to uri="direct:hello"/> </get> @@ -35,7 +35,7 @@ <restContextRef ref="myCoolRest"/> - <rest uri="/say/bye"> + <rest path="/say/bye"> <get consumes="application/json"> <to uri="direct:bye"/> </get>
