X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FMicroserviceController.java;h=b7d3cc78f04466e66a4684f5fa2d9d743a3bbb54;hb=ad4dc7cf7d0411a08733bfef27a6954a098f7052;hp=3f507726593b8d7c7a166fb7b0b7600466aa0231;hpb=595485a45c2c40393930cf8c1d172dd6ce791aef;p=portal.git

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 3f507726..b7d3cc78 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
@@ -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");
@@ -58,6 +60,7 @@ 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;
@@ -68,6 +71,10 @@ 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.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;
 import org.springframework.web.client.RestTemplate;
@@ -78,7 +85,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,17 +96,14 @@ 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");
 			}
@@ -115,13 +119,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 +133,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 +146,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 {