Promote Qdrant extension to native #5815

apache · Apr 4, 2024 · 649b10d · 649b10d
1 parent 17c8215
commit 649b10d
Show file tree

Hide file tree

Showing 19 changed files with 382 additions and 84 deletions.
diff --git a/docs/modules/ROOT/examples/components/qdrant.yml b/docs/modules/ROOT/examples/components/qdrant.yml
@@ -2,11 +2,11 @@
 # This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page
 cqArtifactId: camel-quarkus-qdrant
 cqArtifactIdBase: qdrant
-cqNativeSupported: false
-cqStatus: Preview
+cqNativeSupported: true
+cqStatus: Stable
 cqDeprecated: false
 cqJvmSince: 3.10.0
-cqNativeSince: n/a
+cqNativeSince: 3.10.0
 cqCamelPartName: qdrant
 cqCamelPartTitle: Qdrant
 cqCamelPartDescription: Perform operations on the Qdrant Vector Database.

diff --git a/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc b/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc
@@ -4,17 +4,17 @@
 = Qdrant
 :linkattrs:
 :cq-artifact-id: camel-quarkus-qdrant
-:cq-native-supported: false
-:cq-status: Preview
-:cq-status-deprecation: Preview
+:cq-native-supported: true
+:cq-status: Stable
+:cq-status-deprecation: Stable
 :cq-description: Perform operations on the Qdrant Vector Database.
 :cq-deprecated: false
 :cq-jvm-since: 3.10.0
-:cq-native-since: n/a
+:cq-native-since: 3.10.0
 
 ifeval::[{doc-show-badges} == true]
 [.badges]
-[.badge-key]##JVM since##[.badge-supported]##3.10.0## [.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##3.10.0## [.badge-key]##Native since##[.badge-supported]##3.10.0##
 endif::[]
 
 Perform operations on the Qdrant Vector Database.
@@ -29,6 +29,10 @@ Please refer to the above link for usage and configuration details.
 [id="extensions-qdrant-maven-coordinates"]
 == Maven coordinates
 
+https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-qdrant[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"]
+
+Or add the coordinates to your existing project:
+
 [source,xml]
 ----
 <dependency>

diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
@@ -85,7 +85,6 @@
         <module>opensearch</module>
         <module>printer</module>
         <module>pulsar</module>
-        <module>qdrant</module>
         <module>quickfix</module>
         <module>redis</module>
         <module>robotframework</module>

diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -204,6 +204,7 @@
         <module>platform-http</module>
         <module>protobuf</module>
         <module>pubnub</module>
+        <module>qdrant</module>
         <module>quartz</module>
         <module>qute</module>
         <module>reactive-streams</module>

diff --git a/extensions-jvm/qdrant/deployment/pom.xml → extensions/qdrant/deployment/pom.xml b/extensions-jvm/qdrant/deployment/pom.xml → extensions/qdrant/deployment/pom.xml
@@ -18,8 +18,8 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
@@ -36,12 +36,25 @@
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-common-deployment</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-qdrant</artifactId>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>

diff --git a/...nt/qdrant/deployment/QdrantProcessor.java → ...nt/qdrant/deployment/QdrantProcessor.java b/...nt/qdrant/deployment/QdrantProcessor.java → ...nt/qdrant/deployment/QdrantProcessor.java
@@ -17,11 +17,7 @@
 package org.apache.camel.quarkus.component.qdrant.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.annotations.ExecutionTime;
-import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
-import org.apache.camel.quarkus.core.JvmOnlyRecorder;
 import org.jboss.logging.Logger;
 
 class QdrantProcessor {
@@ -33,14 +29,4 @@ class QdrantProcessor {
     FeatureBuildItem feature() {
         return new FeatureBuildItem(FEATURE);
     }
-
-    /**
-     * Remove this once this extension starts supporting the native mode.
-     */
-    @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
-    @Record(value = ExecutionTime.RUNTIME_INIT)
-    void warnJvmInNative(JvmOnlyRecorder recorder) {
-        JvmOnlyRecorder.warnJvmInNative(LOG, FEATURE); // warn at build time
-        recorder.warnJvmInNative(FEATURE); // warn at runtime
-    }
 }
diff --git a/extensions-jvm/qdrant/pom.xml → extensions/qdrant/pom.xml b/extensions-jvm/qdrant/pom.xml → extensions/qdrant/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-extensions-jvm</artifactId>
+        <artifactId>camel-quarkus-extensions</artifactId>
         <version>3.10.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/extensions-jvm/qdrant/runtime/pom.xml → extensions/qdrant/runtime/pom.xml b/extensions-jvm/qdrant/runtime/pom.xml → extensions/qdrant/runtime/pom.xml
@@ -18,8 +18,8 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
@@ -34,9 +34,20 @@
 
     <properties>
         <camel.quarkus.jvmSince>3.10.0</camel.quarkus.jvmSince>
+        <camel.quarkus.nativeSince>3.10.0</camel.quarkus.nativeSince>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-grpc-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-core</artifactId>
@@ -45,6 +56,14 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-qdrant</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId>
+            <artifactId>log4j2-jboss-logmanager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId>
+            <artifactId>log4j-jboss-logmanager</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/...resources/META-INF/quarkus-extension.yaml → ...resources/META-INF/quarkus-extension.yaml b/...resources/META-INF/quarkus-extension.yaml → ...resources/META-INF/quarkus-extension.yaml
@@ -25,9 +25,8 @@ name: "Camel Qdrant"
 description: "Perform operations on the Qdrant Vector Database"
 metadata:
   icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"
-  unlisted: true
   guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/qdrant.html"
   categories:
   - "integration"
   status:
-  - "preview"
+  - "stable"
diff --git a/integration-tests-jvm/pom.xml b/integration-tests-jvm/pom.xml
@@ -84,7 +84,6 @@
         <module>opensearch</module>
         <module>printer</module>
         <module>pulsar</module>
-        <module>qdrant</module>
         <module>quickfix</module>
         <module>redis</module>
         <module>robotframework</module>

diff --git a/...jvm/qdrant/src/main/java/org/apache/camel/quarkus/component/qdrant/it/QdrantResource.java b/...jvm/qdrant/src/main/java/org/apache/camel/quarkus/component/qdrant/it/QdrantResource.java
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -194,6 +194,7 @@
         <module>platform-http-proxy-ssl</module>
         <module>protobuf</module>
         <module>pubnub</module>
+        <module>qdrant</module>
         <module>quartz</module>
         <module>quartz-clustered</module>
         <module>qute</module>

diff --git a/integration-tests-jvm/qdrant/pom.xml → integration-tests/qdrant/pom.xml b/integration-tests-jvm/qdrant/pom.xml → integration-tests/qdrant/pom.xml
@@ -18,8 +18,8 @@
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
@@ -53,6 +53,22 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>qdrant</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit4-mock</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -80,5 +96,43 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.type>native</quarkus.package.type>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>skip-testcontainers-tests</id>
+            <activation>
+                <property>
+                    <name>skip-testcontainers-tests</name>
+                </property>
+            </activation>
+            <properties>
+                <skipTests>true</skipTests>
+            </properties>
+        </profile>
     </profiles>
 </project>