Microservice Onboarding Issue resolved

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

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java
index 3f50772..2c04ce8 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java
@@ -4,6 +4,8 @@
  * ===================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ *  Modification Copyright © 2020 IBM.
+ * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * under the Apache License, Version 2.0 (the "License");
@@ -39,25 +41,22 @@ package org.onap.portalapp.portal.controller;
 
 import java.util.List;
 
-import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import javax.validation.ConstraintViolation;
 import javax.validation.Valid;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
 import org.onap.portalapp.controller.EPRestrictedBaseController;
 import org.onap.portalapp.portal.domain.MicroserviceData;
 import org.onap.portalapp.portal.domain.WidgetCatalog;
 import org.onap.portalapp.portal.domain.WidgetServiceHeaders;
 import org.onap.portalapp.portal.ecomp.model.PortalRestResponse;
 import org.onap.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.onap.portalapp.portal.exceptions.DuplicateRecordException;
 import org.onap.portalapp.portal.logging.aop.EPAuditLog;
 import org.onap.portalapp.portal.service.WidgetMService;
 import org.onap.portalapp.portal.service.MicroserviceService;
 import org.onap.portalapp.portal.utils.EcompPortalUtils;
+import org.onap.portalapp.validation.DataValidator;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -67,8 +66,10 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 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.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
@@ -78,7 +79,7 @@ import org.springframework.web.client.RestTemplate;
 @EnableAspectJAutoProxy
 @EPAuditLog
 public class MicroserviceController extends EPRestrictedBaseController {
-       public static final ValidatorFactory VALIDATOR_FACTORY = Validation.buildDefaultValidatorFactory();
+       private final DataValidator dataValidator = new DataValidator();
        
        String whatService = "widgets-service";
        RestTemplate template = new RestTemplate();
@@ -89,24 +90,24 @@ public class MicroserviceController extends EPRestrictedBaseController {
        @Autowired
        private MicroserviceService microserviceService;
 
-       @RequestMapping(value = { "/portalApi/microservices" }, method = RequestMethod.POST)
+       @PostMapping(value = { "/portalApi/microservices" })
        public PortalRestResponse<String> createMicroservice(HttpServletRequest request, HttpServletResponse response,
                        @Valid @RequestBody MicroserviceData newServiceData) throws Exception {
                if (newServiceData == null) {
                        return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "FAILURE",
                                "MicroserviceData cannot be null or empty");
                }else {
-                       Validator validator = VALIDATOR_FACTORY.getValidator();
-
-                       Set<ConstraintViolation<MicroserviceData>> constraintViolations = validator.validate(newServiceData);
-                       if(!constraintViolations.isEmpty()){
+                       if(!dataValidator.isValid(newServiceData)){
                                return new PortalRestResponse<>(PortalRestStatusEnum.ERROR,
                                        "ERROR", "MicroserviceData is not valid");
                        }
                }
-               long serviceId = microserviceService.saveMicroservice(newServiceData);
-
                try {
+                       List<MicroserviceData> microServiceData = microserviceService.getMicroserviceData();
+                       for(MicroserviceData exitMicroservice: microServiceData)
+                               if(exitMicroservice.getName().equalsIgnoreCase(newServiceData.getName()))
+                                       throw new DuplicateRecordException("Microservice already exists: " + exitMicroservice.getName());
+                       long serviceId = microserviceService.saveMicroservice(newServiceData);
                        microserviceService.saveServiceParameters(serviceId, newServiceData.getParameterList());
                } catch (Exception e) {
                        return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "FAILURE", e.getMessage());
@@ -115,13 +116,13 @@ public class MicroserviceController extends EPRestrictedBaseController {
                return new PortalRestResponse<>(PortalRestStatusEnum.OK, "SUCCESS", "");
        }
 
-       @RequestMapping(value = { "/portalApi/microservices" }, method = RequestMethod.GET)
+       @GetMapping(value = { "/portalApi/microservices" })
        public List<MicroserviceData> getMicroservice(HttpServletRequest request, HttpServletResponse response)
                        throws Exception {
                return microserviceService.getMicroserviceData();
        }
 
-       @RequestMapping(value = { "/portalApi/microservices/{serviceId}" }, method = RequestMethod.PUT)
+       @PutMapping(value = { "/portalApi/microservices/{serviceId}" })
        public PortalRestResponse<String> updateMicroservice(HttpServletRequest request, HttpServletResponse response,
                        @PathVariable("serviceId") long serviceId, @Valid @RequestBody MicroserviceData newServiceData) {
 
@@ -129,10 +130,7 @@ public class MicroserviceController extends EPRestrictedBaseController {
                        return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "FAILURE",
                                "MicroserviceData cannot be null or empty");
                }else {
-                       Validator validator = VALIDATOR_FACTORY.getValidator();
-
-                       Set<ConstraintViolation<MicroserviceData>> constraintViolations = validator.validate(newServiceData);
-                       if(!constraintViolations.isEmpty()){
+                       if(!dataValidator.isValid(newServiceData)){
                                return new PortalRestResponse<>(PortalRestStatusEnum.ERROR,
                                        "ERROR", "MicroserviceData is not valid");
                        }
@@ -145,7 +143,7 @@ public class MicroserviceController extends EPRestrictedBaseController {
                return new PortalRestResponse<>(PortalRestStatusEnum.OK, "SUCCESS", "");
        }
        
-       @RequestMapping(value = { "/portalApi/microservices/{serviceId}" }, method = RequestMethod.DELETE)
+       @DeleteMapping(value = { "/portalApi/microservices/{serviceId}" })
        public PortalRestResponse<String> deleteMicroservice(HttpServletRequest request, HttpServletResponse response,
                        @PathVariable("serviceId") long serviceId) {
                try {