BUG-8043: correct RangeConstraint definition

[yangtools.git] / yang / yang-model-api / src / main / java / org / opendaylight / yangtools / yang / model / api / stmt / UnresolvedNumber.java

diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java
index 987a6466a8d1cfb9075ae2e2f98aee38f3e64316..abe91ac1cb3dcc5d42216aad2fcbce391c51ccf5 100644 (file)
--- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java
+++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java
@@ -11,9 +11,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.annotations.Beta;
 import com.google.common.collect.Range;
-import java.util.List;
 import org.opendaylight.yangtools.concepts.Immutable;
-import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 
 @Beta
 public abstract class UnresolvedNumber extends Number implements Immutable {
@@ -22,13 +20,13 @@ public abstract class UnresolvedNumber extends Number implements Immutable {
         private static final long serialVersionUID = 1L;
 
         @Override
-        public <T extends Number & Comparable<T>> T resolveLength(final Range<T> span) {
+        public <T extends Number & Comparable<T>> T resolveLength(final Range<? extends T> span) {
             return resolve(span.upperEndpoint());
         }
 
         @Override
-        public Number resolveRange(final List<RangeConstraint> constraints) {
-            return resolve(constraints.get(constraints.size() - 1).getMax());
+        public <T extends Number & Comparable<T>> T resolveRange(final Range<? extends T> span) {
+            return resolve(span.upperEndpoint());
         }
 
         @Override
@@ -45,13 +43,13 @@ public abstract class UnresolvedNumber extends Number implements Immutable {
         private static final long serialVersionUID = 1L;
 
         @Override
-        public <T extends Number & Comparable<T>> T resolveLength(final Range<T> span) {
+        public <T extends Number & Comparable<T>> T resolveLength(final Range<? extends T> span) {
             return resolve(span.lowerEndpoint());
         }
 
         @Override
-        public Number resolveRange(final List<RangeConstraint> constraints) {
-            return resolve(constraints.get(0).getMin());
+        public <T extends Number & Comparable<T>> T resolveRange(final Range<? extends T> span) {
+            return resolve(span.lowerEndpoint());
         }
 
         @Override
@@ -97,9 +95,9 @@ public abstract class UnresolvedNumber extends Number implements Immutable {
         return number;
     }
 
-    public abstract <T extends Number & Comparable<T>> T resolveLength(Range<T> span);
+    public abstract <T extends Number & Comparable<T>> T resolveLength(Range<? extends T> span);
 
-    public abstract Number resolveRange(List<RangeConstraint> constraints);
+    public abstract <T extends Number & Comparable<T>> T resolveRange(Range<? extends T> span);
 
     @Override
     public abstract String toString();