[ONOS-4910, ONOS-4921] Framework: utils validation and defect fix
Change-Id: I821920fa8c88e64406b702c2b8736bdeaf231474
diff --git a/utils/yangutils/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangStringRestriction.java b/utils/yangutils/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangStringRestriction.java
index b52a70e..dcd0f1d 100644
--- a/utils/yangutils/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangStringRestriction.java
+++ b/utils/yangutils/datamodel/src/main/java/org/onosproject/yangutils/datamodel/YangStringRestriction.java
@@ -17,6 +17,8 @@
package org.onosproject.yangutils.datamodel;
import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.ListIterator;
import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
import org.onosproject.yangutils.datamodel.utils.Parsable;
@@ -193,6 +195,61 @@
return YangConstructType.PATTERN_DATA;
}
+ /**
+ * Validates if the given value is correct as per the length restriction.
+ *
+ * @param valueInString value
+ * @return true, if the value is confirming to length restriction, false otherwise
+ */
+ public boolean isValidStringOnLengthRestriction(String valueInString) {
+ if (lengthRestriction == null || lengthRestriction.getAscendingRangeIntervals() == null
+ || lengthRestriction.getAscendingRangeIntervals().isEmpty()) {
+ // Length restriction is optional
+ return true;
+ }
+
+ ListIterator<YangRangeInterval<YangUint64>> rangeListIterator = lengthRestriction.getAscendingRangeIntervals()
+ .listIterator();
+ boolean isMatched = false;
+ while (rangeListIterator.hasNext()) {
+ YangRangeInterval rangeInterval = rangeListIterator.next();
+ BigInteger startValue = ((YangUint64) rangeInterval.getStartValue()).getValue();
+ BigInteger endValue = ((YangUint64) rangeInterval.getEndValue()).getValue();
+ if ((valueInString.length() >= startValue.intValue()) &&
+ (valueInString.length() <= endValue.intValue())) {
+ isMatched = true;
+ break;
+ }
+ }
+
+ return isMatched;
+ }
+
+ /**
+ * Validates if the given value is correct as per the pattern restriction.
+ *
+ * @param valueInString value
+ * @return true, if the value is confirming to pattern restriction, false otherwise
+ */
+ public boolean isValidStringOnPatternRestriction(String valueInString) {
+ if (patternRestriction == null
+ || patternRestriction.getPatternList().isEmpty()) {
+ // Pattern restriction is optional
+ return true;
+ }
+
+ ListIterator<String> patternListIterator = patternRestriction.getPatternList().listIterator();
+ boolean isMatched = false;
+ while (patternListIterator.hasNext()) {
+ if (valueInString.matches(patternListIterator.next())) {
+ isMatched = true;
+ break;
+ }
+ }
+
+ return isMatched;
+ }
+
@Override
public void validateDataOnEntry() throws DataModelException {
// TODO: implement the method.