diff options
| author |   ilanap <ilanap@amdocs.com> | 2020-05-05 13:51:47 +0300 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-05-05 13:10:26 +0000 |
| commit | 7a8c0b3f47d4c602b5d240fa77eb7f9491836128 (patch) | |
| tree | 077398a7ac0644f4d14dd7110d94d575498c5fc6 /catalog-fe/src/main | |
| parent | 5f11eb43b37b14cb6b5517d7e40fcf03f3196deb (diff) | |
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)
Diffstat (limited to 'catalog-fe/src/main')
| -rw-r--r-- | catalog-fe/src/main/java/org/openecomp/sdc/fe/utils/JettySSLUtils.java | 7 |
1 files changed, 4 insertions, 3 deletions
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() { |