jsonpath: fix different number of ObjectMapper modules between JVM an…

…d native mode #3582
apache · Mar 1, 2022 · ff25795 · ff25795
1 parent cdaf519
commit ff25795
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 21 deletions.
diff --git a/.../main/java/org/apache/camel/quarkus/component/json/path/deployment/JsonPathProcessor.java b/.../main/java/org/apache/camel/quarkus/component/json/path/deployment/JsonPathProcessor.java
@@ -41,6 +41,9 @@ List<ReflectiveClassBuildItem> registerReflectiveClassBuildItems() {
         reflectiveClassBuildItems.add(new ReflectiveClassBuildItem(false, false, JsonPathAnnotationExpressionFactory.class));
         reflectiveClassBuildItems.add(new ReflectiveClassBuildItem(true, false, JsonPath.class));
         reflectiveClassBuildItems.add(new ReflectiveClassBuildItem(false, false, JacksonJsonAdapter.class));
+        reflectiveClassBuildItems
+                .add(new ReflectiveClassBuildItem(false, false, "com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule"));
+
         return reflectiveClassBuildItems;
     }
 

diff --git a/integration-tests/jsonpath/pom.xml b/integration-tests/jsonpath/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jackson</artifactId>
+            <artifactId>quarkus-resteasy</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>

diff --git a/...npath/src/main/java/org/apache/camel/quarkus/component/json/path/it/JsonPathResource.java b/...npath/src/main/java/org/apache/camel/quarkus/component/json/path/it/JsonPathResource.java
@@ -36,6 +36,7 @@
 import org.apache.camel.Message;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.commons.lang3.StringUtils;
 import org.jboss.logging.Logger;
 
 import static org.apache.camel.jsonpath.JsonPathConstants.HEADER_JSON_ENCODING;
@@ -133,19 +134,21 @@ public void setHeaderWithJsonPathExpressionEvaluatingAnotherHeaderShouldSucceed(
 
     @Path("/getAuthorsFromJsonStream")
     @GET
-    @Produces(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.TEXT_PLAIN)
     @Consumes(MediaType.APPLICATION_OCTET_STREAM)
-    public List<?> getAuthorsFromJsonStream(byte[] jsonBytes, @QueryParam("encoding") String encoding) throws IOException {
+    public String getAuthorsFromJsonStream(byte[] jsonBytes, @QueryParam("encoding") String encoding) throws IOException {
         LOG.debugf("Getting authors from JsonStream with encoding '%s' and %d bytes", encoding, jsonBytes.length);
 
+        List<?> bookTitles;
         try (ByteArrayInputStream jsonStream = new ByteArrayInputStream(jsonBytes)) {
             if (encoding == null) {
-                return producerTemplate.requestBody("direct:getAuthorsFromJsonStream", jsonStream, List.class);
+                bookTitles = producerTemplate.requestBody("direct:getAuthorsFromJsonStream", jsonStream, List.class);
             } else {
-                return producerTemplate.requestBodyAndHeader("direct:getAuthorsFromJsonStream", jsonStream,
+                bookTitles = producerTemplate.requestBodyAndHeader("direct:getAuthorsFromJsonStream", jsonStream,
                         HEADER_JSON_ENCODING, encoding, List.class);
             }
         }
+        return StringUtils.join(bookTitles, "-");
     }
 
     @Path("/splitInputJsonThenWriteAsStringShouldSucceed")

diff --git a/...h/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathCharsetsTest.java b/...h/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathCharsetsTest.java
@@ -23,39 +23,39 @@
 import org.junit.jupiter.api.Test;
 
 import static io.restassured.RestAssured.given;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.Matchers.is;
 
 @QuarkusTest
 class JsonPathCharsetsTest {
 
     @Test
     public void transformBooksUTF16BEShouldReturnTwoAuthors() throws IOException {
         byte[] body = IOUtils.resourceToByteArray("/booksUTF16BE.json");
-        String[] authors = given().body(body).get("/jsonpath/getAuthorsFromJsonStream").then().statusCode(200).extract()
-                .as(String[].class);
-        assertEquals(2, authors.length);
-        assertEquals("Sayings of the Century", authors[0]);
-        assertEquals("Sword of Honour", authors[1]);
+        given().body(body)
+                .get("/jsonpath/getAuthorsFromJsonStream")
+                .then()
+                .statusCode(200)
+                .body(is("Sayings of the Century-Sword of Honour"));
     }
 
     @Test
     public void transformBooksUTF16LEShouldReturnTwoAuthors() throws IOException {
         byte[] body = IOUtils.resourceToByteArray("/booksUTF16LE.json");
-        String[] authors = given().body(body).get("/jsonpath/getAuthorsFromJsonStream").then().statusCode(200).extract()
-                .as(String[].class);
-        assertEquals(2, authors.length);
-        assertEquals("Sayings of the Century", authors[0]);
-        assertEquals("Sword of Honour", authors[1]);
+        given().body(body)
+                .get("/jsonpath/getAuthorsFromJsonStream")
+                .then().statusCode(200)
+                .body(is("Sayings of the Century-Sword of Honour"));
     }
 
     @Test
     public void transformBooksIso_8859_1_ShouldReturnTwoAuthors() throws IOException {
         byte[] body = IOUtils.resourceToByteArray("/germanbooks-iso-8859-1.json");
-        String[] authors = given().queryParam("encoding", "ISO-8859-1").body(body).get("/jsonpath/getAuthorsFromJsonStream")
-                .then().statusCode(200).extract().as(String[].class);
-        assertEquals(2, authors.length);
-        assertEquals("Joseph und seine Brüder", authors[0]);
-        assertEquals("Götzendämmerung", authors[1]);
+        given().queryParam("encoding", "ISO-8859-1")
+                .body(body)
+                .get("/jsonpath/getAuthorsFromJsonStream")
+                .then()
+                .statusCode(200)
+                .body(is("Joseph und seine Brüder-Götzendämmerung"));
     }
 
 }