Merge "replaced mapping annotation with appropriate one"

[portal.git] / ecomp-portal-BE-common / src / main / java / org / onap / portalapp / portal / controller / BasicAuthAccountController.java

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/BasicAuthAccountController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/BasicAuthAccountController.java
index 9024570..ab040bb 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/BasicAuthAccountController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/BasicAuthAccountController.java
@@ -53,12 +53,17 @@ import org.onap.portalapp.portal.logging.aop.EPAuditLog;
 import org.onap.portalapp.portal.service.AdminRolesService;
 import org.onap.portalapp.portal.service.BasicAuthAccountService;
 import org.onap.portalapp.util.EPUserUtils;
+import org.onap.portalapp.validation.DataValidator;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 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.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -74,6 +79,7 @@ public class BasicAuthAccountController extends EPRestrictedBaseController {
     private static final String ADMIN_ONLY_OPERATIONS = "Admin Only Operation! ";
 
     private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(BasicAuthAccountController.class);
+    private final DataValidator dataValidator = new DataValidator();
 
        @Autowired
        private BasicAuthAccountService basicAuthAccountService;
@@ -94,10 +100,12 @@ public class BasicAuthAccountController extends EPRestrictedBaseController {
         * @throws Exception
         *             on failure
         */
-       @RequestMapping(value = { "/portalApi/basicAuthAccount" }, method = RequestMethod.POST)
+       @PostMapping(value = { "/portalApi/basicAuthAccount" })
        public PortalRestResponse<String> createBasicAuthAccount(HttpServletRequest request, HttpServletResponse response,
                        @RequestBody BasicAuthCredentials newBasicAuthAccount) throws Exception {
 
+
+
                EPUser user = EPUserUtils.getUserSession(request);
                if (!adminRolesService.isSuperAdmin(user)) {
             return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, AUTHORIZATION_REQUIRED,
@@ -108,7 +116,18 @@ public class BasicAuthAccountController extends EPRestrictedBaseController {
             return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, FAILURE,
                                        "newBasicAuthAccount cannot be null or empty");
                }
-               long accountId = basicAuthAccountService.saveBasicAuthAccount(newBasicAuthAccount);
+
+               if(!dataValidator.isValid(newBasicAuthAccount)){
+                       return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "createBasicAuthAccount() failed, new credential are not safe",
+                               "");
+               }
+
+               long accountId;
+               try {
+                       accountId = basicAuthAccountService.saveBasicAuthAccount(newBasicAuthAccount);
+               } catch (Exception e){
+                       return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, FAILURE, e.getMessage());
+               }
 
                List<Long> endpointIdList = new ArrayList<>();
                try {
@@ -138,7 +157,7 @@ public class BasicAuthAccountController extends EPRestrictedBaseController {
         *             on failure
         */
 
-       @RequestMapping(value = { "/portalApi/basicAuthAccount" }, method = RequestMethod.GET)
+       @GetMapping(value = { "/portalApi/basicAuthAccount" })
        public PortalRestResponse<List<BasicAuthCredentials>> getBasicAuthAccount(HttpServletRequest request,
                        HttpServletResponse response) throws Exception {
 
@@ -167,7 +186,7 @@ public class BasicAuthAccountController extends EPRestrictedBaseController {
         * @throws Exception
         *             on failure
         */
-       @RequestMapping(value = { "/portalApi/basicAuthAccount/{accountId}" }, method = RequestMethod.PUT)
+       @PutMapping(value = { "/portalApi/basicAuthAccount/{accountId}" })
        public PortalRestResponse<String> updateAccount(HttpServletRequest request, HttpServletResponse response,
                        @PathVariable("accountId") long accountId, @RequestBody BasicAuthCredentials newBasicAuthAccount)
                        throws Exception {
@@ -204,7 +223,7 @@ public class BasicAuthAccountController extends EPRestrictedBaseController {
         * @throws Exception
         *             on failure
         */
-       @RequestMapping(value = { "/portalApi/basicAuthAccount/{accountId}" }, method = RequestMethod.DELETE)
+       @DeleteMapping(value = { "/portalApi/basicAuthAccount/{accountId}" })
        public PortalRestResponse<String> deleteAccount(HttpServletRequest request, HttpServletResponse response,
                        @PathVariable("accountId") long accountId) throws Exception {