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 66e8fa44f806f58d1ecf0601ffebdcd55961f728 Author: Claus Ibsen <[email protected]> AuthorDate: Tue Feb 22 10:03:10 2022 +0100 CAMEL-17675: camel-core - Rest DSL remove support for using inlined routes. --- .../apache/camel/component/rest/FromRestAdviceWithTest.java | 10 +++++++++- .../apache/camel/component/rest/FromRestGetInterceptTest.java | 2 +- .../org/apache/camel/component/rest/FromRestGetPolicyTest.java | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestAdviceWithTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestAdviceWithTest.java index ef040cc..e86e872 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestAdviceWithTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestAdviceWithTest.java @@ -21,6 +21,7 @@ import org.apache.camel.builder.AdviceWith; import org.apache.camel.builder.AdviceWithRouteBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.RouteDefinition; +import org.apache.camel.spi.Registry; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -28,6 +29,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class FromRestAdviceWithTest extends ContextTestSupport { @Override + protected Registry createRegistry() throws Exception { + Registry jndi = super.createRegistry(); + jndi.bind("dummy-rest", new DummyRestConsumerFactory()); + return jndi; + } + + @Override public boolean isUseRouteBuilder() { return false; } @@ -37,7 +45,7 @@ public class FromRestAdviceWithTest extends ContextTestSupport { context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - rest("/say/hello").get("direct:hello"); + rest("/say/hello").get().to("direct:hello"); from("direct:hello").routeId("myRoute") .transform().constant("Bye World") diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetInterceptTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetInterceptTest.java index c97a05b..ba3eef1 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetInterceptTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetInterceptTest.java @@ -36,7 +36,7 @@ public class FromRestGetInterceptTest extends ContextTestSupport { public void testFromRestModel() throws Exception { getMockEndpoint("mock:hello").expectedMessageCount(1); getMockEndpoint("mock:bar").expectedMessageCount(1); - getMockEndpoint("mock:intercept").expectedMessageCount(3); + getMockEndpoint("mock:intercept").expectedMessageCount(4); String out = template.requestBody("seda:get-say-hello", "I was here", String.class); assertEquals("Bye World", out); diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetPolicyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetPolicyTest.java index 07729e9..ba7f43e 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetPolicyTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetPolicyTest.java @@ -38,7 +38,7 @@ public class FromRestGetPolicyTest extends ContextTestSupport { @Test public void testFromRestModel() throws Exception { - assertEquals(1, context.getRoutes().size()); + assertEquals(2, context.getRoutes().size()); assertEquals(1, context.getRestDefinitions().size());
