import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+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.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
* @return PortalRestResponse with success or failure
*/
@ApiOperation(value = "Creates a new user as a Portal administrator.", response = PortalRestResponse.class)
- @RequestMapping(value = "/portalAdmin", method = RequestMethod.POST, produces = "application/json")
+ @PostMapping(value = "/portalAdmin", produces = "application/json")
@ResponseBody
public PortalRestResponse<String> postPortalAdmin(HttpServletRequest request, HttpServletResponse response,
@Valid @RequestBody EPUser epUser) {
* @return OnboardingApp objects
*/
@ApiOperation(value = "Gets the specified application that is on-boarded in Portal.", response = OnboardingApp.class)
- @RequestMapping(value = {ONBOARD_APP + "/{appId}"}, method = RequestMethod.GET, produces = "application/json")
+ @GetMapping(value = {ONBOARD_APP + "/{appId}"}, produces = "application/json")
@ResponseBody
public OnboardingApp getOnboardAppExternal(HttpServletRequest request, HttpServletResponse response,
@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;
* @return PortalRestResponse
*/
@ApiOperation(value = "Adds a new application to Portal.", response = PortalRestResponse.class)
- @RequestMapping(value = {ONBOARD_APP}, method = RequestMethod.POST, produces = "application/json")
+ @PostMapping(value = {ONBOARD_APP}, produces = "application/json")
@ResponseBody
public PortalRestResponse<String> postOnboardAppExternal(HttpServletRequest request, HttpServletResponse response,
@Valid @RequestBody OnboardingApp newOnboardApp) {
return portalResponse;
}
// Validate fields
- if (newOnboardApp.id != null) {
+ if (newOnboardApp.getId() != null) {
portalResponse.setStatus(PortalRestStatusEnum.ERROR);
portalResponse.setMessage("Unexpected field: id");
return portalResponse;
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;
}
* @return PortalRestResponse
*/
@ApiOperation(value = "Updates information about an on-boarded application in Portal.", response = PortalRestResponse.class)
- @RequestMapping(value = {ONBOARD_APP + "/{appId}"}, method = RequestMethod.PUT, produces = "application/json")
+ @PutMapping(value = {ONBOARD_APP + "/{appId}"}, produces = "application/json")
@ResponseBody
public PortalRestResponse<String> putOnboardAppExternal(HttpServletRequest request, HttpServletResponse response,
@PathVariable("appId") Long appId, @Valid @RequestBody OnboardingApp oldOnboardApp) {
// 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;
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;
}
}
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();
}
}