This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch camel-2.24.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.24.x by this push:
new 0f7408b [CAMEL-13424]Rest Component custom routeId is not accessible
in processor(added testcase from jira ensure it works now)
0f7408b is described below
commit 0f7408b8944e6481c21c2212536f6a9f4b7dea83
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Wed Jul 10 13:40:15 2019 -0400
[CAMEL-13424]Rest Component custom routeId is not accessible in
processor(added testcase from jira ensure it works now)
(cherry picked from commit 79c2ad868603255f79ebe7f9e660e498e64e0e2d)
(cherry picked from commit 3616ab9ea34c6ca1532b657179ca7ada6132907c)
---
.../component/restlet/RestRestletRouterIdTest.java | 133 +++++++++++++++++++++
1 file changed, 133 insertions(+)
diff --git
a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java
new file mode 100644
index 0000000..ad2d2af
--- /dev/null
+++
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestRestletRouterIdTest.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.restlet;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.http4.HttpMethods;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.model.rest.RestBindingMode;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class RestRestletRouterIdTest extends CamelTestSupport {
+
+ private static final Processor SET_ROUTE_ID_AS_BODY =
+ exchange -> exchange.getIn().setBody(exchange.getFromRouteId());
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry r = super.createRegistry();
+ r.bind("setId", SET_ROUTE_ID_AS_BODY);
+ return r;
+ }
+
+ @Override
+ protected RoutesBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+
+ restConfiguration().component("restlet").host("localhost")
+ .port(8088).bindingMode(RestBindingMode.auto);
+
+ rest("/app").get("/test1").id("test1").to("direct:setId")
+ .get("/test2").route().routeId("test2").to("direct:setId");
+
rest("/app").get("/test4").route().routeId("test4").to("direct:setId2");
+
+
+ from("direct:setId")
+ .process(SET_ROUTE_ID_AS_BODY);
+
+ from("direct:setId2")
+ .process("setId");
+
+ rest("/app").get("/test3")
+ .route()
+ .id("test3")
+ .process(SET_ROUTE_ID_AS_BODY);
+
+
rest("/app").get("/REST-TEST").route().routeId("TEST").id("REST-TEST").to("direct:setId");
+
+ rest("/app").get("/test5").route()
+ .id("test5")
+ .to("direct:setId")
+ .endRest()
+ .to("direct:setId2");
+ }
+
+ ;
+ };
+ }
+
+ @Test
+ public void test() throws Exception {
+
+ Assert.assertEquals("\"test1\"", template.requestBodyAndHeader(
+ "http4://localhost:8088/app/test1",
+ "",
+ Exchange.HTTP_METHOD,
+ HttpMethods.GET,
+ String.class
+ ));
+
+ Assert.assertEquals("\"test2\"", template.requestBodyAndHeader(
+ "http4://localhost:8088/app/test2",
+ "",
+ Exchange.HTTP_METHOD,
+ HttpMethods.GET,
+ String.class
+ ));
+
+ Assert.assertEquals("\"test3\"", template.requestBodyAndHeader(
+ "http4://localhost:8088/app/test3",
+ "",
+ Exchange.HTTP_METHOD,
+ HttpMethods.GET,
+ String.class
+ ));
+
+ Assert.assertEquals("\"test4\"", template.requestBodyAndHeader(
+ "http4://localhost:8088/app/test4",
+ "",
+ Exchange.HTTP_METHOD,
+ HttpMethods.GET,
+ String.class
+ ));
+
+
+ Assert.assertEquals("\"test5\"", template.requestBodyAndHeader(
+ "http4://localhost:8088/app/test5",
+ "",
+ Exchange.HTTP_METHOD,
+ HttpMethods.GET,
+ String.class
+ ));
+
+ Assert.assertEquals("\"REST-TEST\"", template.requestBodyAndHeader(
+ "http4://localhost:8088/app/REST-TEST",
+ "",
+ Exchange.HTTP_METHOD,
+ HttpMethods.GET,
+ String.class
+ ));
+ }
+}
