incubator-kie-issues#1283: Fix Kogito Addons Quarkus Data Index `DevM…

…ode` - Fix extensions capabilities names in order to make Kogito Runtime able to check them. - Make Data Index Addons generate a default `kogito.data-index.url` in `DevMode`
apache · May 30, 2024 · cc986a9 · cc986a9
1 parent cde6132
commit cc986a9
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 6 deletions.
diff --git a/...index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml b/...index-persistence/kogito-addons-quarkus-data-index-persistence-infinispan/runtime/pom.xml
@@ -58,7 +58,7 @@
             <configuration>
               <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
               <capabilities>
-                <provides>org.kie.kogito.data-index.persistence.infinispan</provides>
+                <provides>org.kie.kogito.data-index.persistence</provides>
               </capabilities>
             </configuration>
           </execution>

diff --git a/...ta-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml b/...ta-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/runtime/pom.xml
@@ -54,7 +54,7 @@
             <configuration>
               <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
               <capabilities>
-                <provides>org.kie.kogito.data-index.persistence.mongodb</provides>
+                <provides>org.kie.kogito.data-index.persistence</provides>
               </capabilities>
             </configuration>
           </execution>

diff --git a/...o/addons/quarkus/data/index/deployment/AbstractKogitoAddonsQuarkusDataIndexProcessor.java b/...o/addons/quarkus/data/index/deployment/AbstractKogitoAddonsQuarkusDataIndexProcessor.java
@@ -18,6 +18,7 @@
  */
 package org.kie.kogito.addons.quarkus.data.index.deployment;
 
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.Type;
 import org.kie.kogito.index.addon.vertx.VertxGraphiQLSetup;
@@ -33,16 +34,30 @@
 import io.quarkus.deployment.IsDevelopment;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
 import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
 
 public abstract class AbstractKogitoAddonsQuarkusDataIndexProcessor extends OneOfCapabilityKogitoAddOnProcessor {
+    private static final String QUARKUS_HTTP_PORT = "quarkus.http.port";
+    private static final String KOGITO_SERVICE_URL_PROP = "kogito.service.url";
+    private static final String KOGITO_DATA_INDEX_PROP = "kogito.data-index.url";
 
     AbstractKogitoAddonsQuarkusDataIndexProcessor() {
         super(KogitoCapability.SERVERLESS_WORKFLOW, KogitoCapability.PROCESSES);
     }
 
+    @BuildStep(onlyIf = IsDevelopment.class)
+    public void buildDefaultDataIndexURLSystemProperty(BuildProducer<SystemPropertyBuildItem> systemProperties) {
+        // Setting a default `kogito.data-index.url` accordingly to the runtime url.
+        String dataIndexUrl = ConfigProvider.getConfig().getOptionalValue(KOGITO_SERVICE_URL_PROP, String.class).orElseGet(() -> {
+            Integer port = ConfigProvider.getConfig().getOptionalValue(QUARKUS_HTTP_PORT, Integer.class).orElse(8080);
+            return "http://localhost:" + port;
+        });
+        systemProperties.produce(new SystemPropertyBuildItem(KOGITO_DATA_INDEX_PROP, dataIndexUrl));
+    }
+
     @BuildStep(onlyIf = IsDevelopment.class)
     public void processGraphiql(BuildProducer<AdditionalBeanBuildItem> additionalBean) {
         additionalBean.produce(AdditionalBeanBuildItem.builder().addBeanClass(VertxGraphiQLSetup.class).setUnremovable().setDefaultScope(DotNames.APPLICATION_SCOPED).build());

diff --git a/...ito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml b/...ito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-infinispan/runtime/pom.xml
@@ -54,7 +54,7 @@
             <configuration>
               <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
               <capabilities>
-                <provides>org.kie.kogito.data-index.infinispan</provides>
+                <provides>org.kie.kogito.data-index</provides>
               </capabilities>
             </configuration>
           </execution>

diff --git a/...ogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml b/...ogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/runtime/pom.xml
@@ -62,7 +62,7 @@
             <configuration>
               <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
               <capabilities>
-                <provides>org.kie.kogito.data-index.in-memory</provides>
+                <provides>org.kie.kogito.data-index</provides>
               </capabilities>
             </configuration>
           </execution>

diff --git a/...kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml b/...kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/runtime/pom.xml
@@ -58,7 +58,7 @@
             <configuration>
               <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
               <capabilities>
-                <provides>org.kie.kogito.data-index.mongodb</provides>
+                <provides>org.kie.kogito.data-index</provides>
               </capabilities>
             </configuration>
           </execution>

diff --git a/...ito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml b/...ito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/runtime/pom.xml
@@ -58,7 +58,7 @@
             <configuration>
               <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
               <capabilities>
-                <provides>org.kie.kogito.data-index.postgresql</provides>
+                <provides>org.kie.kogito.data-index</provides>
               </capabilities>
             </configuration>
           </execution>