Fix couchdb in native mode

apache · Jun 24, 2024 · 0a46a57 · 0a46a57
1 parent 83a01bb
commit 0a46a57
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/...src/main/java/org/apache/camel/quarkus/component/couchdb/deployment/CouchdbProcessor.java b/...src/main/java/org/apache/camel/quarkus/component/couchdb/deployment/CouchdbProcessor.java
@@ -16,14 +16,17 @@
  */
 package org.apache.camel.quarkus.component.couchdb.deployment;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 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 org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
 
 class CouchdbProcessor {
 
@@ -35,18 +38,24 @@ FeatureBuildItem feature() {
     }
 
     @BuildStep
-    List<ReflectiveClassBuildItem> registerReflectiveClasses() {
-        List<ReflectiveClassBuildItem> items = new ArrayList<ReflectiveClassBuildItem>();
-        items.add(ReflectiveClassBuildItem.builder("org.lightcouch.Response").fields().build());
-        items.add(ReflectiveClassBuildItem.builder("org.lightcouch.CouchDbInfo").fields().build());
-        items.add(ReflectiveClassBuildItem.builder("org.lightcouch.ChangesResult$Row").fields().build());
-        items.add(ReflectiveClassBuildItem.builder("org.lightcouch.ChangesResult$Row$Rev").fields().build());
-        return items;
+    void registerReflectiveClasses(
+            CombinedIndexBuildItem combinedIndex,
+            BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+        Set<String> modelClasses = combinedIndex.getIndex()
+                .getClassesInPackage(DotName.createSimple("com.ibm.cloud.cloudant.v1.model"))
+                .stream()
+                .map(ClassInfo::name)
+                .map(DotName::toString)
+                .collect(Collectors.toUnmodifiableSet());
+
+        reflectiveClass.produce(ReflectiveClassBuildItem.builder(modelClasses.toArray(new String[0]))
+                .fields(true)
+                .build());
     }
 
     @BuildStep
     void addDependenciesToIndexer(BuildProducer<IndexDependencyBuildItem> indexDependencyProducer) {
-        indexDependencyProducer.produce(new IndexDependencyBuildItem("com.google.code.gson", "gson"));
+        indexDependencyProducer.produce(new IndexDependencyBuildItem("com.ibm.cloud", "cloudant"));
     }
 
 }
diff --git a/...n-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchbIT.java b/...n-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchbIT.java
@@ -17,9 +17,7 @@
 package org.apache.camel.quarkus.component.couchdb.it;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6198")
 @QuarkusIntegrationTest
 class CouchbIT extends CouchdbTest {