CAMEL-19918: camel-saxon - Using saxon=true does not work. (#11635)

apache · Oct 3, 2023 · 231e3be · 231e3be
1 parent 3f6d9eb
commit 231e3be
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/...n/src/test/resources/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.xml b/...n/src/test/resources/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.xml
@@ -27,7 +27,7 @@
   <bean name="saxonFactory" class="net.sf.saxon.xpath.XPathFactoryImpl"/>
 
   <bean name="xpath" class="org.apache.camel.language.xpath.XPathLanguage">
-    <property name="useSaxon" value="true"/>
+    <property name="saxon" value="true"/>
   </bean>
 
   <camelContext xmlns="http://camel.apache.org/schema/spring">

diff --git a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java
@@ -35,7 +35,7 @@ public class XPathLanguage extends SingleInputTypedLanguageSupport implements Pr
     private QName resultQName;
     private Class<?> documentType;
     private XPathFactory xpathFactory;
-    private Boolean useSaxon;
+    private Boolean saxon;
     private String objectModelUri;
     private Boolean threadSafety;
     private Boolean logNamespaces;
@@ -97,12 +97,22 @@ public void setXpathFactory(XPathFactory xpathFactory) {
         this.xpathFactory = xpathFactory;
     }
 
+    @Deprecated
     public void setUseSaxon(Boolean useSaxon) {
-        this.useSaxon = useSaxon;
+        setSaxon(useSaxon);
     }
 
+    @Deprecated
     public Boolean getUseSaxon() {
-        return useSaxon;
+        return getSaxon();
+    }
+
+    public Boolean getSaxon() {
+        return saxon;
+    }
+
+    public void setSaxon(Boolean saxon) {
+        this.saxon = saxon;
     }
 
     public String getObjectModelUri() {
@@ -150,7 +160,7 @@ protected void configureBuilder(XPathBuilder builder, Object[] properties) {
         if (clazz != null) {
             builder.setResultType(clazz);
         }
-        Boolean bool = property(Boolean.class, properties, 3, useSaxon);
+        Boolean bool = property(Boolean.class, properties, 3, saxon);
         if (bool != null) {
             builder.setUseSaxon(bool);
             if (bool) {
@@ -216,6 +226,9 @@ public boolean configure(CamelContext camelContext, Object target, String name,
             case "useSaxon":
                 setUseSaxon(PropertyConfigurerSupport.property(camelContext, Boolean.class, value));
                 return true;
+            case "saxon":
+                setSaxon(PropertyConfigurerSupport.property(camelContext, Boolean.class, value));
+                return true;
             case "objectmodeluri":
             case "objectModelUri":
                 setObjectModelUri(PropertyConfigurerSupport.property(camelContext, String.class, value));