summaryrefslogtreecommitdiffstats
path: root/common-app-api
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2022-09-06 13:08:14 +0100
committerVasyl Razinkov <vasyl.razinkov@est.tech>2022-09-06 12:08:56 +0000
commitc7d44853b881daadccc6c05cddcbb89743f1bffc (patch)
treeb5690f480a9a303b300968192cd5b2a40a1cd898 /common-app-api
parent3f48762a391733561bb1ed171ea0a15bf0ea50ee (diff)
Update SDC with new 'security-util-lib' version
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Iece4430f2ebceb8bfb1ea1a89c541335e2f35b11 Issue-ID: SDC-4165
Diffstat (limited to 'common-app-api')
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/common/http/config/BasicAuthorization.java2
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/common/http/config/ClientCertificate.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutableTest.java4
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpClientFactoryTest.java4
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/http/client/api/HttpConnectionMngFactoryTest.java2
5 files changed, 7 insertions, 7 deletions
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<String, String> passkey = SecurityUtil.INSTANCE.decrypt(password);
+ Either<String, String> 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<String, String> passkey = SecurityUtil.INSTANCE.decrypt(keyStorePassword);
+ Either<String, String> 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);