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 1a2b6a627b Remove redundant jackson-dataformat-xml dependency from 
hashicorp-vault extension
1a2b6a627b is described below

commit 1a2b6a627bf60beb4dafc47373539795cc3d9c3a
Author: James Netherton <[email protected]>
AuthorDate: Wed Dec 10 09:19:34 2025 +0000

    Remove redundant jackson-dataformat-xml dependency from hashicorp-vault 
extension
---
 extensions/hashicorp-vault/deployment/pom.xml      |  4 --
 extensions/hashicorp-vault/runtime/pom.xml         |  9 ++--
 .../XmlObjectMapperInitializerSubstitutions.java   | 59 ++++++++++++++++++++++
 3 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/extensions/hashicorp-vault/deployment/pom.xml 
b/extensions/hashicorp-vault/deployment/pom.xml
index 9fd9a1f8d4..26fa882908 100644
--- a/extensions/hashicorp-vault/deployment/pom.xml
+++ b/extensions/hashicorp-vault/deployment/pom.xml
@@ -38,10 +38,6 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            
<artifactId>camel-quarkus-support-jackson-dataformat-xml-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-support-spring-deployment</artifactId>
diff --git a/extensions/hashicorp-vault/runtime/pom.xml 
b/extensions/hashicorp-vault/runtime/pom.xml
index e3256f8883..3aa05e5636 100644
--- a/extensions/hashicorp-vault/runtime/pom.xml
+++ b/extensions/hashicorp-vault/runtime/pom.xml
@@ -44,10 +44,6 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel.quarkus</groupId>
-            
<artifactId>camel-quarkus-support-jackson-dataformat-xml</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-support-spring</artifactId>
@@ -56,6 +52,11 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-hashicorp-vault</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.graalvm.sdk</groupId>
+            <artifactId>graal-sdk</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git 
a/extensions/hashicorp-vault/runtime/src/main/java/org/apache/camel/quarkus/component/hashicorp/vault/graal/XmlObjectMapperInitializerSubstitutions.java
 
b/extensions/hashicorp-vault/runtime/src/main/java/org/apache/camel/quarkus/component/hashicorp/vault/graal/XmlObjectMapperInitializerSubstitutions.java
new file mode 100644
index 0000000000..e914ec8566
--- /dev/null
+++ 
b/extensions/hashicorp-vault/runtime/src/main/java/org/apache/camel/quarkus/component/hashicorp/vault/graal/XmlObjectMapperInitializerSubstitutions.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.hashicorp.vault.graal;
+
+import java.util.function.BooleanSupplier;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+/**
+ * Substitute Jackson2ObjectMapperBuilder.build() method to avoid references 
to XmlMapper, when jackson-dataformat-xml
+ * is not on the runtime classpath.
+ */
+@TargetClass(className = 
"org.springframework.http.converter.json.Jackson2ObjectMapperBuilder", onlyWith 
= JacksonDataformatXmlIsAbsent.class)
+final class XmlObjectMapperInitializerSubstitutions {
+    @Alias
+    private JsonFactory factory;
+
+    @SuppressWarnings("unchecked")
+    @Substitute
+    public <T extends ObjectMapper> T build() {
+        ObjectMapper mapper = (this.factory != null ? new 
ObjectMapper(this.factory) : new ObjectMapper());
+        configure(mapper);
+        return (T) mapper;
+    }
+
+    @Alias
+    public void configure(ObjectMapper objectMapper) {
+    }
+}
+
+final class JacksonDataformatXmlIsAbsent implements BooleanSupplier {
+    @Override
+    public boolean getAsBoolean() {
+        try {
+            
Thread.currentThread().getContextClassLoader().loadClass("com.fasterxml.jackson.dataformat.xml.XmlMapper");
+            return false;
+        } catch (ClassNotFoundException e) {
+            return true;
+        }
+    }
+}

Reply via email to