commit cfa1c41f0abf3b3d3c152a2551d8f87e836b9753
author Gaurav Agrawal <gaurav.agrawal@huawei.com> Tue May 03 00:41:48 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Wed May 04 17:14:45 2016 +0000
tree b757998a80dab1dabbcb4a319650a6ee7dc7490c
parent 7b93ceb0a0ad1b077504c5503c7eedae3e16d37c

YANG: Restriction resolution implementation

Change-Id: I69503e8229def07b289a0c8c762bfe0ae5530232

utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangRangeRestriction.java

diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangRangeRestriction.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangRangeRestriction.java
index 39c2cb5..d66f170 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangRangeRestriction.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/datamodel/YangRangeRestriction.java
@@ -18,7 +18,6 @@
 
 import java.util.LinkedList;
 import java.util.List;
-
 import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
 import org.onosproject.yangutils.utils.builtindatatype.YangBuiltInDataTypeInfo;
 
@@ -111,8 +110,8 @@
     /**
      * Returns the minimum valid value as per the restriction.
      *
-     * @throws DataModelException data model exception for minimum restriction
      * @return minimum restricted value
+     * @throws DataModelException data model exception for minimum restriction
      */
     public T getMinRestrictedvalue() throws DataModelException {
         if (getAscendingRangeIntervals() == null) {
@@ -127,8 +126,8 @@
     /**
      * Returns the maximum valid value as per the restriction.
      *
-     * @throws DataModelException data model exception for maximum restriction
      * @return minimum maximum value
+     * @throws DataModelException data model exception for maximum restriction
      */
     public T getMaxRestrictedvalue() throws DataModelException {
         if (getAscendingRangeIntervals() == null) {
@@ -175,7 +174,7 @@
     }
 
     /**
-     * Check if the given value is correct as per the restriction.
+     * Validates if the given value is correct as per the restriction.
      *
      * @param valueInString value
      * @return true, if the value is confirming to restriction, false otherwise
@@ -206,6 +205,32 @@
     }
 
     /**
+     * Validates if the given interval is correct as per the restriction.
+     *
+     * @param rangeInterval range interval
+     * @return true, if the interval is confirming to restriction, false otherwise
+     * @throws DataModelException data model error
+     */
+    public boolean isValidInterval(YangRangeInterval rangeInterval) throws DataModelException {
+
+        if (getAscendingRangeIntervals() == null
+                || getAscendingRangeIntervals().isEmpty()) {
+            // Throw exception, At least one default range needs to be set in constructor or in linker.
+            throw new DataModelException("Range interval missing in range restriction.");
+        }
+
+        for (YangRangeInterval<T> interval : getAscendingRangeIntervals()) {
+            int rangeStartCompareRes = interval.getStartValue().compareTo((T) rangeInterval.getStartValue());
+            int rangeEndCompareRes = interval.getEndValue().compareTo((T) rangeInterval.getEndValue());
+
+            if (rangeStartCompareRes <= 0 && rangeEndCompareRes >= 0) {
+                return true;
+            }
+        }
+        throw new DataModelException("Range interval doesn't fall within the referred restriction ranges");
+    }
+
+    /**
      * Returns the textual reference of the length restriction.
      *
      * @return textual reference of the length restriction