This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 1fd6c2e CAMEL-17675: camel-core - Rest DSL remove support for using
inlined routes.
1fd6c2e is described below
commit 1fd6c2e2d4c17489ddaa2815551a24fecff56427
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Feb 22 17:37:26 2022 +0100
CAMEL-17675: camel-core - Rest DSL remove support for using inlined routes.
---
.../springboot/geocoder/CamelGeocoderRoute.java | 3 ++
.../example/reactive/streams/RestExample.java | 5 +--
.../example/spring/boot/rest/jpa/Application.java | 40 ++++++++++++----------
3 files changed, 27 insertions(+), 21 deletions(-)
diff --git
a/geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java
b/geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java
index 1dd354b..d9d5992 100644
---
a/geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java
+++
b/geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java
@@ -40,6 +40,9 @@ public class CamelGeocoderRoute extends RouteBuilder {
.param().name("address").type(query).description("The address
to lookup").dataType("string").endParam()
.responseMessage().code(200).message("Geocoder
successful").endResponseMessage()
// call the geocoder to lookup details from the provided
address
+ .to("direct:geo");
+
+ from("direct:geo")
.toD("geocoder:address:${header.address})");
}
diff --git
a/reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/RestExample.java
b/reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/RestExample.java
index 76e984a..4f6dc0c 100644
---
a/reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/RestExample.java
+++
b/reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/RestExample.java
@@ -67,13 +67,14 @@ public class RestExample {
// The full path should be eg.:
http://localhost:8080/camel/sum/23/31
rest().get("/sum/{num1}/{num2}")
.produces("text/plain")
- .route()
+ .to("direct:sum");
+
+ from("direct:sum")
.setHeader("num1").simple("headerAs(num1,Long)")
.setHeader("num2").simple("headerAs(num2,Long)")
.bean("calculator", "sum")
.process(new UnwrapStreamProcessor())
.setBody().simple("The result is: ${body}");
-
}
}
diff --git
a/rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
b/rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
index 8ed8fc7..3adb580 100644
---
a/rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
+++
b/rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
@@ -34,29 +34,31 @@ public class Application extends
SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
}
-
+
@Component
class RestApi extends RouteBuilder {
@Override
public void configure() {
restConfiguration()
- .component("servlet")
- .contextPath("/camel-rest-jpa").apiContextPath("/api-doc")
+ .component("servlet")
+ .contextPath("/camel-rest-jpa").apiContextPath("/api-doc")
.apiProperty("api.title", "Camel REST API")
.apiProperty("api.version", "1.0")
.apiProperty("cors", "true")
.apiContextRouteId("doc-api")
.port(env.getProperty("server.port", "8080"))
- .bindingMode(RestBindingMode.json);
+ .bindingMode(RestBindingMode.json);
rest("/books").description("Books REST service")
- .get("/").description("The list of all the books")
- .route().routeId("books-api")
- .bean(Database.class, "findBooks")
- .endRest()
- .get("order/{id}").description("Details of an order by id")
- .route().routeId("order-api")
+ .get("/").description("The list of all the
books").to("direct:books")
+ .get("order/{id}").description("Details of an order by
id").to("direct:order");
+
+
+ from("direct:books").routeId("books-api")
+ .bean(Database.class, "findBooks");
+
+ from("direct:order").routeId("order-api")
.bean(Database.class, "findOrder(${header.id})");
}
}
@@ -68,18 +70,18 @@ public class Application extends
SpringBootServletInitializer {
public void configure() {
// A first route generates some orders and queue them in DB
from("timer:new-order?delay=1000&period={{example.generateOrderPeriod:2000}}")
- .routeId("generate-order")
- .bean("orderService", "generateOrder")
- .to("jpa:org.apache.camel.example.spring.boot.rest.jpa.Order")
- .log("Inserted new order ${body.id}");
+ .routeId("generate-order")
+ .bean("orderService", "generateOrder")
+
.to("jpa:org.apache.camel.example.spring.boot.rest.jpa.Order")
+ .log("Inserted new order ${body.id}");
// A second route polls the DB for new orders and processes them
from("jpa:org.apache.camel.example.spring.boot.rest.jpa.Order"
- + "?namedQuery=new-orders"
- + "&delay={{example.processOrderPeriod:5000}}"
- + "&consumeDelete=false")
- .routeId("process-order")
- .log("Processed order #id ${body.id} with ${body.amount}
copies of the «${body.book.description}» book");
+ + "?namedQuery=new-orders"
+ + "&delay={{example.processOrderPeriod:5000}}"
+ + "&consumeDelete=false")
+ .routeId("process-order")
+ .log("Processed order #id ${body.id} with ${body.amount}
copies of the «${body.book.description}» book");
}
}
}
\ No newline at end of file
