X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FAppsControllerExternalRequest.java;h=a88728a073ee6121831da0756ada31b03b593ff3;hb=230c71614b1d2fb71a8fb482c749ff5a6dad65d8;hp=28ec0e1a4c6177483263c755d04920e227a61395;hpb=6735f1d7ac1181dee536b6deaa024085f5ef2e75;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequest.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequest.java
index 28ec0e1a..a88728a0 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequest.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsControllerExternalRequest.java
@@ -68,7 +68,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -209,7 +208,7 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 		@PathVariable("appId") Long appId) {
 		EPApp epApp = appService.getApp(appId);
 		OnboardingApp obApp = new OnboardingApp();
-		epApp.setAppPassword(EPCommonSystemProperties.APP_DISPLAY_PASSWORD); //to hide password from get request
+		epApp.setAppBasicAuthPassword(EPCommonSystemProperties.APP_DISPLAY_PASSWORD); //to hide password from get request
 		appService.createOnboardingFromApp(epApp, obApp);
 		EcompPortalUtils.logAndSerializeObject(logger, "getOnboardAppExternal", RESPONSE, obApp);
 		return obApp;
@@ -253,7 +252,7 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 				return portalResponse;
 		}
 		// Validate fields
-		if (newOnboardApp.id != null) {
+		if (newOnboardApp.getId() != null) {
 			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
 			portalResponse.setMessage("Unexpected field: id");
 			return portalResponse;
@@ -267,10 +266,10 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 
 		try {
 		    List<EPUser> userList;
-			userList = userService.getUserByUserId(newOnboardApp.myLoginsAppOwner);
+			userList = userService.getUserByUserId(newOnboardApp.getMyLoginsAppOwner());
 			if (userList == null || userList.size() != 1) {
                 portalResponse.setStatus(PortalRestStatusEnum.ERROR);
-				portalResponse.setMessage("Failed to find user: " + newOnboardApp.myLoginsAppOwner);
+				portalResponse.setMessage("Failed to find user: " + newOnboardApp.getMyLoginsAppOwner());
 
 				return portalResponse;
 			}
@@ -344,7 +343,7 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 
 		// Validate fields.
 
-		if (appId == null || !appId.equals(oldOnboardApp.id)) {
+		if (appId == null || !appId.equals(oldOnboardApp.getId())) {
 			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
 			portalResponse.setMessage("Unexpected value for field: id");
 			return portalResponse;
@@ -359,10 +358,10 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 
 		try {
             List<EPUser> userList;
-			userList = userService.getUserByUserId(oldOnboardApp.myLoginsAppOwner);
+			userList = userService.getUserByUserId(oldOnboardApp.getMyLoginsAppOwner());
 			if (userList == null || userList.size() != 1) {
                 portalResponse.setStatus(PortalRestStatusEnum.ERROR);
-				portalResponse.setMessage("Failed to find user: " + oldOnboardApp.myLoginsAppOwner);
+				portalResponse.setMessage("Failed to find user: " + oldOnboardApp.getMyLoginsAppOwner());
 
 				return portalResponse;
             }
@@ -399,15 +398,15 @@ public class AppsControllerExternalRequest implements BasicAuthenticationControl
 	}
 
 	private boolean checkIfFieldsAreNull(OnboardingApp onboardingApp) {
-		return onboardingApp.name == null || onboardingApp.url == null || onboardingApp.restUrl == null
-			|| onboardingApp.myLoginsAppOwner == null || onboardingApp.restrictedApp == null
-			|| onboardingApp.isOpen == null || onboardingApp.isEnabled == null;
+		return onboardingApp.getAppName() == null || onboardingApp.getLandingPage() == null || onboardingApp.getRestUrl() == null
+			|| onboardingApp.getMyLoginsAppOwner() == null || onboardingApp.getRestrictedApp() == null
+			|| onboardingApp.getIsOpen() == null || onboardingApp.getIsEnabled() == null;
 	}
 
 	private boolean checkIfFieldsAreEmpty(OnboardingApp onboardingApp) {
-		return onboardingApp.name.trim().isEmpty()
-			|| onboardingApp.url.trim().isEmpty()
-			|| onboardingApp.restUrl.trim().isEmpty()
-			|| onboardingApp.myLoginsAppOwner.trim().isEmpty();
+		return onboardingApp.getAppName().trim().isEmpty()
+			|| onboardingApp.getLandingPage().trim().isEmpty()
+			|| onboardingApp.getRestUrl().trim().isEmpty()
+			|| onboardingApp.getMyLoginsAppOwner().trim().isEmpty();
 	}
 }