From bf9883c5347a94e61c79b5f9d9bc329a1b0e7c4e Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Wed, 8 Dec 2021 16:15:24 +0800 Subject: bugfix - http/https protocol problem Issue-ID: HOLMES-488 Signed-off-by: Guangrong Fu Change-Id: I9d4a219b55b909217413dd615013b0d1026e257d --- .../java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTask.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'rulemgt/src/main') diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTask.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTask.java index 88ab637..884ea31 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTask.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTask.java @@ -22,6 +22,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import org.apache.commons.lang.StringUtils; import org.onap.holmes.common.ConfigFileScanner; +import org.onap.holmes.common.utils.CommonUtils; import org.onap.holmes.common.utils.FileUtils; import org.onap.holmes.common.utils.JerseyClient; import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest; @@ -43,10 +44,11 @@ public class ConfigFileScanningTask implements Runnable { final private Map configInEffect = new HashMap(); // Contents for configInEffect are : pairs. private String configFile = "/opt/hrmrules/index.json"; private ConfigFileScanner configFileScanner; - private String url = "https://127.0.0.1:9101/api/holmes-rule-mgmt/v1/rule"; + private String url; public ConfigFileScanningTask(ConfigFileScanner configFileScanner) { this.configFileScanner = configFileScanner; + this.url = getRequestPref() + "://127.0.0.1:9101/api/holmes-rule-mgmt/v1/rule"; } @Override @@ -193,4 +195,8 @@ public class ConfigFileScanningTask implements Runnable { } return true; } + + private String getRequestPref() { + return CommonUtils.isHttpsEnabled() ? JerseyClient.PROTOCOL_HTTPS : JerseyClient.PROTOCOL_HTTP; + } } -- cgit 1.2.3-korg