1 files changed, 61 insertions, 65 deletions
diff --git a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java b/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java
index 4d6b1cf..0cb8f36 100644
--- a/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java
+++ b/src/main/java/org/onap/sdc/toscaparser/api/elements/constraints/GreaterOrEqual.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,73 +21,69 @@
 package org.onap.sdc.toscaparser.api.elements.constraints;
 
 import org.onap.sdc.toscaparser.api.common.JToscaValidationIssue;
-
-import java.util.Date;
-
 import org.onap.sdc.toscaparser.api.functions.Function;
 import org.onap.sdc.toscaparser.api.utils.ThreadLocalsHolder;
 
+import java.util.Arrays;
+import java.util.Date;
+
 public class GreaterOrEqual extends Constraint {
-	// Constraint class for "greater_or_equal"
-
-	// Constrains a property or parameter to a value greater than or equal
-	// to ('>=') the value declared.
-
-	protected void _setValues() {
-
-		constraintKey = GREATER_OR_EQUAL;
-
-		validTypes.add("Integer");
-		validTypes.add("Double");
-		validTypes.add("Float");
-		// timestamps are loaded as Date objects
-		validTypes.add("Date");
-		//validTypes.add("datetime.date");
-		//validTypes.add("datetime.time");
-		//validTypes.add("datetime.datetime");
-		
-		validPropTypes.add(Schema.INTEGER);
-		validPropTypes.add(Schema.FLOAT);
-		validPropTypes.add(Schema.TIMESTAMP);
-		validPropTypes.add(Schema.SCALAR_UNIT_SIZE);
-		validPropTypes.add(Schema.SCALAR_UNIT_FREQUENCY);
-		validPropTypes.add(Schema.SCALAR_UNIT_TIME);
-		
-	}
-	
-	public GreaterOrEqual(String name,String type,Object c) {
-		super(name,type,c);
-		
-		if(!validTypes.contains(constraintValue.getClass().getSimpleName())) {
-	        ThreadLocalsHolder.getCollector().appendValidationIssue(new JToscaValidationIssue("JE104", "InvalidSchemaError: The property \"greater_or_equal\" expects comparable values")); 
-		}
-	}
-	
-	
-
-	@Override
-	protected boolean _isValid(Object value) {
-	    if(Function.isFunction(value)) {
-	        return true;
-		}
-
-	    // timestamps
-	    if(value instanceof Date) {
-	    	if(constraintValue instanceof Date) {
-	    		return !((Date)value).before((Date)constraintValue);
-	    	}
-	    	return false;
-	    }
-	    // all others
-		Double n1 = new Double(value.toString());
-		Double n2 = new Double(constraintValue.toString());
-		return n1 >= n2;
-	}
-
-	protected String _errMsg(Object value) {
-	    return String.format("The value \"%s\" of property \"%s\" must be greater or equal to \"%s\"",
-	    		valueMsg,propertyName,constraintValueMsg);
-	}
+    // Constraint class for "greater_or_equal"
+
+    // Constrains a property or parameter to a value greater than or equal
+    // to ('>=') the value declared.
+
+    protected void setValues() {
+
+        setConstraintKey(GREATER_OR_EQUAL);
+
+        // timestamps are loaded as Date objects
+        addValidTypes(Arrays.asList("Integer", "Double", "Float", "Date"));
+        //validTypes.add("datetime.date");
+        //validTypes.add("datetime.time");
+        //validTypes.add("datetime.datetime");
+
+        validPropTypes.add(Schema.INTEGER);
+        validPropTypes.add(Schema.FLOAT);
+        validPropTypes.add(Schema.TIMESTAMP);
+        validPropTypes.add(Schema.SCALAR_UNIT_SIZE);
+        validPropTypes.add(Schema.SCALAR_UNIT_FREQUENCY);
+        validPropTypes.add(Schema.SCALAR_UNIT_TIME);
+
+    }
+
+    public GreaterOrEqual(String name, String type, Object c) {
+        super(name, type, c);
+
+        if (!validTypes.contains(constraintValue.getClass().getSimpleName())) {
+            ThreadLocalsHolder.getCollector().appendValidationIssue(new JToscaValidationIssue("JE104", "InvalidSchemaError: The property \"greater_or_equal\" expects comparable values"));
+        }
+    }
+
+
+    @Override
+    protected boolean isValid(Object value) {
+        if (Function.isFunction(value)) {
+            return true;
+        }
+
+        // timestamps
+        if (value instanceof Date) {
+            if (constraintValue instanceof Date) {
+                return !((Date) value).before((Date) constraintValue);
+            }
+            return false;
+        }
+        // all others
+        Double n1 = new Double(value.toString());
+        Double n2 = new Double(constraintValue.toString());
+        return n1 >= n2;
+    }
+
+    protected String errMsg(Object value) {
+        return String.format("The value \"%s\" of property \"%s\" must be greater or equal to \"%s\"",
+                valueMsg, propertyName, constraintValueMsg);
+    }
 }
 
 /*python