This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch rest-to in repository https://gitbox.apache.org/repos/asf/camel.git
commit 84bc48db41788a19337cb7c3ec2ef89e964d29e3 Author: Claus Ibsen <[email protected]> AuthorDate: Tue Feb 22 11:15:11 2022 +0100 CAMEL-17675: camel-core - Rest DSL remove support for using inlined routes. --- .../component/jetty/rest/RestJettyAcceptTest.java | 3 +- .../RestJettyBindingModeJsonWithContractTest.java | 4 ++- .../RestJettyBindingModeOffWithContractTest.java | 6 ++-- .../jetty/rest/RestJettyContentTypeTest.java | 15 ++++++---- .../jetty/rest/RestJettyDefaultValueTest.java | 4 ++- .../component/jetty/rest/RestJettyGetCorsTest.java | 3 +- .../rest/RestJettyGetCustomHttpBindingTest.java | 3 +- .../component/jetty/rest/RestJettyGetTest.java | 3 +- .../component/jetty/rest/RestJettyGetToDTest.java | 4 +-- .../jetty/rest/RestJettyGetWildcardsTest.java | 11 +++++-- ...ettyInvalidJSonClientRequestValidationTest.java | 3 +- .../jetty/rest/RestJettyMethodNotAllowedTest.java | 3 +- .../jetty/rest/RestJettyPojoInOutTest.java | 3 +- .../rest/RestJettyRemoveAddRestAndRouteTest.java | 18 +++++++----- .../jetty/rest/RestJettyRequiredBodyTest.java | 3 +- .../rest/RestJettyRequiredHttpHeaderTest.java | 6 ++-- .../rest/RestJettyRequiredQueryParameterTest.java | 4 ++- .../component/jetty/rest/RestJettyVerbTest.java | 16 ++++++---- .../rest/producer/HttpRestProducerGetTest.java | 3 +- .../rest/producer/JettyRestProducerApiDocTest.java | 3 +- .../rest/producer/JettyRestProducerGetTest.java | 3 +- .../JettyRestProducerGetUriParameterTest.java | 4 ++- .../producer/JettyRestProducerPojoInOutTest.java | 3 +- ...JettyRestProducerThrowExceptionOnErrorTest.java | 4 ++- .../JettyRestProducerVerbUpperCaseTest.java | 3 +- .../http/rest/RestNettyCircuitBreakerLeakTest.java | 8 ++--- ...stNettyHttpBindingModeJsonWithContractTest.java | 4 ++- ...estNettyHttpBindingModeOffWithContractTest.java | 6 ++-- .../RestNettyHttpContextPathConfigurationTest.java | 12 ++++---- .../rest/RestNettyHttpContextPathMatchGetTest.java | 13 +++++---- .../netty/http/rest/RestNettyHttpGetCorsTest.java | 5 ++-- .../netty/http/rest/RestNettyHttpGetTest.java | 5 ++-- .../http/rest/RestNettyHttpGetWildcardsTest.java | 14 +++++---- .../http/rest/RestNettyHttpPojoInOutTest.java | 4 ++- .../netty/http/rest/RestNettyHttpVerbTest.java | 11 ++++--- .../http/rest/RestNettyMethodNotAllowedTest.java | 5 ++-- .../netty/http/rest/RestNettyProducerGetTest.java | 5 ++-- .../rest/RestNettyProducerGetUriParameterTest.java | 5 ++-- .../RestNettyProducerThrowExceptionErrorTest.java | 5 ++-- .../rest/RestNettyProducerVerbUpperCaseTest.java | 5 ++-- .../http/rest/RestProducerOutTypeBindingTest.java | 9 +++--- ...RestServletBindingModeJsonWithContractTest.java | 5 ++-- .../RestServletBindingModeOffWithContractTest.java | 7 +++-- .../servlet/rest/RestServletContentTypeTest.java | 15 ++++++---- .../component/servlet/rest/RestServletGetTest.java | 4 ++- .../servlet/rest/RestServletGetWildcardsTest.java | 17 +++++++---- .../rest/RestServletMethodNotAllowedTest.java | 4 ++- .../servlet/rest/RestServletNameTest.java | 5 +++- .../servlet/rest/RestServletPojoInOutTest.java | 5 ++-- .../servlet/rest/RestServletQueryParamTest.java | 7 +++-- .../servlet/rest/RestServletQueryParamUriTest.java | 8 +++-- .../servlet/rest/RestServletVerbTest.java | 13 +++++---- .../camel/component/undertow/rest/RestGetTest.java | 5 ++-- .../rest/RestUndertowComponentVerifierTest.java | 4 ++- .../undertow/rest/RestUndertowContentTypeTest.java | 17 +++++++---- ...ndertowHttpBindingModeJsonWithContractTest.java | 4 ++- ...UndertowHttpBindingModeOffWithContractTest.java | 6 ++-- ...stUndertowHttpContextPathConfigurationTest.java | 12 ++++---- .../RestUndertowHttpContextPathMatchGetTest.java | 13 +++++---- .../undertow/rest/RestUndertowHttpGetCorsTest.java | 12 ++++---- .../rest/RestUndertowHttpGetOrderingIssueTest.java | 15 ++++------ .../undertow/rest/RestUndertowHttpGetTest.java | 5 ++-- .../rest/RestUndertowHttpGetWildcardsTest.java | 11 +++++-- .../rest/RestUndertowHttpPojoInOutTest.java | 4 ++- .../rest/RestUndertowHttpPojoTypeTest.java | 34 ++++++++++++---------- .../rest/RestUndertowMethodNotAllowedTest.java | 5 ++-- .../rest/RestUndertowProducerEncodingTest.java | 4 ++- .../undertow/rest/RestUndertowProducerGetTest.java | 5 ++-- .../RestUndertowProducerGetUriParameterTest.java | 4 ++- ...estUndertowProducerThrowExceptionErrorTest.java | 4 ++- .../RestUndertowProducerVerbUpperCaseTest.java | 4 ++- .../rest/RestUndertowVerbEnableCorsTest.java | 10 ++++--- .../undertow/rest/RestUndertowVerbTest.java | 11 ++++--- 73 files changed, 330 insertions(+), 200 deletions(-) diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java index 92d2d0f..56a2957 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyAcceptTest.java @@ -75,7 +75,8 @@ public class RestJettyAcceptTest extends BaseJettyTest { .clientRequestValidation(true); // use the rest DSL to define the rest services - rest("/users/").post("{id}/update").consumes("application/json").produces("application/json").route() + rest("/users/").post("{id}/update").consumes("application/json").produces("application/json").to("direct:update"); + from("direct:update") .setBody(constant("{ \"status\": \"ok\" }")); } }; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBindingModeJsonWithContractTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBindingModeJsonWithContractTest.java index aa5ce86..3e3207e 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBindingModeJsonWithContractTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBindingModeJsonWithContractTest.java @@ -72,7 +72,9 @@ public class RestJettyBindingModeJsonWithContractTest extends BaseJettyTest { rest("/users/") // REST binding converts from JSON to UserPojo - .post("new").type(UserPojo.class).route() + .post("new").type(UserPojo.class).to("direct:new"); + + from("direct:new") // then contract advice converts from UserPojo to UserPojoEx .inputType(UserPojoEx.class).to("mock:input"); } diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBindingModeOffWithContractTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBindingModeOffWithContractTest.java index a6cfc98..78d2145 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBindingModeOffWithContractTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyBindingModeOffWithContractTest.java @@ -79,9 +79,9 @@ public class RestJettyBindingModeOffWithContractTest extends BaseJettyTest { transformer().fromType(UserPojoEx.class).toType("json").withDataFormat(jsondf); rest("/users/") // REST binding does nothing - .post("new").route() - // contract advice converts betweeen JSON and UserPojoEx - // directly + .post("new").to("direct:new"); + from("direct:new") + // contract advice converts between JSON and UserPojoEx directly .inputType(UserPojoEx.class).outputType("json").process(ex -> { ex.getIn().getBody(UserPojoEx.class).setActive(true); }).to("mock:input"); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java index 9d34914..d8359dd 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyContentTypeTest.java @@ -81,16 +81,19 @@ public class RestJettyContentTypeTest extends BaseJettyTest { .clientRequestValidation(true); // use the rest DSL to define the rest services - rest("/users").post("{id}/update").consumes("application/json").produces("application/json").route() + rest("/users").post("{id}/update").consumes("application/json").produces("application/json").to("direct:update"); + from("direct:update") .setBody(constant("{ \"status\": \"ok\" }")); - rest("/users").get().produces("application/json,application/csv").route() - .choice() + rest("/users").get().produces("application/json,application/csv").to("direct:users"); + from("direct:users") + .choice() .when(simple("${header.Accept} == 'application/csv'")) - .setBody(constant("Email,FirstName,LastName\[email protected],Donald,Duck")) - .setHeader(Exchange.CONTENT_TYPE, constant("application/csv")) + .setBody(constant("Email,FirstName,LastName\[email protected],Donald,Duck")) + .setHeader(Exchange.CONTENT_TYPE, constant("application/csv")) .otherwise() - .setBody(constant("{\"email\": \"[email protected]\", \"firstname\": \"Donald\", \"lastname\": \"Duck\"}")); + .setBody(constant( + "{\"email\": \"[email protected]\", \"firstname\": \"Donald\", \"lastname\": \"Duck\"}")); } }; diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java index 2637056..33967da 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java @@ -54,7 +54,9 @@ public class RestJettyDefaultValueTest extends BaseJettyTest { // use the rest DSL to define the rest services rest("/users/").get("{id}/basic").param().name("verbose").type(RestParamType.query).defaultValue("false") - .endParam().route().process(new Processor() { + .endParam().to("direct:basic"); + from("direct:basic") + .process(new Processor() { public void process(Exchange exchange) throws Exception { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java index 844a265..4849295 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCorsTest.java @@ -69,7 +69,8 @@ public class RestJettyGetCorsTest extends BaseJettyTest { restConfiguration().component("jetty").host("localhost").port(getPort()).enableCORS(true); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(new Processor() { + rest("/users/").get("{id}/basic").to("direct:basic"); + from("direct:basic").to("mock:input").process(new Processor() { public void process(Exchange exchange) throws Exception { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCustomHttpBindingTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCustomHttpBindingTest.java index ad49845..5d54aec 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCustomHttpBindingTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetCustomHttpBindingTest.java @@ -47,7 +47,8 @@ public class RestJettyGetCustomHttpBindingTest extends BaseJettyTest { "#mybinding"); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(new Processor() { + rest("/users/").get("{id}/basic").to("direct:basic"); + from("direct:basic").to("mock:input").process(new Processor() { public void process(Exchange exchange) throws Exception { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetTest.java index 99a655f..99b4015 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetTest.java @@ -41,7 +41,8 @@ public class RestJettyGetTest extends BaseJettyTest { restConfiguration().component("jetty").host("localhost").port(getPort()); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(new Processor() { + rest("/users/").get("{id}/basic").to("direct:basic"); + from("direct:basic").to("mock:input").process(new Processor() { public void process(Exchange exchange) throws Exception { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java index 02b358f..2659b0c 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetToDTest.java @@ -47,8 +47,8 @@ public class RestJettyGetToDTest extends BaseJettyTest { "#mybinding"); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").toD("seda:${header.id}"); - + rest("/users/").get("{id}/basic").to("direct:basic"); + from("direct:basic").to("seda:${header.id}"); from("seda:123").to("mock:input").process(new Processor() { public void process(Exchange exchange) throws Exception { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetWildcardsTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetWildcardsTest.java index 5305f30..801a158 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetWildcardsTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyGetWildcardsTest.java @@ -53,17 +53,22 @@ public class RestJettyGetWildcardsTest extends BaseJettyTest { "#mybinding"); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(new Processor() { + rest("/users/") + .get("{id}/basic").to("direct:basic") + .get("{id}/{query}").to("direct:query"); + + from("direct:basic").to("mock:input").process(new Processor() { public void process(Exchange exchange) throws Exception { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); } - }).endRest().get("{id}/{query}").route().to("mock:query").process(new Processor() { + }); + from("direct:query").to("mock:query").process(new Processor() { public void process(Exchange exchange) throws Exception { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Goofy"); } - }).endRest(); + }); } }; } diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java index c8a080d..80f3a82 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyInvalidJSonClientRequestValidationTest.java @@ -58,7 +58,8 @@ public class RestJettyInvalidJSonClientRequestValidationTest extends BaseJettyTe // use the rest DSL to define the rest services rest("/users/").post("{id}/update") .consumes("application/json").produces("application/json") - .route().setBody(constant("{ \"status\": \"ok\" }")); + .to("direct:update"); + from("direct:update").setBody(constant("{ \"status\": \"ok\" }")); } }; } diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyMethodNotAllowedTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyMethodNotAllowedTest.java index 6764523..c1952e7 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyMethodNotAllowedTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyMethodNotAllowedTest.java @@ -58,7 +58,8 @@ public class RestJettyMethodNotAllowedTest extends BaseJettyTest { restConfiguration().component("jetty").host("localhost").port(getPort()); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(exchange -> { + rest("/users/").get("{id}/basic").to("direct:basic"); + from("direct:basic").to("mock:input").process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); }); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyPojoInOutTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyPojoInOutTest.java index c32c1ba..8e17840 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyPojoInOutTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyPojoInOutTest.java @@ -55,7 +55,8 @@ public class RestJettyPojoInOutTest extends BaseJettyTest { // use the rest DSL to define the rest services rest("/users/") // just return the default country here - .get("lives").to("direct:start").post("lives").type(UserPojo.class).outType(CountryPojo.class).route() + .get("lives").to("direct:start").post("lives").type(UserPojo.class).outType(CountryPojo.class).to("direct:lives"); + from("direct:lives") .bean(new UserService(), "livesWhere"); CountryPojo country = new CountryPojo(); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRemoveAddRestAndRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRemoveAddRestAndRouteTest.java index d47e435..d297e0c 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRemoveAddRestAndRouteTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRemoveAddRestAndRouteTest.java @@ -56,10 +56,11 @@ public class RestJettyRemoveAddRestAndRouteTest extends BaseJettyTest { new RouteBuilder(context) { @Override public void configure() throws Exception { - rest("/").get("/issues/{isin}/{sedol}").route().id("issues") + rest("/").get("/issues/{isin}/{sedol}").to("direct:issues"); + + from("direct:issues").routeId("issues") .process(e -> e.getMessage().setBody( - "Here's your issue " + e.getIn().getHeader("isin") + ":" + e.getIn().getHeader("sedol"))) - .endRest(); + "Here's your issue " + e.getIn().getHeader("isin") + ":" + e.getIn().getHeader("sedol"))); } }.addRoutesToCamelContext(context); // exception here since we have 2 rest configurations @@ -79,10 +80,13 @@ public class RestJettyRemoveAddRestAndRouteTest extends BaseJettyTest { public void configure() throws Exception { restConfiguration().host("localhost").port(getPort()); - rest("/").get("/issues/{isin}").route().id("issues") - .process(e -> e.getMessage().setBody("Here's your issue " + e.getIn().getHeader("isin"))).endRest() - .get("/listings") - .route().id("listings").process(e -> e.getMessage().setBody("some listings")); + rest("/") + .get("/issues/{isin}").to("direct:issues") + .get("/listings").to("direct:listings"); + + from("direct:listings").routeId("listings").process(e -> e.getMessage().setBody("some listings")); + from("direct:issues").routeId("issues") + .process(e -> e.getMessage().setBody("Here's your issue " + e.getIn().getHeader("isin"))); } }; } diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java index b591537..54e9516 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredBodyTest.java @@ -82,7 +82,8 @@ public class RestJettyRequiredBodyTest extends BaseJettyTest { // use the rest DSL to define the rest services rest("/users/").post("{id}/update").consumes("application/json").produces("application/json").param() .name("body").required(true).type(RestParamType.body) - .endParam().route().setBody(constant("{ \"status\": \"ok\" }")); + .endParam().to("direct:update"); + from("direct:update").setBody(constant("{ \"status\": \"ok\" }")); } }; } diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java index e823755..a628d26 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredHttpHeaderTest.java @@ -67,8 +67,10 @@ public class RestJettyRequiredHttpHeaderTest extends BaseJettyTest { // use the rest DSL to define the rest services rest("/users/").post("{id}/update").consumes("application/json").produces("application/json").param() - .name("country").required(true).type(RestParamType.header) - .endParam().route().setBody(constant("{ \"status\": \"ok\" }")); + .name("country").required(true).type(RestParamType.header).endParam().to("direct:update"); + + from("direct:update") + .setBody(constant("{ \"status\": \"ok\" }")); } }; } diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java index d9987b5..bfb8d5b 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java @@ -68,7 +68,9 @@ public class RestJettyRequiredQueryParameterTest extends BaseJettyTest { // use the rest DSL to define the rest services rest("/users/").post("{id}/update").consumes("application/json").produces("application/json").param() .name("country").required(true).type(RestParamType.query) - .endParam().route().setBody(constant("{ \"status\": \"ok\" }")); + .endParam().to("direct:update"); + + from("direct:update").setBody(constant("{ \"status\": \"ok\" }")); } }; } diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyVerbTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyVerbTest.java index 33336f1..98a4f39 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyVerbTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyVerbTest.java @@ -84,12 +84,18 @@ public class RestJettyVerbTest extends BaseJettyTest { public void configure() throws Exception { restConfiguration().component("jetty").host("localhost").port(getPort()); - rest().get("/users").route().transform() - .constant("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\", \"name\":\"Claus\" }]").endRest() - .get("/users/{id}") - .route().transform().simple("{ \"id\":\"${header.id}\", \"name\":\"Scott\" }").endRest().post("/users") - .to("mock:create").put("/users/{id}").to("mock:update") + rest().get("/users").to("direct:users") + .get("/users/{id}").to("direct:id") + .post("/users").to("mock:create") + .put("/users/{id}").to("mock:update") .delete("/users/{id}").to("mock:delete"); + + from("direct:users") + .transform() + .constant("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\", \"name\":\"Claus\" }]"); + from("direct:id") + .transform().simple("{ \"id\":\"${header.id}\", \"name\":\"Scott\" }"); + } }; } diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/HttpRestProducerGetTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/HttpRestProducerGetTest.java index 3079e4d..eb94738 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/HttpRestProducerGetTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/HttpRestProducerGetTest.java @@ -44,7 +44,8 @@ public class HttpRestProducerGetTest extends BaseJettyTest { from("direct:start").to("rest:get:users/{id}/basic"); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(new Processor() { + rest("/users/").get("{id}/basic").to("direct:basic"); + from("direct:basic").to("mock:input").process(new Processor() { public void process(Exchange exchange) throws Exception { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerApiDocTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerApiDocTest.java index f3fcc34..ae82a64 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerApiDocTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerApiDocTest.java @@ -42,7 +42,8 @@ public class JettyRestProducerApiDocTest extends BaseJettyTest { from("direct:start").to("rest:get:api:hello/hi/{name}"); // use the rest DSL to define the rest services - rest("/api/").get("hello/hi/{name}").route().transform().simple("Hello ${header.name}"); + rest("/api/").get("hello/hi/{name}").to("direct:hi"); + from("direct:hi").transform().simple("Hello ${header.name}"); } }; } diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerGetTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerGetTest.java index 83b1883..5f58ea8 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerGetTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerGetTest.java @@ -43,7 +43,8 @@ public class JettyRestProducerGetTest extends BaseJettyTest { from("direct:start").to("rest:get:users/{id}/basic"); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(new Processor() { + rest("/users/").get("{id}/basic").to("direct:basic"); + from("direct:basic").to("mock:input").process(new Processor() { public void process(Exchange exchange) throws Exception { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerGetUriParameterTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerGetUriParameterTest.java index d74feb7..ebbd7ed 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerGetUriParameterTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerGetUriParameterTest.java @@ -43,7 +43,9 @@ public class JettyRestProducerGetUriParameterTest extends BaseJettyTest { from("direct:start").to("rest:get:users/basic?id={id}"); // use the rest DSL to define the rest services - rest("/users/").get("basic/?id={id}").route().to("mock:input").process(new Processor() { + rest("/users/").get("basic/?id={id}").to("direct:basic"); + + from("direct:basic").to("mock:input").process(new Processor() { public void process(Exchange exchange) throws Exception { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerPojoInOutTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerPojoInOutTest.java index 56f9422..2a6c994 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerPojoInOutTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerPojoInOutTest.java @@ -92,7 +92,8 @@ public class JettyRestProducerPojoInOutTest extends BaseJettyTest { // use the rest DSL to define the rest services rest("/users/") // just return the default country here - .get("lives").to("direct:start").post("lives").type(UserPojo.class).outType(CountryPojo.class).route() + .get("lives").to("direct:start").post("lives").type(UserPojo.class).outType(CountryPojo.class).to("direct:lives"); + from("direct:lives") .bean(new UserService(), "livesWhere"); CountryPojo country = new CountryPojo(); diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerThrowExceptionOnErrorTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerThrowExceptionOnErrorTest.java index 553138f..43425c0 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerThrowExceptionOnErrorTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerThrowExceptionOnErrorTest.java @@ -54,7 +54,9 @@ public class JettyRestProducerThrowExceptionOnErrorTest extends BaseJettyTest { from("direct:start").to("rest:get:users/{id}/basic"); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(new Processor() { + rest("/users/").get("{id}/basic").to("direct:basic"); + + from("direct:basic").to("mock:input").process(new Processor() { public void process(Exchange exchange) throws Exception { String id = exchange.getIn().getHeader("id", String.class); if ("666".equals(id)) { diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerVerbUpperCaseTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerVerbUpperCaseTest.java index 7e84a74..b52d673 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerVerbUpperCaseTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/producer/JettyRestProducerVerbUpperCaseTest.java @@ -43,7 +43,8 @@ public class JettyRestProducerVerbUpperCaseTest extends BaseJettyTest { from("direct:start").to("rest:get:users/{id}/basic"); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(new Processor() { + rest("/users/").get("{id}/basic").to("direct:basic"); + from("direct:basic").to("mock:input").process(new Processor() { public void process(Exchange exchange) throws Exception { String method = exchange.getIn().getHeader(Exchange.HTTP_METHOD, String.class); assertEquals("GET", method); diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyCircuitBreakerLeakTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyCircuitBreakerLeakTest.java index 49db422..abb73df 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyCircuitBreakerLeakTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyCircuitBreakerLeakTest.java @@ -49,11 +49,11 @@ public class RestNettyCircuitBreakerLeakTest extends BaseNettyTest { restConfiguration().component("netty-http").host("localhost").port(getPort()) .endpointProperty("nettyHttpBinding", "#mybinding"); - rest().get("/demo").produces("text/plain") - .route() - .transform().constant("demo page"); + rest().get("/demo").produces("text/plain").to("direct:demo"); + from("direct:demo").transform().constant("demo page"); - rest().get("/demo/get").route() + rest().get("/demo/get").to("direct:get"); + from("direct:get") .circuitBreaker() .resilience4jConfiguration().timeoutEnabled(true).timeoutDuration(10000).end() .log("incoming request") diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpBindingModeJsonWithContractTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpBindingModeJsonWithContractTest.java index fe401f5..9da0d28 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpBindingModeJsonWithContractTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpBindingModeJsonWithContractTest.java @@ -64,7 +64,9 @@ public class RestNettyHttpBindingModeJsonWithContractTest extends BaseNettyTest rest("/users/") // REST binding converts from JSON to UserPojo .post("new").type(UserPojo.class) - .route() + .to("direct:new"); + + from("direct:new") // then contract advice converts from UserPojo to UserPojoEx .inputType(UserPojoEx.class) .to("mock:input"); diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpBindingModeOffWithContractTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpBindingModeOffWithContractTest.java index a2811a8..aa1ead3 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpBindingModeOffWithContractTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpBindingModeOffWithContractTest.java @@ -77,8 +77,10 @@ public class RestNettyHttpBindingModeOffWithContractTest extends BaseNettyTest { rest("/users/") // REST binding does nothing .post("new") - .route() - // contract advice converts betweeen JSON and UserPojoEx directly + .to("direct:new"); + + from("direct:new") + // contract advice converts between JSON and UserPojoEx directly .inputType(UserPojoEx.class) .outputType("json") .process(ex -> { diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpContextPathConfigurationTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpContextPathConfigurationTest.java index 2678391..cf93b29 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpContextPathConfigurationTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpContextPathConfigurationTest.java @@ -43,16 +43,16 @@ public class RestNettyHttpContextPathConfigurationTest extends BaseNettyTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}") - .route() + .get("{id}").to("direct:id") + .get("list").to("direct:list"); + + from("direct:id") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); - }) - .endRest() - .get("list") - .route() + }); + from("direct:list") .to("mock:input") .process(exchange -> exchange.getMessage().setBody("123;Donald Duck\n456;John Doe")); } diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpContextPathMatchGetTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpContextPathMatchGetTest.java index 516e398..ef7f0df 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpContextPathMatchGetTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpContextPathMatchGetTest.java @@ -43,16 +43,17 @@ public class RestNettyHttpContextPathMatchGetTest extends BaseNettyTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}") - .route() + .get("{id}").to("direct:id") + .get("list").to("direct:list"); + + from("direct:id") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); - }) - .endRest() - .get("list") - .route() + }); + + from("direct:list") .to("mock:input") .process(exchange -> exchange.getMessage().setBody("123;Donald Duck\n456;John Doe")); } diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java index 330dad4..7ecb13c 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetCorsTest.java @@ -65,8 +65,9 @@ public class RestNettyHttpGetCorsTest extends BaseNettyTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}/basic") - .route() + .get("{id}/basic").to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java index 5388f6c..f7c289b 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java @@ -46,8 +46,9 @@ public class RestNettyHttpGetTest extends BaseNettyTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}/basic") - .route() + .get("{id}/basic").to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java index b6e56ae..1f09e26 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java @@ -52,20 +52,22 @@ public class RestNettyHttpGetWildcardsTest extends BaseNettyTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}/{query}") - .route() + .get("{id}/{query}").to("direct:query") + .get("{id}/basic").to("direct:basic"); + + from("direct:query") .to("log:query") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Goofy"); - }).endRest() - .get("{id}/basic") - .route() + }); + + from("direct:basic") .to("log:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); - }).endRest(); + }); } }; } diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpPojoInOutTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpPojoInOutTest.java index 54299d3..56b0505 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpPojoInOutTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpPojoInOutTest.java @@ -57,7 +57,9 @@ public class RestNettyHttpPojoInOutTest extends BaseNettyTest { // just return the default country here .get("lives").to("direct:start") .post("lives").type(UserPojo.class).outType(CountryPojo.class) - .route() + .to("direct:lives"); + + from("direct:lives") .bean(new UserService(), "livesWhere"); CountryPojo country = new CountryPojo(); diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpVerbTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpVerbTest.java index 0a45326..2aee172 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpVerbTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpVerbTest.java @@ -85,13 +85,16 @@ public class RestNettyHttpVerbTest extends BaseNettyTest { restConfiguration().component("netty-http").host("localhost").port(getPort()); rest() - .get("/users").route().transform() - .constant("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\", \"name\":\"Claus\" }]").endRest() - .get("/users/{id}").route().transform().simple("{ \"id\":\"${header.id}\", \"name\":\"Scott\" }") - .endRest() + .get("/users").to("direct:users") + .get("/users/{id}").to("direct:id") .post("/users").to("mock:create") .put("/users/{id}").to("mock:update") .delete("/users/{id}").to("mock:delete"); + + from("direct:users").transform() + .constant("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\", \"name\":\"Claus\" }]"); + + from("direct:id").transform().simple("{ \"id\":\"${header.id}\", \"name\":\"Scott\" }"); } }; } diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyMethodNotAllowedTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyMethodNotAllowedTest.java index 8be23d9..dbca4bb 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyMethodNotAllowedTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyMethodNotAllowedTest.java @@ -58,8 +58,9 @@ public class RestNettyMethodNotAllowedTest extends BaseNettyTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}/basic") - .route() + .get("{id}/basic").to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetTest.java index 09343b2..d571517 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetTest.java @@ -45,8 +45,9 @@ public class RestNettyProducerGetTest extends BaseNettyTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}/basic") - .route() + .get("{id}/basic").to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetUriParameterTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetUriParameterTest.java index 5958259..a858ecb 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetUriParameterTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerGetUriParameterTest.java @@ -45,8 +45,9 @@ public class RestNettyProducerGetUriParameterTest extends BaseNettyTest { // use the rest DSL to define the rest services rest("/users/") - .get("basic/?id={id}") - .route() + .get("basic/?id={id}").to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerThrowExceptionErrorTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerThrowExceptionErrorTest.java index 17fc2f6..cea5577 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerThrowExceptionErrorTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerThrowExceptionErrorTest.java @@ -55,8 +55,9 @@ public class RestNettyProducerThrowExceptionErrorTest extends BaseNettyTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}/basic") - .route() + .get("{id}/basic").to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerVerbUpperCaseTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerVerbUpperCaseTest.java index 2f0ddb6..c2669f0 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerVerbUpperCaseTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyProducerVerbUpperCaseTest.java @@ -46,8 +46,9 @@ public class RestNettyProducerVerbUpperCaseTest extends BaseNettyTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}/basic") - .route() + .get("{id}/basic").to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String method = exchange.getIn().getHeader(Exchange.HTTP_METHOD, String.class); diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestProducerOutTypeBindingTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestProducerOutTypeBindingTest.java index ea967fb..2ad190a 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestProducerOutTypeBindingTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestProducerOutTypeBindingTest.java @@ -88,11 +88,12 @@ public class RestProducerOutTypeBindingTest extends BaseNettyTest { restConfiguration().component("netty-http").host("localhost").port(getPort()).bindingMode(RestBindingMode.auto); rest() - .get("/req1").route() + .get("/req1").to("direct:r1") + .get("/req2").to("direct:r2"); + from("direct:r1") .log("Got req1") - .setBody(constant(new Resp1("1"))) - .endRest() - .get("/req2").route() + .setBody(constant(new Resp1("1"))); + from("direct:r1") .log("Got req2") .setBody(constant(new Resp2(null, "2"))) .end(); diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonWithContractTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonWithContractTest.java index 68acb62..748ee63 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonWithContractTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeJsonWithContractTest.java @@ -68,8 +68,9 @@ public class RestServletBindingModeJsonWithContractTest extends ServletCamelRout rest("/users/") // REST binding converts from JSON to UserPojo - .post("new").type(UserPojo.class) - .route() + .post("new").type(UserPojo.class).to("direct:new"); + + from("direct:new") // then contract advice converts from UserPojo to UserPojoEx .inputType(UserPojoEx.class) .to("mock:input"); diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeOffWithContractTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeOffWithContractTest.java index bb77539..4594581 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeOffWithContractTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletBindingModeOffWithContractTest.java @@ -77,11 +77,12 @@ public class RestServletBindingModeOffWithContractTest extends ServletCamelRoute .fromType(UserPojoEx.class) .toType("json") .withDataFormat(jsondf); + rest("/users/") // REST binding does nothing - .post("new") - .route() - // contract advice converts betweeen JSON and UserPojoEx directly + .post("new").to("direct:new"); + from("direct:new") + // contract advice converts between JSON and UserPojoEx directly .inputType(UserPojoEx.class) .outputType("json") .process(ex -> ex.getIn().getBody(UserPojoEx.class).setActive(true)) diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletContentTypeTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletContentTypeTest.java index 1ac5288..5d46a44 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletContentTypeTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletContentTypeTest.java @@ -83,16 +83,19 @@ public class RestServletContentTypeTest extends ServletCamelRouterTestSupport { .clientRequestValidation(true); // use the rest DSL to define the rest services - rest("/users").post("/{id}/update").consumes("application/json").produces("application/json").route() + rest("/users").post("/{id}/update").consumes("application/json").produces("application/json").to("direct:update"); + from("direct:update") .setBody(constant("{ \"status\": \"ok\" }")); - rest("/users").get().produces("application/json,application/csv").route() - .choice() + rest("/users").get().produces("application/json,application/csv").to("direct:users"); + from("direct:users") + .choice() .when(simple("${header.Accept} == 'application/csv'")) - .setBody(constant("Email,FirstName,LastName\[email protected],Donald,Duck")) - .setHeader(Exchange.CONTENT_TYPE, constant("application/csv")) + .setBody(constant("Email,FirstName,LastName\[email protected],Donald,Duck")) + .setHeader(Exchange.CONTENT_TYPE, constant("application/csv")) .otherwise() - .setBody(constant("{\"email\": \"[email protected]\", \"firstname\": \"Donald\", \"lastname\": \"Duck\"}")); + .setBody(constant( + "{\"email\": \"[email protected]\", \"firstname\": \"Donald\", \"lastname\": \"Duck\"}")); } }; diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java index a8cbbf7..669895c 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetTest.java @@ -48,7 +48,9 @@ public class RestServletGetTest extends ServletCamelRouterTestSupport { restConfiguration().component("servlet").host("localhost").endpointProperty("httpBinding", "#myBinding"); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(exchange -> { + rest("/users/").get("{id}/basic").to("direct:basic"); + + from("direct:basic").to("mock:input").process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); }); diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java index 8e93c6a..5a2798e 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletGetWildcardsTest.java @@ -58,13 +58,20 @@ public class RestServletGetWildcardsTest extends ServletCamelRouterTestSupport { restConfiguration().component("servlet").host("localhost").endpointProperty("httpBinding", "#myBinding"); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(exchange -> { - String id = exchange.getIn().getHeader("id", String.class); - exchange.getMessage().setBody(id + ";Donald Duck"); - }).endRest().get("{id}/{query}").route().to("mock:query").process(exchange -> { + rest("/users/") + .get("{id}/basic").to("direct:basic") + .get("{id}/{query}").to("direct:query"); + + from("direct:basic") + .to("mock:input").process(exchange -> { + String id = exchange.getIn().getHeader("id", String.class); + exchange.getMessage().setBody(id + ";Donald Duck"); + }); + + from("direct:query").to("mock:query").process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Goofy"); - }).endRest(); + }); } }; } diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java index 03f69aa..049d6d9 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletMethodNotAllowedTest.java @@ -46,7 +46,9 @@ public class RestServletMethodNotAllowedTest extends ServletCamelRouterTestSuppo restConfiguration().component("servlet").host("localhost").endpointProperty("httpBinding", "#myBinding"); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(exchange -> { + rest("/users/").get("{id}/basic").to("direct:basic"); + + from("direct:basic").to("mock:input").process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); }); diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNameTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNameTest.java index 7a24b9c..93205b50 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNameTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletNameTest.java @@ -61,10 +61,13 @@ public class RestServletNameTest extends ServletCamelRouterTestSupport { restConfiguration().component("servlet").host("localhost").componentProperty("servletName", "myServlet"); // use the rest DSL to define the rest services - rest("/users/").get("{id}/basic").route().to("mock:input").process(exchange -> { + rest("/users/").get("{id}/basic").to("direct:basic"); + + from("direct:basic").to("mock:input").process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); }); + } }; } diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPojoInOutTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPojoInOutTest.java index cbb2718..169e7b2 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPojoInOutTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletPojoInOutTest.java @@ -70,8 +70,9 @@ public class RestServletPojoInOutTest extends ServletCamelRouterTestSupport { rest("/users/") // just return the default country here .get("lives").to("direct:start") - .post("lives").type(UserPojo.class).outType(CountryPojo.class) - .route() + .post("lives").type(UserPojo.class).outType(CountryPojo.class).to("direct:lives"); + + from("direct:lives") .bean(new UserService(), "livesWhere"); CountryPojo country = new CountryPojo(); diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletQueryParamTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletQueryParamTest.java index 4b49f8d..aaae8a0 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletQueryParamTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletQueryParamTest.java @@ -66,8 +66,11 @@ public class RestServletQueryParamTest extends ServletCamelRouterTestSupport { .type(RestParamType.query) .required(true) .endParam() - .route().to("mock:input").process(exchange -> { - String auth = exchange.getIn().getHeader("auth", String.class); + .to("direct:users"); + + from("direct:users") + .to("mock:input").process(exchange -> { + String auth = exchange.getIn().getHeader("auth", String.class); exchange.getMessage().setBody(auth + ";Donald Duck"); }); } diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletQueryParamUriTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletQueryParamUriTest.java index 4ed1b34..52529f6 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletQueryParamUriTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletQueryParamUriTest.java @@ -61,9 +61,11 @@ public class RestServletQueryParamUriTest extends ServletCamelRouterTestSupport // use the rest DSL to define the rest services rest() - .get("/users/?auth={myAuth}") - .route().to("mock:input").process(exchange -> { - String auth = exchange.getIn().getHeader("auth", String.class); + .get("/users/?auth={myAuth}").to("direct:auth"); + + from("direct:auth") + .to("mock:input").process(exchange -> { + String auth = exchange.getIn().getHeader("auth", String.class); exchange.getMessage().setBody(auth + ";Donald Duck"); }); } diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletVerbTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletVerbTest.java index 3209cec..62efa7d 100644 --- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletVerbTest.java +++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/rest/RestServletVerbTest.java @@ -111,13 +111,16 @@ public class RestServletVerbTest extends ServletCamelRouterTestSupport { .endpointProperty("eagerCheckContentAvailable", "true"); rest() - .get("/users").route().transform() - .constant("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\", \"name\":\"Claus\" }]").endRest() - .get("/users/{id}").route().transform().simple("{ \"id\":\"${header.id}\", \"name\":\"Scott\" }") - .endRest() - .post("/users").to("mock:create") + .get("/users").to("direct:users") + .get("/users/{id}").to("direct:id") .put("/users/{id}").to("mock:update") .delete("/users/{id}").to("mock:delete"); + + from("direct:users") + .transform() + .constant("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\", \"name\":\"Claus\" }]"); + from("direct:id") + .transform().simple("{ \"id\":\"${header.id}\", \"name\":\"Scott\" }"); } }; } diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java index 4bdde24..cda2bb9 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestGetTest.java @@ -36,8 +36,9 @@ public class RestGetTest extends BaseUndertowTest { public void configure() { restConfiguration().component("undertow").host("localhost").port(getPort()); rest("/users/") - .get("{id}/basic") - .route() + .get("{id}/basic").to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowComponentVerifierTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowComponentVerifierTest.java index 026ecc9..6b1cfe2 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowComponentVerifierTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowComponentVerifierTest.java @@ -122,7 +122,9 @@ public class RestUndertowComponentVerifierTest extends BaseUndertowTest { rest("/") .get("/verify") - .route() + .to("direct:verify"); + + from("direct:verify") .process(e -> e.getMessage().setBody("ok")); } }; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowContentTypeTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowContentTypeTest.java index 0b5aeca..85ea4b9 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowContentTypeTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowContentTypeTest.java @@ -80,16 +80,21 @@ public class RestUndertowContentTypeTest extends BaseUndertowTest { .clientRequestValidation(true); // use the rest DSL to define the rest services - rest("/users").post("/{id}/update").consumes("application/json").produces("application/json").route() + rest("/users").post("/{id}/update").consumes("application/json").produces("application/json").to("direct:update"); + + from("direct:update") .setBody(constant("{ \"status\": \"ok\" }")); - rest("/users").get().produces("application/json,application/csv").route() - .choice() + rest("/users").get().produces("application/json,application/csv").to("direct:users"); + + from("direct:users") + .choice() .when(simple("${header.Accept} == 'application/csv'")) - .setBody(constant("Email,FirstName,LastName\[email protected],Donald,Duck")) - .setHeader(Exchange.CONTENT_TYPE, constant("application/csv")) + .setBody(constant("Email,FirstName,LastName\[email protected],Donald,Duck")) + .setHeader(Exchange.CONTENT_TYPE, constant("application/csv")) .otherwise() - .setBody(constant("{\"email\": \"[email protected]\", \"firstname\": \"Donald\", \"lastname\": \"Duck\"}")); + .setBody(constant( + "{\"email\": \"[email protected]\", \"firstname\": \"Donald\", \"lastname\": \"Duck\"}")); } }; diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonWithContractTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonWithContractTest.java index e1cc06b..a3faaaa 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonWithContractTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeJsonWithContractTest.java @@ -64,7 +64,9 @@ public class RestUndertowHttpBindingModeJsonWithContractTest extends BaseUnderto rest("/users/") // REST binding converts from JSON to UserPojo .post("new").type(UserPojo.class) - .route() + .to("direct:new"); + + from("direct:new") // then contract advice converts from UserPojo to UserPojoEx .inputType(UserPojoEx.class) .to("mock:input"); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeOffWithContractTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeOffWithContractTest.java index f9d2866..739037f 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeOffWithContractTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpBindingModeOffWithContractTest.java @@ -77,8 +77,10 @@ public class RestUndertowHttpBindingModeOffWithContractTest extends BaseUndertow rest("/users/") // REST binding does nothing .post("new") - .route() - // contract advice converts betweeen JSON and UserPojoEx directly + .to("direct:new"); + + from("direct:new") + // contract advice converts between JSON and UserPojoEx directly .inputType(UserPojoEx.class) .outputType("json") .process(ex -> { diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathConfigurationTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathConfigurationTest.java index c01565d..fdff1a8 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathConfigurationTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathConfigurationTest.java @@ -43,16 +43,16 @@ public class RestUndertowHttpContextPathConfigurationTest extends BaseUndertowTe // use the rest DSL to define the rest services rest("/users/") - .get("{id}") - .route() + .get("{id}").to("direct:id") + .get("list").to("direct:list"); + + from("direct:id") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); - }) - .endRest() - .get("list") - .route() + }); + from("direct:list") .to("mock:input") .process(exchange -> exchange.getMessage().setBody("123;Donald Duck\n456;John Doe")); } diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathMatchGetTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathMatchGetTest.java index 216b8f7..638927e 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathMatchGetTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpContextPathMatchGetTest.java @@ -43,18 +43,19 @@ public class RestUndertowHttpContextPathMatchGetTest extends BaseUndertowTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}") - .route() + .get("{id}").to("direct:id") + .get("list").to("direct:list"); + + from("direct:id") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); - }) - .endRest() - .get("list") - .route() + }); + from("direct:list") .to("mock:input") .process(exchange -> exchange.getMessage().setBody("123;Donald Duck\n456;John Doe")); + } }; } diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java index e162306..9b3a36a 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetCorsTest.java @@ -98,15 +98,17 @@ public class RestUndertowHttpGetCorsTest extends BaseUndertowTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}/basic") - .route() + .get("{id}/basic").to("direct:get-basic") + .put("{id}/basic").to("direct:put-basic"); + + from("direct:get-basic") .to("mock:inputGet") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); - }).endRest() - .put("{id}/basic") - .route() + }); + + from("direct:put-basic") .to("mock:inputPut") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java index c1555b0..fe953e1 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetOrderingIssueTest.java @@ -54,23 +54,20 @@ public class RestUndertowHttpGetOrderingIssueTest extends BaseUndertowTest { // configure to use undertow on localhost with the given port restConfiguration().component("undertow").host("localhost").port(getPort()); - rest() - .get("/bar") - .route() + rest().get("/bar").to("direct:bar"); + from("direct:bar") .setBody().constant("Going to the bar") .to("mock:bar") .setHeader("Content-Type", constant("text/plain")); - rest() - .get("/{pippo}") - .route() + rest().get("/{pippo}").to("direct:pippo"); + from("direct:pippo") .setBody().simple("Route with name: ${header.pippo}") .to("mock:pippo") .setHeader("Content-Type", constant("text/plain")); - rest() - .get("/") - .route() + rest().get("/").to("direct:noname"); + from("direct:noname") .setBody().constant("Route without name") .to("mock:root") .setHeader("Content-Type", constant("text/plain")); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java index 0b0658b..90f398d 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetTest.java @@ -40,8 +40,9 @@ public class RestUndertowHttpGetTest extends BaseUndertowTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}/basic") - .route() + .get("{id}/basic").to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java index faaae22..2937e3d 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpGetWildcardsTest.java @@ -51,13 +51,18 @@ public class RestUndertowHttpGetWildcardsTest extends BaseUndertowTest { restConfiguration().component("undertow").host("localhost").port(getPort()); // use the rest DSL to define the rest services - rest("/users/").get("{id}/{query}").route().to("log:query").process(exchange -> { + rest("/users/") + .get("{id}/{query}").to("direct:query") + .get("{id}/basic").to("direct:basic"); + + from("direct:query").to("log:query").process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Goofy"); - }).endRest().get("{id}/basic").route().to("log:input").process(exchange -> { + }); + from("direct:basic").to("log:input").process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); exchange.getMessage().setBody(id + ";Donald Duck"); - }).endRest(); + }); } }; } diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoInOutTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoInOutTest.java index db5d5fa..a85ffe57 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoInOutTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoInOutTest.java @@ -57,7 +57,9 @@ public class RestUndertowHttpPojoInOutTest extends BaseUndertowTest { // just return the default country here .get("lives").to("direct:start") .post("lives").type(UserPojo.class).outType(CountryPojo.class) - .route() + .to("direct:lives"); + + from("direct:lives") .bean(new UserService(), "livesWhere"); CountryPojo country = new CountryPojo(); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java index 378beec..dee8d36 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowHttpPojoTypeTest.java @@ -264,8 +264,15 @@ public class RestUndertowHttpPojoTypeTest extends BaseUndertowTest { // use the rest DSL to define the rest services rest() - .get("/users").id("getUsers").outType(UserPojo[].class) - .route().process(exchange -> { + .get("/users").outType(UserPojo[].class).to("direct:users") + .get("/users/list").outType(UserPojo[].class).to("direct:list") + .get("/users/{id}").id("getUser").outType(UserPojo.class).to("direct:id") + .put("/users/{id}").id("putUser").type(UserPojo.class).to("mock:putUser") + .put("/users").id("putUsers").type(UserPojo[].class).to("mock:putUsers") + .put("/users/list").id("putUsersList").type(UserPojo[].class).to("mock:putUsersList"); + + from("direct:users") + .process(exchange -> { UserPojo user1 = new UserPojo(); user1.setId(1); user1.setName("Scott"); @@ -275,9 +282,10 @@ public class RestUndertowHttpPojoTypeTest extends BaseUndertowTest { user2.setName("Claus"); exchange.getOut().setBody(new UserPojo[] { user1, user2 }); - }).endRest() - .get("/users/list").id("getUsersList").outType(UserPojo[].class) - .route().process(exchange -> { + }); + + from("direct:list") + .process(exchange -> { UserPojo user1 = new UserPojo(); user1.setId(1); user1.setName("Scott"); @@ -287,20 +295,16 @@ public class RestUndertowHttpPojoTypeTest extends BaseUndertowTest { user2.setName("Claus"); exchange.getMessage().setBody(new UserPojo[] { user1, user2 }); - }).endRest() - .get("/users/{id}").id("getUser").outType(UserPojo.class) - .route().process(exchange -> { + }); + + from("direct:id") + .process(exchange -> { UserPojo user1 = new UserPojo(); user1.setId(exchange.getIn().getHeader("id", int.class)); user1.setName("Scott"); exchange.getMessage().setBody(user1); - }).endRest() - .put("/users/{id}").id("putUser").type(UserPojo.class) - .to("mock:putUser") - .put("/users").id("putUsers").type(UserPojo[].class) - .to("mock:putUsers") - .put("/users/list").id("putUsersList").type(UserPojo[].class) - .to("mock:putUsersList"); + }); + } }; } diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java index 0ebe5f5..dfc57fd 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowMethodNotAllowedTest.java @@ -60,8 +60,9 @@ public class RestUndertowMethodNotAllowedTest extends BaseUndertowTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}/basic") - .route() + .get("{id}/basic").to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerEncodingTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerEncodingTest.java index 0648ce8..bf2bd0a 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerEncodingTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerEncodingTest.java @@ -47,7 +47,9 @@ public class RestUndertowProducerEncodingTest extends BaseUndertowTest { // use the rest DSL to define the rest services rest("/bw-web-api/v1/objects") .get("{action}") - .route() + .to("direct:action"); + + from("direct:action") .process(exchange -> { String action = exchange.getIn().getHeader("action", String.class); assertEquals("timesheets", action); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetTest.java index bd09b80..89c265d 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetTest.java @@ -43,8 +43,9 @@ public class RestUndertowProducerGetTest extends BaseUndertowTest { // use the rest DSL to define the rest services rest("/users/") - .get("{id}/basic") - .route() + .get("{id}/basic").to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetUriParameterTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetUriParameterTest.java index f03c51d..8aa1e51 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetUriParameterTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerGetUriParameterTest.java @@ -44,7 +44,9 @@ public class RestUndertowProducerGetUriParameterTest extends BaseUndertowTest { // use the rest DSL to define the rest services rest("/users/") .get("basic/?id={id}") - .route() + .to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerThrowExceptionErrorTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerThrowExceptionErrorTest.java index 9045e35..7782b98 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerThrowExceptionErrorTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerThrowExceptionErrorTest.java @@ -56,7 +56,9 @@ public class RestUndertowProducerThrowExceptionErrorTest extends BaseUndertowTes // use the rest DSL to define the rest services rest("/users/") .get("{id}/basic") - .route() + .to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String id = exchange.getIn().getHeader("id", String.class); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerVerbUpperCaseTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerVerbUpperCaseTest.java index 4dc576c..915ca38 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerVerbUpperCaseTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowProducerVerbUpperCaseTest.java @@ -45,7 +45,9 @@ public class RestUndertowProducerVerbUpperCaseTest extends BaseUndertowTest { // use the rest DSL to define the rest services rest("/users/") .get("{id}/basic") - .route() + .to("direct:basic"); + + from("direct:basic") .to("mock:input") .process(exchange -> { String method = exchange.getIn().getHeader(Exchange.HTTP_METHOD, String.class); diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbEnableCorsTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbEnableCorsTest.java index b0154b2..8f24bbb 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbEnableCorsTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbEnableCorsTest.java @@ -85,13 +85,15 @@ public class RestUndertowVerbEnableCorsTest extends BaseUndertowTest { restConfiguration().component("undertow").host("localhost").port(getPort()).enableCORS(true); rest() - .get("/users").route().transform() - .constant("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\", \"name\":\"Claus\" }]").endRest() - .get("/users/{id}").route().transform().simple("{ \"id\":\"${header.id}\", \"name\":\"Scott\" }") - .endRest() + .get("/users").to("direct:users") + .get("/users/{id}").to("direct:id") .post("/users").to("mock:create") .put("/users/{id}").to("mock:update") .delete("/users/{id}").to("mock:delete"); + + from("direct:users").transform() + .constant("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\", \"name\":\"Claus\" }]"); + from("direct:id").transform().simple("{ \"id\":\"${header.id}\", \"name\":\"Scott\" }"); } }; } diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbTest.java index 2b0ba8d..6a92d62 100644 --- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbTest.java +++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/rest/RestUndertowVerbTest.java @@ -85,13 +85,16 @@ public class RestUndertowVerbTest extends BaseUndertowTest { restConfiguration().component("undertow").host("localhost").port(getPort()); rest() - .get("/users").route().transform() - .constant("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\", \"name\":\"Claus\" }]").endRest() - .get("/users/{id}").route().transform().simple("{ \"id\":\"${header.id}\", \"name\":\"Scott\" }") - .endRest() + .get("/users").to("direct:users") + .get("/users/{id}").to("direct:id") .post("/users").to("mock:create") .put("/users/{id}").to("mock:update") .delete("/users/{id}").to("mock:delete"); + + from("direct:users") + .transform().constant("[{ \"id\":\"1\", \"name\":\"Scott\" },{ \"id\":\"2\", \"name\":\"Claus\" }]"); + from("direct:id") + .transform().simple("{ \"id\":\"${header.id}\", \"name\":\"Scott\" }"); } }; }
