You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2024/03/14 14:02:43 UTC
(camel-quarkus) 15/26: fixed servlet and http - inlining requires unique routes, partialy fixed openapi-java
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3896c8a9063625c77983377d3d34ea7cc2ad067e
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Tue Mar 12 11:02:15 2024 +0100
fixed servlet and http - inlining requires unique routes, partialy fixed openapi-java
---
integration-test-groups/http/netty-http/pom.xml | 4 ++++
.../component/http/netty/NettyHttpRoutes.java | 14 +++++++-------
integration-tests/servlet/pom.xml | 2 +-
.../camel/quarkus/component/servlet/CamelRoute.java | 20 ++++++++++----------
4 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/integration-test-groups/http/netty-http/pom.xml b/integration-test-groups/http/netty-http/pom.xml
index 16b66bab47..b12e3add66 100644
--- a/integration-test-groups/http/netty-http/pom.xml
+++ b/integration-test-groups/http/netty-http/pom.xml
@@ -42,6 +42,10 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-direct</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-seda</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-rest</artifactId>
diff --git a/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpRoutes.java b/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpRoutes.java
index 699275779d..fb670aee36 100644
--- a/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpRoutes.java
+++ b/integration-test-groups/http/netty-http/src/main/java/org/apache/camel/quarkus/component/http/netty/NettyHttpRoutes.java
@@ -150,16 +150,16 @@ public class NettyHttpRoutes extends RouteBuilder {
from("netty-http:http://localhost:{{camel.netty-http.port}}/proxy").setBody().constant("proxy");
rest("/rest")
- .get("/").to("direct:printMethod")
- .post("/").to("direct:printMethod")
- .put("/").to("direct:printMethod")
+ .get("/").to("seda:printMethod")
+ .post("/").to("seda:printMethod")
+ .put("/").to("seda:printMethod")
.post("/json").bindingMode(RestBindingMode.json).consumes("application/json").type(UserPojo.class)
- .to("direct:printBody")
+ .to("seda:printBody")
.post("/xml").bindingMode(RestBindingMode.xml).consumes("application/xml").type(UserPojo.class)
- .to("direct:printBody");
+ .to("seda:printBody");
- from("direct:printMethod").setBody().header(RestConstants.HTTP_METHOD);
- from("direct:printBody").process(e -> {
+ from("seda:printMethod").setBody().header(RestConstants.HTTP_METHOD);
+ from("seda:printBody").process(e -> {
e.getIn().setHeader(Exchange.CONTENT_TYPE, "text/plain");
e.getIn().setBody(e.getIn().getBody(UserPojo.class).toString());
});
diff --git a/integration-tests/servlet/pom.xml b/integration-tests/servlet/pom.xml
index bcee3b9655..97596d3a81 100644
--- a/integration-tests/servlet/pom.xml
+++ b/integration-tests/servlet/pom.xml
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-direct</artifactId>
+ <artifactId>camel-quarkus-seda</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
index 2ca381f295..a7ca750adc 100644
--- a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
+++ b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/CamelRoute.java
@@ -41,31 +41,31 @@ public class CamelRoute extends RouteBuilder {
rest()
.get("/rest-get")
- .to("direct:echoMethodPath")
+ .to("seda:echoMethodPath")
.post("/rest-post")
- .to("direct:echoMethodPath")
+ .to("seda:echoMethodPath")
.put("/rest-put")
- .to("direct:echoMethodPath")
+ .to("seda:echoMethodPath")
.patch("/rest-patch")
- .to("direct:echoMethodPath")
+ .to("seda:echoMethodPath")
.delete("/rest-delete")
- .to("direct:echoMethodPath")
+ .to("seda:echoMethodPath")
.head("/rest-head")
- .to("direct:echoMethodPath");
+ .to("seda:echoMethodPath");
from("servlet://hello?matchOnUriPrefix=true")
- .to("direct:echoMethodPath");
+ .to("seda:echoMethodPath");
from("servlet://options?servletName=options-method-servlet&optionsEnabled=true")
- .to("direct:echoMethodPath");
+ .to("seda:echoMethodPath");
from("servlet://trace?servletName=trace-method-servlet&traceEnabled=true")
- .to("direct:echoMethodPath");
+ .to("seda:echoMethodPath");
from("servlet://transfer/exception?transferException=true&muteException=false")
.throwException(new CustomException());
@@ -82,7 +82,7 @@ public class CamelRoute extends RouteBuilder {
from("servlet://named?servletName=my-named-servlet")
.setBody(constant("GET: /my-named-servlet"));
- from("direct:echoMethodPath")
+ from("seda:echoMethodPath")
.setBody().simple("${header.CamelHttpMethod}: ${header.CamelServletContextPath}");
from("servlet://multipart/default?attachmentMultipartBinding=true")