From: ilanap <ilanap@amdocs.com>
Date: Tue, 5 May 2020 10:51:47 +0000 (+0300)
Subject: Setting default store types when not defined in configuration for init of https client
X-Git-Tag: 1.6.5~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7a8c0b3f47d4c602b5d240fa77eb7f9491836128;p=sdc.git

Setting default store types when not defined in configuration for init of https client

Issue-ID: SDC-2962
Signed-off-by: ilanap <ilanap@amdocs.com>
Change-Id: I9d88031c7d20951a4a77138340b1ddc26f47c0b6
Signed-off-by: ilanap <ilanap@amdocs.com>
(cherry picked from commit 5facedd4291181fb2668ea3e945687c04fe62cb1)
---

diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/utils/JettySSLUtils.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/utils/JettySSLUtils.java
index fb00725a88..51fa1d1bee 100644
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/utils/JettySSLUtils.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/utils/JettySSLUtils.java
@@ -74,7 +74,8 @@ public class JettySSLUtils {
     public static class JettySslConfig {
         Properties sslProperties;
         static final String JETTY_BASE = System.getenv("JETTY_BASE");
-
+        static final String KEY_STORE_TYPE_PROPERTY_NAME="jetty.sslContext.keyStoreType";
+        static final String TRUST_STORE_TYPE_PROPERTY_NAME="jetty.sslContext.trustStoreType";
         JettySslConfig(Properties sslProperties) {
             this.sslProperties = sslProperties;
         }
@@ -92,7 +93,7 @@ public class JettySSLUtils {
         }
 
         public String getKeystoreType() {
-            return sslProperties.getProperty("jetty.sslContext.keyStoreType");
+            return sslProperties.getProperty(KEY_STORE_TYPE_PROPERTY_NAME, KeyStore.getDefaultType());
         }
 
         public String getTruststorePath() {
@@ -104,7 +105,7 @@ public class JettySSLUtils {
         }
 
         public String getTruststoreType() {
-            return sslProperties.getProperty("jetty.sslContext.trustStoreType");
+            return sslProperties.getProperty(TRUST_STORE_TYPE_PROPERTY_NAME, KeyStore.getDefaultType());
         }
 
         public String getKeyStoreManager() {