(camel-quarkus) branch main updated: Fix incorrect endpoint paths in REST producer test

[jamesnetherton]

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/main by this push:
     new f1e885a7dc Fix incorrect endpoint paths in REST producer test
f1e885a7dc is described below

commit f1e885a7dc2fd8ef6525860aa14d2b0c8f47367b
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Mon Jul 29 08:19:06 2024 +0100

    Fix incorrect endpoint paths in REST producer test
---
 .../camel/quarkus/component/openapijava/it/OpenApiResource.java  | 9 ++++-----
 .../camel/quarkus/component/openapijava/it/OpenApiRoutes.java    | 2 +-
 .../camel/quarkus/component/openapijava/it/v3/OpenApiV3Test.java | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git 
a/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiResource.java
 
b/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiResource.java
index 77baf83045..c3e48a5261 100644
--- 
a/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiResource.java
+++ 
b/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiResource.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.quarkus.component.openapijava.it;
 
-import java.util.List;
-
 import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
@@ -26,7 +24,7 @@ import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.MediaType;
 import org.apache.camel.ProducerTemplate;
 
-@Path("/api")
+@Path("/invoke")
 public class OpenApiResource {
 
     @Inject
@@ -36,9 +34,10 @@ public class OpenApiResource {
     @Path("/fruits/list")
     @Produces(MediaType.APPLICATION_JSON)
     @SuppressWarnings("unchecked")
-    public List<String> invokeFruitsListApiFromOpenApiDoc(@QueryParam("port") 
int port) {
+    public String invokeFruitsListApiFromOpenApiDoc(@QueryParam("port") int 
port) {
         String apiHost = "localhost:" + port;
         String apiDocUrl = "http://"; + apiHost + "/openapi";
-        return producerTemplate.requestBody("rest:get:fruits/list?host=" + 
apiHost + "&apiDoc=" + apiDocUrl, null, List.class);
+        return producerTemplate.requestBody("rest:get:/api/fruits/list?host=" 
+ apiHost + "&apiDoc=" + apiDocUrl, null,
+                String.class);
     }
 }
diff --git 
a/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
 
b/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
index f6b587cf18..4639b753a8 100644
--- 
a/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
+++ 
b/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java
@@ -49,7 +49,7 @@ public class OpenApiRoutes extends RouteBuilder {
                 .apiProperty("cors", "true")
                 .apiProperty("schemes", "http,https")
                 .apiProperty("api.path", "/api-docs")
-                .apiProperty("base.path", "/api")
+                .apiProperty("base.path", "/")
                 .apiProperty("api.termsOfService", "https://camel.apache.org";)
                 .apiProperty("api.contact.name", "Mr Camel Quarkus")
                 .apiProperty("api.contact.email", "m...@cq.org")
diff --git 
a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v3/OpenApiV3Test.java
 
b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v3/OpenApiV3Test.java
index e0c0d19be4..c1cbbf51bd 100644
--- 
a/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v3/OpenApiV3Test.java
+++ 
b/integration-tests/openapi-java/src/test/java/org/apache/camel/quarkus/component/openapijava/it/v3/OpenApiV3Test.java
@@ -44,7 +44,7 @@ public class OpenApiV3Test {
     public void invokeApiEndpoint() {
         RestAssured.given()
                 .queryParam("port", RestAssured.port)
-                .get("/api/fruits/list")
+                .get("/invoke/fruits/list")
                 .then()
                 .contentType(ContentType.JSON)
                 .statusCode(200)
@@ -267,7 +267,7 @@ public class OpenApiV3Test {
                 .then()
                 .contentType(ContentType.JSON)
                 .statusCode(200)
-                .body("servers[0].url", is("http://localhost:8080/api";));
+                .body("servers[0].url", is("http://localhost:8080/";));
     }
 
     @ParameterizedTest