X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fservice%2FApplicationsRestClientServiceImpl.java;h=959e392f7dd9b74d3086cacafd6aeacb88a72f2e;hb=230c71614b1d2fb71a8fb482c749ff5a6dad65d8;hp=09d78046185f24cd320dd6531cfdf3087e17c73b;hpb=e276ad30dc38f55e06877df8fd0d3372534c8f47;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
index 09d78046..959e392f 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
@@ -176,8 +176,8 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
 		
 		if (externalApp != null) {
 			String appBaseUri = (type == SystemType.APPLICATION) ? externalApp.getAppRestEndpoint() : "";
-			String username = (type == SystemType.APPLICATION) ? externalApp.getUsername(): "";
-			String encriptedPwd = (type == SystemType.APPLICATION) ? externalApp.getAppPassword(): "";
+			String username = (type == SystemType.APPLICATION) ? externalApp.getAppBasicAuthUsername(): "";
+			String encriptedPwd = (type == SystemType.APPLICATION) ? externalApp.getAppBasicAuthPassword(): "";
 
 			String appName = (type == SystemType.APPLICATION) ? externalApp.getName(): "";
 			String decreptedAppPwd = StringUtils.EMPTY;
@@ -202,16 +202,16 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
 			WebClient client = createClientForPath(appBaseUri, restPath);
 			
 			
-			if(externalApp.getAppPassword().isEmpty() || externalApp.getAppPassword()==null){
+			if(externalApp.getAppBasicAuthPassword().isEmpty() || externalApp.getAppBasicAuthPassword()==null){
 				logger.debug(EELFLoggerDelegate.debugLogger, "Entering in the externalApp get app password contains null : {}");
 
 				externalApp = appsCacheService.getApp(1L);
 				logger.debug(EELFLoggerDelegate.debugLogger, "external App Information : {}",externalApp);
 
-				String mechidUsername=externalApp.getUsername();
+				String mechidUsername=externalApp.getAppBasicAuthUsername();
 				logger.debug(EELFLoggerDelegate.debugLogger, "external App mechidUsername Information : {}",mechidUsername);
 
-				String password=externalApp.getAppPassword();
+				String password=externalApp.getAppBasicAuthPassword();
 				String decreptedexternalAppPwd = StringUtils.EMPTY;
 				try {
 					decreptedexternalAppPwd = CipherUtil.decryptPKC(password,