Merge "lowered code smells"

diff --combined ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java
index 0655412,f51b6cd..99b4fce
--- 1/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java
--- 2/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java
@@@ -667,7 -667,7 +667,7 @@@ public class AppsController extends EPR
                        String appId = request.getParameter("appParam");
                        app = appService.getApp(Long.valueOf(appId));
                        if(!EcompPortalUtils.checkIfRemoteCentralAccessAllowed()) {
 -                              app.setCentralAuth(false);
 +                              app.setRolesInAAF(false);
                        }
                        if (user != null && (adminRolesService.isAccountAdminOfApplication(user, app)
                                        || (adminRolesService.isSuperAdmin(user) && app.getId().equals(PortalConstants.PORTAL_APP_ID))))
@@@ -721,7 -721,7 +721,7 @@@
        /**
         * 
         * @param request
 -       *            HTTP servlet request
 +       *            HTTP servlet request‰
         * @param response
         *            HTTP servlet response
         * @param modifiedOnboardingApp
@@@ -734,7 -734,7 +734,7 @@@
                        @RequestBody OnboardingApp modifiedOnboardingApp, HttpServletResponse response) {
                FieldsValidator fieldsValidator = null;
                EPUser user = null;
 -              EPApp oldEPApp = appService.getApp(modifiedOnboardingApp.id);
 +              EPApp oldEPApp = appService.getApp(modifiedOnboardingApp.getId());
                
                try {
                        user = EPUserUtils.getUserSession(request);
@@@ -746,7 -746,7 +746,7 @@@
                                                                                                response.getStatus());
                                return fieldsValidator;
                        } else {
 -                              if((oldEPApp.getCentralAuth() && modifiedOnboardingApp.isCentralAuth && !oldEPApp.getNameSpace().equalsIgnoreCase(modifiedOnboardingApp.nameSpace) && modifiedOnboardingApp.nameSpace!= null ) || (!oldEPApp.getCentralAuth() && modifiedOnboardingApp.isCentralAuth && modifiedOnboardingApp.nameSpace!= null))
 +                              if((oldEPApp.getRolesInAAF() && modifiedOnboardingApp.getRolesInAAF() && !oldEPApp.getNameSpace().equalsIgnoreCase(modifiedOnboardingApp.getNameSpace()) && modifiedOnboardingApp.getNameSpace()!= null ) || (!oldEPApp.getRolesInAAF() && modifiedOnboardingApp.getRolesInAAF() && modifiedOnboardingApp.getNameSpace() != null))
                                {
                                        checkIfNameSpaceIsValid(modifiedOnboardingApp, fieldsValidator, response);
                                }       
@@@ -795,7 -795,7 +795,7 @@@
                                EcompPortalUtils.setBadPermissions(user, response, "postOnboardingApps");
                        } else {
                                newOnboardingApp.normalize();
 -                              if(newOnboardingApp.isCentralAuth != null && newOnboardingApp.isCentralAuth)
 +                              if(newOnboardingApp.getRolesInAAF() != null && newOnboardingApp.getRolesInAAF())
                                        checkIfNameSpaceIsValid(newOnboardingApp, fieldsValidator, response);
                                fieldsValidator = appService.addOnboardingApp(newOnboardingApp, user);
                                response.setStatus(fieldsValidator.httpStatusCode.intValue());
@@@ -883,7 -883,7 +883,7 @@@
         *            Application ID
         * @return Bytes with the app thumbnail image; null if not available.
         */
-       @RequestMapping(value = { "/portalApi/appThumbnail/{appId}" }, method = { RequestMethod.GET })
+       @GetMapping(value = { "/portalApi/appThumbnail/{appId}" })
        public HttpEntity<byte[]> getAppThumbnail(HttpServletRequest request, @PathVariable("appId") Long appId,
                        HttpServletResponse response) {
                EPApp app = appService.getApp(appId);
@@@ -911,7 -911,7 +911,7 @@@
        private void checkIfNameSpaceIsValid(OnboardingApp modifiedOnboardingApp, FieldsValidator fieldsValidator, HttpServletResponse response)
                throws InvalidApplicationException {
                try {
 -                      ResponseEntity<String> res  = appService.checkIfNameSpaceIsValid(modifiedOnboardingApp.nameSpace);
 +                      ResponseEntity<String> res  = appService.checkIfNameSpaceIsValid(modifiedOnboardingApp.getNameSpace());
                } catch (HttpClientErrorException e) {
                        logger.error(EELFLoggerDelegate.errorLogger, "checkIfNameSpaceExists failed", e);
                        EPLogUtil.logExternalAuthAccessAlarm(logger, e.getStatusCode());