Merge "removed some unused imports"

diff --combined ecomp-portal-BE-os/src/main/java/org/onap/portalapp/service/RemoteWebServiceCallServiceImpl.java
index 59c4f7a,b8edb5c..c0f944e
--- 1/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/service/RemoteWebServiceCallServiceImpl.java
--- 2/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/service/RemoteWebServiceCallServiceImpl.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/service/RemoteWebServiceCallServiceImpl.java
@@@ -38,13 -38,12 +38,12 @@@
  package org.onap.portalapp.service;
  
  import java.util.List;
 -
  import org.onap.portalapp.portal.domain.EPApp;
- import org.onap.portalapp.service.RemoteWebServiceCallService;
  import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
  import org.onap.portalsdk.core.onboarding.util.CipherUtil;
 +import org.onap.portalsdk.core.onboarding.util.KeyConstants;
 +import org.onap.portalsdk.core.onboarding.util.KeyProperties;
  import org.onap.portalsdk.core.service.WebServiceCallServiceImpl;
 -import org.onap.portalsdk.core.util.SystemProperties;
  import org.springframework.context.annotation.EnableAspectJAutoProxy;
  import org.springframework.stereotype.Service;
  import org.springframework.transaction.annotation.Transactional;
@@@ -68,10 -67,11 +67,10 @@@ public class RemoteWebServiceCallServic
                        logger.warn(EELFLoggerDelegate.errorLogger, "Failed to find application with UEB key " + requestUebKey);
                        return false;
                }
 -              
 -              String encryptedPwdDB = appRecord.getAppPassword();
 -              String appUserName = appRecord.getUsername();
 -              String decryptedPwd = CipherUtil.decryptPKC(encryptedPwdDB,
 -                              secretKey == null ? SystemProperties.getProperty(SystemProperties.Decryption_Key) : secretKey);
 +
 +              String encryptedPwdDB = appRecord.getAppBasicAuthPassword();
 +              String appUserName = appRecord.getAppBasicAuthUsername();
 +              String decryptedPwd = CipherUtil.decryptPKC(encryptedPwdDB,secretKey == null ? KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY) : secretKey);
                if (decryptedPwd.equals(requestPassword) && appUserName.equals(requestAppName))
                        return true;
                else