Fix some Sonar Blocker issues in apihandler/common

Some sonar code fixes are done in this patch.

https://sonar.onap.org/issues/search#issues=AV3BntKO5bp_wwmIVCLv
https://sonar.onap.org/issues/search#issues=AV5mhwQk32hFUzlqebFJ
https://sonar.onap.org/issues/search#issues=AV3BntKc5bp_wwmIVCMJ
https://sonar.onap.org/issues/search#issues=AV3BntKi5bp_wwmIVCMK
https://sonar.onap.org/issues/search#issues=AV3BntKu5bp_wwmIVCMQ
https://sonar.onap.org/issues/search#issues=AV3BntK35bp_wwmIVCMX
https://sonar.onap.org/issues/search#issues=AV5mhwRN32hFUzlqebFQ
https://sonar.onap.org/issues/search#issues=AV3BntLG5bp_wwmIVCMc
https://sonar.onap.org/issues/search#issues=AV3BntLR5bp_wwmIVCMh

Change-Id: I3ba77adec1951fb7153ed640eb1ea0a4a3ed3e6b
Issue-ID: SO-165
Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>

1 files changed, 1 insertions, 7 deletions

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java
index 1324e12fbc..addf4e11a5 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/common/RequestClient.java
@@ -22,7 +22,6 @@ package org.openecomp.mso.apihandler.common;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
-import java.util.Properties;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ClientProtocolException;
@@ -83,16 +82,11 @@ public abstract class RequestClient {
 	
 	protected String getEncryptedPropValue (String prop, String defaultValue, String encryptionKey) {
 		 try {
-			 String result = CryptoUtils.decrypt(prop, encryptionKey);
-			 return result;
+			 return CryptoUtils.decrypt(prop, encryptionKey);
 		 }	
 		 catch (GeneralSecurityException e) {
 			 msoLogger.debug("Security exception", e);
 		 }
 		 return defaultValue;
 	 }
-
-	
-
-
 }