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 84e7733decc59761deabb647a5fac2a18f686f70 Author: jiriOndrusek-agent <[email protected]> AuthorDate: Tue Nov 10 13:42:32 2026 +0000 Use Jackson 3 in cbor, cyberark-vault, salesforce, servicenow and telemetry-dev tests after CAMEL-22857 Co-Authored-By: Claude Opus 5.5 <[email protected]> --- .../org/apache/camel/quarkus/component/cbor/it/CborTest.java | 10 ++++------ .../component/cyberark/vault/it/CyberarkVaultTestResource.java | 8 ++++---- .../camel/quarkus/component/salesforce/generated/Account.java | 4 ++-- .../quarkus/component/servicenow/it/ServicenowResource.java | 6 +++--- .../quarkus/component/telemetry/dev/it/TelemetryDevTest.java | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/integration-tests/cbor/src/test/java/org/apache/camel/quarkus/component/cbor/it/CborTest.java b/integration-tests/cbor/src/test/java/org/apache/camel/quarkus/component/cbor/it/CborTest.java index 39e500bacdc..33c093d178d 100644 --- a/integration-tests/cbor/src/test/java/org/apache/camel/quarkus/component/cbor/it/CborTest.java +++ b/integration-tests/cbor/src/test/java/org/apache/camel/quarkus/component/cbor/it/CborTest.java @@ -20,14 +20,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.Map; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.cbor.CBORFactory; import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; import org.apache.camel.quarkus.component.cbor.it.model.Author; import org.apache.camel.quarkus.component.cbor.it.model.DummyObject; import org.junit.jupiter.api.Test; +import tools.jackson.dataformat.cbor.CBORMapper; import static io.restassured.RestAssured.given; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -36,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @QuarkusTest class CborTest { - private static final ObjectMapper CBOR_MAPPER = new ObjectMapper(new CBORFactory()); + private static final CBORMapper CBOR_MAPPER = new CBORMapper(); @Test void marshalUnmarshalMapShouldSucceed() { @@ -72,7 +70,7 @@ class CborTest { } @Test - void unmarshalAuthorViaJmsTypeHeaderShouldSucceed() throws JsonProcessingException { + void unmarshalAuthorViaJmsTypeHeaderShouldSucceed() { Author author = new Author(); author.setName("David"); author.setSurname("Foster Wallace"); @@ -87,7 +85,7 @@ class CborTest { } @Test - void unmarshalDummyObjectListShouldSucceed() throws JsonProcessingException { + void unmarshalDummyObjectListShouldSucceed() { DummyObject first = new DummyObject(); first.setDummy("value1"); DummyObject second = new DummyObject(); diff --git a/integration-tests/cyberark-vault/src/test/java/org/apache/camel/quarkus/component/cyberark/vault/it/CyberarkVaultTestResource.java b/integration-tests/cyberark-vault/src/test/java/org/apache/camel/quarkus/component/cyberark/vault/it/CyberarkVaultTestResource.java index eae9302f7c5..01fe8bdb46c 100644 --- a/integration-tests/cyberark-vault/src/test/java/org/apache/camel/quarkus/component/cyberark/vault/it/CyberarkVaultTestResource.java +++ b/integration-tests/cyberark-vault/src/test/java/org/apache/camel/quarkus/component/cyberark/vault/it/CyberarkVaultTestResource.java @@ -34,8 +34,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; import org.apache.camel.quarkus.test.mock.backend.MockBackendUtils; import org.eclipse.microprofile.config.ConfigProvider; @@ -50,6 +48,8 @@ import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.postgresql.PostgreSQLContainer; import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; /** * Test resource is using opensource conjur. See the instructions from @@ -285,11 +285,11 @@ public class CyberarkVaultTestResource implements QuarkusTestResourceLifecycleMa result.put("conjur.reader.username", "host/BotApp/myDemoApp"); String readApiKey = jsonNode.get("created_roles").get(CONJUR_ACCOUNT + ":host:BotApp/myDemoApp").get("api_key") - .textValue(); + .stringValue(); result.put("conjur.reader.apiKey", readApiKey); result.put("conjur.writer.username", "user/Dave@BotApp"); String writeApiKey = jsonNode.get("created_roles").get(CONJUR_ACCOUNT + ":user:Dave@BotApp").get("api_key") - .textValue(); + .stringValue(); result.put("conjur.writer.apiKey", writeApiKey); result.put("conjur.writer.password", writeApiKey); diff --git a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java index 2a2770e3bbc..17a743ed47e 100644 --- a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java +++ b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java @@ -20,8 +20,6 @@ import java.util.ArrayList; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import jakarta.annotation.Generated; import org.apache.camel.component.salesforce.api.MultiSelectPicklistDeserializer; import org.apache.camel.component.salesforce.api.MultiSelectPicklistSerializer; @@ -29,6 +27,8 @@ import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBas import org.apache.camel.component.salesforce.api.dto.SObjectDescription; import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls; import org.apache.camel.component.salesforce.api.dto.SObjectField; +import tools.jackson.databind.annotation.JsonDeserialize; +import tools.jackson.databind.annotation.JsonSerialize; /** * Salesforce DTO for SObject Account diff --git a/integration-tests/servicenow/src/main/java/org/apache/camel/quarkus/component/servicenow/it/ServicenowResource.java b/integration-tests/servicenow/src/main/java/org/apache/camel/quarkus/component/servicenow/it/ServicenowResource.java index 236a1c41b3c..5d4bf9421ee 100644 --- a/integration-tests/servicenow/src/main/java/org/apache/camel/quarkus/component/servicenow/it/ServicenowResource.java +++ b/integration-tests/servicenow/src/main/java/org/apache/camel/quarkus/component/servicenow/it/ServicenowResource.java @@ -20,7 +20,6 @@ import java.net.URI; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.databind.JsonNode; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; @@ -38,6 +37,7 @@ import org.apache.camel.component.servicenow.ServiceNowParams; import org.apache.camel.quarkus.component.servicenow.it.generated.Incident; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.logging.Logger; +import tools.jackson.databind.JsonNode; @Path("/servicenow") @ApplicationScoped @@ -72,7 +72,7 @@ public class ServicenowResource { LOG.infof("Sending to servicenow: %s", message); final JsonNode response = producerTemplate.requestBodyAndHeaders( "servicenow:" + instance, incident, headers, JsonNode.class); - String sysId = response.findPath("sys_id").textValue(); + String sysId = response.findPath("sys_id").stringValue(); LOG.infof("Got response from servicenow: %s", response); return Response @@ -98,7 +98,7 @@ public class ServicenowResource { final JsonNode response = producerTemplate.requestBodyAndHeaders("servicenow:" + instance, null, headers, JsonNode.class); LOG.infof("Got response from servicenow: %s", response); - String number = response.findPath("number").textValue(); + String number = response.findPath("number").stringValue(); return Response.ok(number).build(); } catch (Exception e) { LOG.error(e); diff --git a/integration-tests/telemetry-dev/src/test/java/org/apache/camel/quarkus/component/telemetry/dev/it/TelemetryDevTest.java b/integration-tests/telemetry-dev/src/test/java/org/apache/camel/quarkus/component/telemetry/dev/it/TelemetryDevTest.java index b3e366da5d8..e9bce5615e9 100644 --- a/integration-tests/telemetry-dev/src/test/java/org/apache/camel/quarkus/component/telemetry/dev/it/TelemetryDevTest.java +++ b/integration-tests/telemetry-dev/src/test/java/org/apache/camel/quarkus/component/telemetry/dev/it/TelemetryDevTest.java @@ -25,12 +25,12 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import org.apache.camel.telemetrydev.DevSpanAdapter; import org.apache.camel.telemetrydev.DevTrace; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; import static org.awaitility.Awaitility.await; import static org.hamcrest.CoreMatchers.equalTo;
