Merge "Improvements in RequestClient"

2 files changed, 62 insertions, 13 deletions

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/RequestClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/RequestClient.java
index 9b7801711f..318b3ba5af 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/RequestClient.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/RequestClient.java
@@ -25,7 +25,6 @@ package org.onap.so.apihandler.common;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
 import org.onap.so.utils.CryptoUtils;
 import org.slf4j.Logger;
@@ -70,22 +69,12 @@ public abstract class RequestClient {
     public abstract HttpResponse post(String request, String requestId, String requestTimeout, String schemaVersion,
             String serviceInstanceId, String action) throws IOException;
 
-    public abstract HttpResponse post(String request) throws ClientProtocolException, IOException;
+    public abstract HttpResponse post(String request) throws IOException;
 
-    public abstract HttpResponse post(RequestClientParameter parameterObject)
-            throws ClientProtocolException, IOException;
+    public abstract HttpResponse post(RequestClientParameter parameterObject) throws IOException;
 
     public abstract HttpResponse get() throws IOException;
 
-    protected String decryptPropValue(String prop, String defaultValue, String encryptionKey) {
-        try {
-            return CryptoUtils.decrypt(prop, encryptionKey);
-        } catch (GeneralSecurityException e) {
-            logger.debug("Security exception", e);
-        }
-        return defaultValue;
-    }
-
     protected String getEncryptedPropValue(String prop, String defaultValue, String encryptionKey) {
         try {
             return CryptoUtils.decrypt(prop, encryptionKey);
diff --git a/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandler/common/RequestClientTest.java b/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandler/common/RequestClientTest.java
new file mode 100644
index 0000000000..86b12ae8f6
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-common/src/test/java/org/onap/so/apihandler/common/RequestClientTest.java
@@ -0,0 +1,60 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (c) 2019 Samsung. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.apihandler.common;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RequestClientTest {
+
+    private static final String ENCRYPTION_KEY = "aa3871669d893c7fb8abbcda31b88b4f";
+
+    private RequestClient requestClient;
+
+    @Before
+    public void init() {
+        requestClient = Mockito.mock(RequestClient.class, Mockito.CALLS_REAL_METHODS);
+    }
+
+    @Test
+    public void getEncryptedPropValueWithSuccess() {
+
+        String encryptedValue = requestClient.getEncryptedPropValue(
+                "E8E19DD16CC90D2E458E8FF9A884CC0452F8F3EB8E321F96038DE38D5C1B0B02DFAE00B88E2CF6E2A4101AB2C011FC161212EE",
+                "defaultValue", ENCRYPTION_KEY);
+
+        Assert.assertEquals("apihBpmn:camunda-R1512!", encryptedValue);
+    }
+
+    @Test
+    public void getDefaultEncryptedPropValue() {
+
+        String encryptedValue =
+                requestClient.getEncryptedPropValue("012345678901234567890123456789", "defaultValue", ENCRYPTION_KEY);
+
+        Assert.assertEquals("defaultValue", encryptedValue);
+    }
+
+}