Security/ Package Name changes

[portal.git] / ecomp-portal-BE-os / src / main / java / org / onap / portalapp / service / RemoteWebServiceCallServiceImpl.java

diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/service/RemoteWebServiceCallServiceImpl.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/service/RemoteWebServiceCallServiceImpl.java
similarity index 84%
rename from ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/service/RemoteWebServiceCallServiceImpl.java
rename to ecomp-portal-BE-os/src/main/java/org/onap/portalapp/service/RemoteWebServiceCallServiceImpl.java
index 0b10caf..f337705 100644 (file)
--- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/service/RemoteWebServiceCallServiceImpl.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/service/RemoteWebServiceCallServiceImpl.java
@@ -2,11 +2,11 @@
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * under the Apache License, Version 2.0 (the "License");
  * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
  * you may not use this documentation except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -35,15 +35,16 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.portalapp.service;
+package org.onap.portalapp.service;
 
 import java.util.List;
 
-import org.openecomp.portalapp.portal.domain.EPApp;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
-import org.openecomp.portalsdk.core.service.WebServiceCallServiceImpl;
-import org.openecomp.portalsdk.core.util.SystemProperties;
+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.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;
@@ -70,7 +71,7 @@ public class RemoteWebServiceCallServiceImpl extends WebServiceCallServiceImpl i
                
                String encryptedPwdDB = appRecord.getAppPassword();
                String appUserName = appRecord.getUsername();
-               String decryptedPwd = CipherUtil.decrypt(encryptedPwdDB,
+               String decryptedPwd = CipherUtil.decryptPKC(encryptedPwdDB,
                                secretKey == null ? SystemProperties.getProperty(SystemProperties.Decryption_Key) : secretKey);
                if (decryptedPwd.equals(requestPassword) && appUserName.equals(requestAppName))
                        return true;
@@ -110,9 +111,4 @@ public class RemoteWebServiceCallServiceImpl extends WebServiceCallServiceImpl i
                return (list == null || list.size() == 0) ? null : (EPApp) list.get(0);
        }
 
-       public static void main(String args[]) throws Exception {
-               String decryptedPwd = CipherUtil.decrypt("okYTaDrhzibcbGVq5mjkVQ==", "AGLDdG4D04BKm2IxIWEr8o==");
-               System.out.print(decryptedPwd);
-       }
-       
 }