1 files changed, 9 insertions, 13 deletions

diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyValidationController.java b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyValidationController.java
index cc6903b91..0f8b3795f 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyValidationController.java
+++ b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyValidationController.java
@@ -401,10 +401,8 @@ public class PolicyValidationController extends RestrictedBaseController {
 									int endNum = Integer.parseInt(tempString[1]);
 									String returnString = "Invalid Range:" + rMap.getKey() + " must be between " 
 											+ startNum + " - "  + endNum + ",";
-									if (isInteger(value.replace("\"", ""))){
+									if (PolicyUtils.isInteger(value.replace("\"", ""))){
 										int result = Integer.parseInt(value.replace("\"", ""));
-
-
 										if (result < startNum || result > endNum){
 											responseString.append(returnString);									
 											valid = false;
@@ -492,13 +490,20 @@ public class PolicyValidationController extends RestrictedBaseController {
 							if(policyData.getYamlparams().getLimit()==null){
 								responseString.append(" Guard Params <b>Limit</b> is Required " + "<br>");
 								valid = false;
-							}else if(!isInteger(policyData.getYamlparams().getLimit())){
+							}else if(!PolicyUtils.isInteger(policyData.getYamlparams().getLimit())){
 								responseString.append(" Guard Params <b>Limit</b> Should be Integer " + "<br>");
 								valid = false;
 							}
 							if(policyData.getYamlparams().getTimeWindow()==null){
 								responseString.append("Guard Params <b>Time Window</b> is Required" + "<br>");
 								valid = false;
+							}else if(!PolicyUtils.isInteger(policyData.getYamlparams().getTimeWindow())){
+								responseString.append(" Guard Params <b>Time Window</b> Should be Integer " + "<br>");
+								valid = false;
+							}
+							if(policyData.getYamlparams().getTimeUnits()==null){
+								responseString.append("Guard Params <b>Time Units</b> is Required" + "<br>");
+								valid = false;
 							}
 						}else if("GUARD_BL_YAML".equals(policyData.getRuleProvider())){
 							if(policyData.getYamlparams().getBlackList()==null || policyData.getYamlparams().getBlackList().isEmpty()){
@@ -623,15 +628,6 @@ public class PolicyValidationController extends RestrictedBaseController {
 		return null;
 	}
 
-	protected boolean isInteger(String number) {
-		try{
-			Integer.parseInt(number);
-		}catch(NumberFormatException e){
-			return false;
-		}
-		return true;
-	}
-
 	protected String  emptyValidator(String field){
 		String error;
 		if ("".equals(field) || field.contains(" ") || !field.matches("^[a-zA-Z0-9_]*$")) {