Adjust to yangtools-2.0.0 changes

[mdsal.git] / binding2 / mdsal-binding2-java-api-generator / src / main / java / org / opendaylight / mdsal / binding / javav2 / java / api / generator / rangeGenerators / AbstractBigRangeGenerator.java

diff --git a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractBigRangeGenerator.java b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractBigRangeGenerator.java
index b0910377437b8bb9f2e1a4bf52ae0027acc8e6f3..02aa25db475533dda3dc0f364d4c5b53d763a8db 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractBigRangeGenerator.java
+++ b/binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/rangeGenerators/AbstractBigRangeGenerator.java
@@ -8,7 +8,7 @@
 package org.opendaylight.mdsal.binding.javav2.java.api.generator.rangeGenerators;
 
 import com.google.common.collect.Range;
-import java.util.Collection;
+import java.util.Set;
 import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 
@@ -35,7 +35,9 @@ abstract class AbstractBigRangeGenerator<T extends Number & Comparable<T>> exten
     }
 
     @Override
-    protected final String generateRangeCheckerImplementation(final String checkerName, @Nonnull final Collection<RangeConstraint> constraints) {
+    protected final String generateRangeCheckerImplementation(final String checkerName,
+            @Nonnull final RangeConstraint<?> constraint) {
+        final Set<? extends Range<? extends Number>> constraints = constraint.getAllowedRanges().asRanges();
         final String fieldName = checkerName.toUpperCase() + "_RANGES";
         final StringBuilder sb = new StringBuilder();
 
@@ -49,9 +51,9 @@ abstract class AbstractBigRangeGenerator<T extends Number & Comparable<T>> exten
         .append(") java.lang.reflect.Array.newInstance(").append(RANGE).append(".class, ").append(constraints.size()).append(");\n");
 
         int i = 0;
-        for (RangeConstraint r : constraints) {
-            final String min = format(getValue(r.getMin()));
-            final String max = format(getValue(r.getMax()));
+        for (Range<? extends Number> r : constraints) {
+            final String min = format(getValue(r.lowerEndpoint()));
+            final String max = format(getValue(r.upperEndpoint()));
 
             sb.append("    a[").append(i++).append("] = ").append(RANGE).append(".closed(").append(min).append(", ").append(max).append(");\n");
         }