diff options
author | Sunder Tattavarada <statta@att.com> | 2020-11-25 15:13:52 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-11-25 15:13:52 +0000 |
commit | a49678cb3d2c7ef2b3e5fecc7f52b85df46e8268 (patch) | |
tree | a6b723e7a08e51e3bf9fdfb353a42c810e036c08 /ecomp-portal-BE-common/src/main/java/org/onap | |
parent | 722e28620ecce86274bbd46cca9d315595767702 (diff) | |
parent | b88200ce0d30b5ad0433c70555f5b8ddcab98d3b (diff) |
Merge "Microservice Onboarding Issue resolved"
Diffstat (limited to 'ecomp-portal-BE-common/src/main/java/org/onap')
-rw-r--r-- | ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/MicroserviceController.java | 8 |
1 files changed, 6 insertions, 2 deletions
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 a80a3b42..2c04ce83 100644 --- 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 @@ -51,6 +51,7 @@ 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; @@ -101,9 +102,12 @@ public class MicroserviceController extends EPRestrictedBaseController { "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()); |