From c7d44853b881daadccc6c05cddcbb89743f1bffc Mon Sep 17 00:00:00 2001 From: vasraz Date: Tue, 6 Sep 2022 13:08:14 +0100 Subject: Update SDC with new 'security-util-lib' version Signed-off-by: Vasyl Razinkov Change-Id: Iece4430f2ebceb8bfb1ea1a89c541335e2f35b11 Issue-ID: SDC-4165 --- .../java/org/openecomp/sdc/common/http/config/BasicAuthorization.java | 2 +- .../java/org/openecomp/sdc/common/http/config/ClientCertificate.java | 2 +- .../sdc/common/http/client/api/HttpClientConfigImmutableTest.java | 4 ++-- .../openecomp/sdc/common/http/client/api/HttpClientFactoryTest.java | 4 ++-- .../sdc/common/http/client/api/HttpConnectionMngFactoryTest.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'common-app-api/src') diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/BasicAuthorization.java b/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/BasicAuthorization.java index c9147719a4..4e0af9c18c 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/BasicAuthorization.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/BasicAuthorization.java @@ -56,7 +56,7 @@ public class BasicAuthorization { private void setPassword(String password, boolean isEncoded) { validate(password); if (isEncoded) { - Either passkey = SecurityUtil.INSTANCE.decrypt(password); + Either passkey = SecurityUtil.decrypt(password); if (passkey.isLeft()) { this.password = passkey.left().value(); } else { diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/ClientCertificate.java b/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/ClientCertificate.java index 510c0a277c..93fc3b9f0f 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/ClientCertificate.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/http/config/ClientCertificate.java @@ -41,7 +41,7 @@ public class ClientCertificate { private void setKeyStorePassword(String keyStorePassword, boolean isEncoded) { validate(keyStorePassword); if (isEncoded) { - Either passkey = SecurityUtil.INSTANCE.decrypt(keyStorePassword); + Either passkey = SecurityUtil.decrypt(keyStorePassword); if (passkey.isLeft()) { this.keyStorePassword = passkey.left().value(); } else { diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutableTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutableTest.java index 2593a000f8..e3c5eca89f 100644 --- a/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutableTest.java +++ b/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutableTest.java @@ -128,10 +128,10 @@ public class HttpClientConfigImmutableTest { private HttpClientConfig prepareTestClientConfig() { final String testUserName = "testUser"; - final String testUserPassword = SecurityUtil.INSTANCE.encrypt("testPassword").left().value(); + final String testUserPassword = SecurityUtil.encrypt("testPassword").left().value(); final int timeouts = 10; final String testKeyStore = "testKeyStore"; - final String testKeyStorePassword = SecurityUtil.INSTANCE.encrypt("testKeyStorePassword").left().value(); + final String testKeyStorePassword = SecurityUtil.encrypt("testKeyStorePassword").left().value(); testNumOfRetries = 10; testHeaders = Collections.emptyMap(); diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpClientFactoryTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpClientFactoryTest.java index c39bef0f4a..4958202811 100644 --- a/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpClientFactoryTest.java +++ b/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpClientFactoryTest.java @@ -51,10 +51,10 @@ public class HttpClientFactoryTest { private HttpClientConfigImmutable prepareTestClientConfigImmutable() { final String testUserName = "testUser"; - final String testUserPassword = SecurityUtil.INSTANCE.encrypt("testPassword").left().value(); + final String testUserPassword = SecurityUtil.encrypt("testPassword").left().value(); final int timeouts = 10; final String testKeyStore = "testKeyStore"; - final String testKeyStorePassword = SecurityUtil.INSTANCE.encrypt("testKeyStorePassword").left().value(); + final String testKeyStorePassword = SecurityUtil.encrypt("testKeyStorePassword").left().value(); int testNumOfRetries = 10; ComparableHttpRequestRetryHandler testRetryHandler = Mockito.mock(ComparableHttpRequestRetryHandler.class); diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpConnectionMngFactoryTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpConnectionMngFactoryTest.java index 2813d57cd0..deca8a6b17 100644 --- a/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpConnectionMngFactoryTest.java +++ b/common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpConnectionMngFactoryTest.java @@ -32,7 +32,7 @@ public class HttpConnectionMngFactoryTest { @Test public void validateFactoryCreatesValidHttpClientConnectionManager() { final String testKeyStore = "testKeyStore "; - final String testKeyStorePassword = SecurityUtil.INSTANCE.encrypt("testKeyStorePassword").left().value(); + final String testKeyStorePassword = SecurityUtil.encrypt("testKeyStorePassword").left().value(); ClientCertificate clientCertificate = new ClientCertificate(); clientCertificate.setKeyStore(testKeyStore); -- cgit 1.2.3-korg