Fixed native issue and completed test/documentation #1710

docs/modules/ROOT/pages/reference/extensions/saxon.adoc

@@ -3,16 +3,16 @@
 = XQuery
 :linkattrs:
 :cq-artifact-id: camel-quarkus-saxon
-:cq-native-supported: false
-:cq-status: Preview
-:cq-status-deprecation: Preview
+:cq-native-supported: true
+:cq-status: Stable
+:cq-status-deprecation: Stable
 :cq-description: Query and/or transform XML payloads using XQuery and Saxon.
 :cq-deprecated: false
 :cq-jvm-since: 1.1.0
-:cq-native-since: n/a
+:cq-native-since: 1.9.0
 
 [.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.1.0## [.badge-key]##Native since##[.badge-supported]##1.9.0##
 
 Query and/or transform XML payloads using XQuery and Saxon.
 
@@ -25,6 +25,10 @@ Please refer to the above links for usage and configuration details.
 
 == Maven coordinates
 
+https://code.quarkus.io/?extension-search=camel-quarkus-saxon[Create a new project with this extension on code.quarkus.io, window="_blank"]
+
+Or add the coordinates to your existing project:
+
 [source,xml]
 ----
 <dependency>
@@ -34,3 +38,23 @@ Please refer to the above links for usage and configuration details.
 ----
 
 Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications.
+
+== Additional Camel Quarkus configuration
+
+Beyond standard usages described above, a trick is needed when using the xquery language and component with classpath resources in native mode. In such a situation, one needs to explicitly embed the resources in the native executable by specifying the `include-patterns` option.
+
+For instance, the 2 routes below would load a xquery script from 2 classpath resources respectively named _myxquery.txt_ and _another-xquery.txt_:
+[source,java]
+----
+from("direct:start").transform().xquery("resource:classpath:myxquery.txt", String.class);
+from("direct:start").to("xquery:another-xquery.txt");
+----
+
+In order to work in native mode the `include-patterns` configuration should be set. For instance, in the `application.properties` file as below :
+[source,properties]
+----
+quarkus.camel.native.resources.include-patterns = *.txt
+----
+
+More information about selecting resources for inclusion in the native executable could be found at xref:user-guide/native-mode.adoc#embedding-resource-in-native-executable[Embedding resource in native executable].
+

docs/modules/ROOT/partials/reference/components/xquery.adoc

@@ -2,11 +2,11 @@
 // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
 :cq-artifact-id: camel-quarkus-saxon
 :cq-artifact-id-base: saxon
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
 :cq-deprecated: false
 :cq-jvm-since: 1.1.0
-:cq-native-since: n/a
+:cq-native-since: 1.9.0
 :cq-camel-part-name: xquery
 :cq-camel-part-title: XQuery
 :cq-camel-part-description: Query and/or transform XML payloads using XQuery and Saxon.

docs/modules/ROOT/partials/reference/languages/xquery.adoc

@@ -2,11 +2,11 @@
 // This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
 :cq-artifact-id: camel-quarkus-saxon
 :cq-artifact-id-base: saxon
-:cq-native-supported: false
-:cq-status: Preview
+:cq-native-supported: true
+:cq-status: Stable
 :cq-deprecated: false
 :cq-jvm-since: 1.1.0
-:cq-native-since: n/a
+:cq-native-since: 1.9.0
 :cq-camel-part-name: xquery
 :cq-camel-part-title: XQuery
 :cq-camel-part-description: Evaluate an XQuery expressions against an XML payload.

extensions-jvm/pom.xml

@@ -101,7 +101,6 @@
         <module>redis</module>
         <module>ribbon</module>
         <module>robotframework</module>
-        <module>saxon</module>
         <module>schematron</module>
         <module>sip</module>
         <module>smpp</module>

extensions/pom.xml

@@ -199,6 +199,7 @@
         <module>saga</module>
         <module>salesforce</module>
         <module>sap-netweaver</module>
+        <module>saxon</module>
         <module>scheduler</module>
         <module>seda</module>
         <module>servicenow</module>

extensions/saxon/deployment/src/main/java/org/apache/camel/quarkus/component/saxon/deployment/SaxonProcessor.java

@@ -0,0 +1,66 @@
+/*
+ * 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.saxon.deployment;
+
+import java.util.Collection;
+
+import org.w3c.dom.Document;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import net.sf.saxon.functions.SystemFunction;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.logging.Logger;
+
+class SaxonProcessor {
+
+    private static final Logger LOG = Logger.getLogger(SaxonProcessor.class);
+    private static final String FEATURE = "camel-saxon";
+
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(FEATURE);
+    }
+
+    @BuildStep
+    void registerReflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
+            CombinedIndexBuildItem index) {
+
+        // Needed to register default object models when initializing the net.sf.saxon.java.JavaPlatform
+        reflectiveClasses.produce(new ReflectiveClassBuildItem(false, false, Document.class));
+
+        // Register saxon functions as reflective
+        Collection<ClassInfo> cis = index.getIndex()
+                .getAllKnownSubclasses(DotName.createSimple(SystemFunction.class.getName()));
+        cis.stream().forEach(ci -> {
+            String clazzName = ci.asClass().name().toString();
+            ReflectiveClassBuildItem clazz = new ReflectiveClassBuildItem(false, false, clazzName);
+            LOG.debugf("Registering saxon function '%s' as reflective", clazzName);
+            reflectiveClasses.produce(clazz);
+        });
+    }
+
+    @BuildStep
+    void indexSaxonHe(BuildProducer<IndexDependencyBuildItem> deps) {
+        deps.produce(new IndexDependencyBuildItem("net.sf.saxon", "Saxon-HE"));
+    }
+}

extensions-jvm/saxon/pom.xml → extensions/saxon/pom.xml

@@ -33,6 +33,5 @@
     <modules>
         <module>deployment</module>
         <module>runtime</module>
-        <module>integration-test</module>
     </modules>
 </project>

extensions-jvm/saxon/runtime/pom.xml → extensions/saxon/runtime/pom.xml

@@ -32,6 +32,7 @@
 
     <properties>
         <camel.quarkus.jvmSince>1.1.0</camel.quarkus.jvmSince>
+        <camel.quarkus.nativeSince>1.9.0</camel.quarkus.nativeSince>
     </properties>
 
     <dependencyManagement>

extensions/saxon/runtime/src/main/doc/configuration.adoc

@@ -0,0 +1,16 @@
+Beyond standard usages described above, a trick is needed when using the xquery language and component with classpath resources in native mode. In such a situation, one needs to explicitly embed the resources in the native executable by specifying the `include-patterns` option.
+
+For instance, the 2 routes below would load a xquery script from 2 classpath resources respectively named _myxquery.txt_ and _another-xquery.txt_:
+[source,java]
+----
+from("direct:start").transform().xquery("resource:classpath:myxquery.txt", String.class);
+from("direct:start").to("xquery:another-xquery.txt");
+----
+
+In order to work in native mode the `include-patterns` configuration should be set. For instance, in the `application.properties` file as below :
+[source,properties]
+----
+quarkus.camel.native.resources.include-patterns = *.txt
+----
+
+More information about selecting resources for inclusion in the native executable could be found at xref:user-guide/native-mode.adoc#embedding-resource-in-native-executable[Embedding resource in native executable].

extensions-jvm/saxon/runtime/src/main/resources/META-INF/quarkus-extension.yaml → extensions/saxon/runtime/src/main/resources/META-INF/quarkus-extension.yaml

@@ -24,9 +24,8 @@
 name: "Camel XQuery"
 description: "Query and/or transform XML payloads using XQuery and Saxon"
 metadata:
-  unlisted: true
   guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/saxon.html"
   categories:
   - "integration"
   status:
-  - "preview"
+  - "stable"

integration-tests/pom.xml

@@ -184,6 +184,7 @@
         <module>saga</module>
         <module>salesforce</module>
         <module>sap-netweaver</module>
+        <module>saxon</module>
         <module>servicenow</module>
         <module>servlet</module>
         <module>shiro</module>