diff options
| author |   Guangrong Fu <fu.guangrong@zte.com.cn> | 2021-12-08 16:15:24 +0800 |
|---|---|---|
| committer | Guangrong Fu <fu.guangrong@zte.com.cn> | 2021-12-08 16:15:29 +0800 |
| commit | bf9883c5347a94e61c79b5f9d9bc329a1b0e7c4e (patch) | |
| tree | 27736c6d7d082ca7375f7238883a72c94817f5d2 /rulemgt/src/main/java/org/onap | |
| parent | 933bad16733f0f7bd2774d4be70438960009dbc6 (diff) | |
bugfix - http/https protocol problem
Issue-ID: HOLMES-488
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Change-Id: I9d4a219b55b909217413dd615013b0d1026e257d
Diffstat (limited to 'rulemgt/src/main/java/org/onap')
| -rw-r--r-- | rulemgt/src/main/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTask.java | 8 |
1 files changed, 7 insertions, 1 deletions
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<String, String> configInEffect = new HashMap(); // Contents for configInEffect are <closedControlLoop>:<ruleContents> 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; + } } |