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 4b93044006d69f5ed88cce635f4afd09ae251e72
Author: JiriOndrusek <ondrusek.j...@gmail.com>
AuthorDate: Fri Mar 8 13:24:50 2024 +0100
Fixed groovy-dsl, kotlin-dsl, java-joor-dsl because of CAMEL-20466
---
.../groovy-dsl/src/main/resources/routes/routes-with-rest.groovy | 2 --
.../test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java | 2 +-
.../java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java | 1 -
.../java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java | 2 +-
.../kotlin-dsl/src/main/resources/routes/routes-with-rest.kts | 2 --
.../test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslTest.java | 2 +-
6 files changed, 3 insertions(+), 8 deletions(-)
diff --git
a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
index ab12f3f457..b09e06b0bd 100644
---
a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
+++
b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy
@@ -21,14 +21,12 @@ rest {
path("/my/path") {
get("/get") {
- id("routes-with-rest-get")
produces("text/plain")
to("direct:get")
}
}
post {
- id("routes-with-rest-post")
path("/post")
consumes("text/plain")
produces("text/plain")
diff --git
a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
index 6f41d92bba..5d366194af 100644
---
a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
+++
b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java
@@ -54,7 +54,7 @@ class GroovyDslTest {
.then()
.statusCode(200)
.body(CoreMatchers.is(
-
"my-groovy-route,routes-with-components-configuration,routes-with-dataformats-configuration,routes-with-eip-body,routes-with-eip-exchange,routes-with-eip-message,routes-with-eip-process,routes-with-eip-setBody,routes-with-endpoint-dsl,routes-with-error-handler,routes-with-languages-configuration,routes-with-rest,routes-with-rest-dsl-get,routes-with-rest-dsl-post,routes-with-rest-get,routes-with-rest-post"));
+
"my-groovy-route,routes-with-components-configuration,routes-with-dataformats-configuration,routes-with-eip-body,routes-with-eip-exchange,routes-with-eip-message,routes-with-eip-process,routes-with-eip-setBody,routes-with-endpoint-dsl,routes-with-error-handler,routes-with-languages-configuration,routes-with-rest,routes-with-rest-dsl-get,routes-with-rest-dsl-post"));
RestAssured.given()
.get("/groovy-dsl/main/successful/routes")
.then()
diff --git
a/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
b/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
index c5997b823b..28120a1b29 100644
---
a/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
+++
b/integration-tests/java-joor-dsl/src/main/resources/routes/MyRoutesWithModel.java
@@ -23,7 +23,6 @@ public class MyRoutesWithModel extends RouteBuilder {
public void configure() throws Exception {
rest("/say")
.get("/emp/{id}")
- .id("routes-with-rest-get")
.produces("application/json")
.outType(MyUser.class)
.to("direct:routes-with-rest");
diff --git
a/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
b/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
index 526fdb133c..09d46656d8 100644
---
a/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
+++
b/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
@@ -79,7 +79,7 @@ class JavaJoorDslTest {
.then()
.statusCode(200)
.body(CoreMatchers.is(
-
"inner-classes-route,my-java-route,reflection-route,routes-with-bean,routes-with-inner-bean,routes-with-nested-class,routes-with-rest,routes-with-rest-get,routes-with-template"));
+
"inner-classes-route,my-java-route,reflection-route,routes-with-bean,routes-with-inner-bean,routes-with-nested-class,routes-with-rest,routes-with-template"));
RestAssured.given()
.get("/java-joor-dsl/main/successful/routes")
diff --git
a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-rest.kts
b/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-rest.kts
index 8862655a56..256000d521 100644
---
a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-rest.kts
+++
b/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-rest.kts
@@ -21,14 +21,12 @@ rest {
path("/my/path") {
get("/get") {
- id("routes-with-rest-get")
produces("text/plain")
to("direct:get")
}
}
post {
- id("routes-with-rest-post")
path("/post")
consumes("text/plain")
produces("text/plain")
diff --git
a/integration-tests/kotlin-dsl/src/test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslTest.java
b/integration-tests/kotlin-dsl/src/test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslTest.java
index d9e85dd71b..d0e11ec51e 100644
---
a/integration-tests/kotlin-dsl/src/test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslTest.java
+++
b/integration-tests/kotlin-dsl/src/test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslTest.java
@@ -54,7 +54,7 @@ class KotlinDslTest {
.then()
.statusCode(200)
.body(CoreMatchers.is(
-
"my-kotlin-route,routes,routes-with-components-configuration,routes-with-dataformats-configuration,routes-with-endpoint-dsl,routes-with-error-handler,routes-with-languages-configuration,routes-with-rest,routes-with-rest-dsl-get,routes-with-rest-dsl-post,routes-with-rest-get,routes-with-rest-post"));
+
"my-kotlin-route,routes,routes-with-components-configuration,routes-with-dataformats-configuration,routes-with-endpoint-dsl,routes-with-error-handler,routes-with-languages-configuration,routes-with-rest,routes-with-rest-dsl-get,routes-with-rest-dsl-post"));
RestAssured.given()
.get("/kotlin-dsl/main/successful/routes")
