From 895f1593328643e9f00281276cf6237d0188ec7b Mon Sep 17 00:00:00 2001
From: Alex Porcelli <alex@porcelli.me>
Date: Tue, 20 Feb 2024 13:36:42 -0500
Subject: [PATCH] RHPAM-4889: adjustments to make it easier to consume from
 openshift env vars

---
 .../integration/KieServerQueryDefinitionLoader.java  | 12 ++++++------
 ...KieServerQueryDefinitionLoaderStrictModeTest.java |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/jbpm-wb-kie-server/jbpm-wb-kie-server-backend/src/main/java/org/jbpm/workbench/ks/integration/KieServerQueryDefinitionLoader.java b/jbpm-wb-kie-server/jbpm-wb-kie-server-backend/src/main/java/org/jbpm/workbench/ks/integration/KieServerQueryDefinitionLoader.java
index 154bb28b0..cc19976cb 100644
--- a/jbpm-wb-kie-server/jbpm-wb-kie-server-backend/src/main/java/org/jbpm/workbench/ks/integration/KieServerQueryDefinitionLoader.java
+++ b/jbpm-wb-kie-server/jbpm-wb-kie-server-backend/src/main/java/org/jbpm/workbench/ks/integration/KieServerQueryDefinitionLoader.java
@@ -16,12 +16,10 @@
 
 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;
@@ -29,7 +27,6 @@
 
 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/jbpm-wb-kie-server/jbpm-wb-kie-server-backend/src/test/java/org/jbpm/workbench/ks/integration/KieServerQueryDefinitionLoaderStrictModeTest.java b/jbpm-wb-kie-server/jbpm-wb-kie-server-backend/src/test/java/org/jbpm/workbench/ks/integration/KieServerQueryDefinitionLoaderStrictModeTest.java
index 246a85a66..82cd432c3 100644
--- a/jbpm-wb-kie-server/jbpm-wb-kie-server-backend/src/test/java/org/jbpm/workbench/ks/integration/KieServerQueryDefinitionLoaderStrictModeTest.java
+++ b/jbpm-wb-kie-server/jbpm-wb-kie-server-backend/src/test/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");
         }});
     }