RHPAM-4889: adjustments to make it easier to consume from openshift e…

…nv vars
kiegroup · Feb 21, 2024 · 895f159 · 895f159
1 parent 65fd1dc
commit 895f159
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/...ckend/src/main/java/org/jbpm/workbench/ks/integration/KieServerQueryDefinitionLoader.java b/...ckend/src/main/java/org/jbpm/workbench/ks/integration/KieServerQueryDefinitionLoader.java
@@ -16,20 +16,17 @@
 
 package org.jbpm.workbench.ks.integration;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Event;
 import javax.inject.Inject;
 
 import org.apache.commons.io.IOUtils;
 import org.jbpm.workbench.ks.integration.event.QueryDefinitionLoaded;
-import org.kie.server.api.marshalling.Marshaller;
 import org.kie.server.api.marshalling.MarshallerFactory;
 import org.kie.server.api.marshalling.MarshallingException;
 import org.kie.server.api.marshalling.MarshallingFormat;
@@ -63,21 +60,24 @@ static QueryMode convert(final String mode) {
 
     @PostConstruct
     public void init() {
-        init(System.getProperties());
+        init(System.getenv());
     }
 
-    void init(final Properties properties) {
-        loadDefaultQueryDefinitions(QueryMode.convert(properties.getProperty(JBPM_WB_QUERY_MODE, QueryMode.DEFAULT.toString())));
+    void init(final Map<String,String> properties) {
+        loadDefaultQueryDefinitions(QueryMode.convert(properties.getOrDefault(JBPM_WB_QUERY_MODE, QueryMode.DEFAULT.toString())));
     }
 
     protected void loadDefaultQueryDefinitions(final QueryMode queryMode) {
         final Map<String, String> applyStrict = new HashMap<>();
 
         if (QueryMode.STRICT.equals(queryMode)) {
+            LOGGER.info("Query Mode Strict enabled!");
             QueryDefinition[] queries = loadQueryDefinitions("/default-query-definitions-strict.json");
             for (QueryDefinition q : queries) {
                 applyStrict.put(q.getName(), q.getTarget());
             }
+        } else {
+            LOGGER.info("Query Mode Default enabled!");
         }
 
         final QueryDefinition[] queries = loadQueryDefinitions("/default-query-definitions.json");

diff --git a/.../java/org/jbpm/workbench/ks/integration/KieServerQueryDefinitionLoaderStrictModeTest.java b/.../java/org/jbpm/workbench/ks/integration/KieServerQueryDefinitionLoaderStrictModeTest.java
@@ -27,7 +27,6 @@
 import javax.enterprise.event.Event;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -63,7 +62,7 @@ public void setup() {
             receivedEvents.put(queryDefinitionLoaded.getDefinition().getName(), queryDefinitionLoaded.getDefinition());
             return null;
         }).when(event).fire(any(QueryDefinitionLoaded.class));
-        this.kieServerQueryDefinitionLoader.init(new Properties(){{
+        this.kieServerQueryDefinitionLoader.init(new HashMap<String, String>(){{
             put(KieServerQueryDefinitionLoader.JBPM_WB_QUERY_MODE, "STRICT");
         }});
     }