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=2e1a2b46bb1fc25f042916256d4351335e4caf29;hb=31643c4db220bda9ffd9ac06d884f9035bbc4e1f;hp=3f507726593b8d7c7a166fb7b0b7600466aa0231;hpb=d65ad49ae821bb2e3bf1c75886c13df004e00613;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..2e1a2b46 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
@@ -58,6 +58,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;
@@ -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();
@@ -96,10 +97,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");
 			}
@@ -129,10 +127,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");
 			}