Bump yangtools to 8.0.1

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

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBigRangeGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBigRangeGenerator.java
index 0e1394231d28804e7b92ed1301f53a03d924882c..4a476163588df3117994b99c69d6c50042b98cba 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBigRangeGenerator.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/AbstractBigRangeGenerator.java
@@ -9,15 +9,15 @@ package org.opendaylight.mdsal.binding.java.api.generator;
 
 import com.google.common.collect.Range;
 import java.lang.reflect.Array;
+import java.util.Locale;
 import java.util.Set;
 import java.util.function.Function;
 import org.opendaylight.yangtools.yang.binding.CodeHelpers;
 import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint;
 
 /**
- * Abstract base for generators which require instantiation of boundary values
- * to check. These are implemented by generating an array constant within the
- * class, which contains {@link Range} instances, which hold pre-instantiated
+ * Abstract base for generators which require instantiation of boundary values to check. These are implemented
+ * by generating an array constant within the class, which contains {@link Range} instances, which hold pre-instantiated
  * boundary values.
  *
  * @param <T> type of the class
@@ -43,7 +43,7 @@ abstract class AbstractBigRangeGenerator<T extends Number & Comparable<T>> exten
     protected final String generateRangeCheckerImplementation(final String checkerName,
             final RangeConstraint<?> constraint, final Function<Class<?>, String> classImporter) {
         final Set<? extends Range<? extends Number>> constraints = constraint.getAllowedRanges().asRanges();
-        final String fieldName = checkerName.toUpperCase() + "_RANGES";
+        final String fieldName = checkerName.toUpperCase(Locale.ENGLISH) + "_RANGES";
         final StringBuilder sb = new StringBuilder();
 
         // Field to hold the Range objects in an array
@@ -52,31 +52,33 @@ abstract class AbstractBigRangeGenerator<T extends Number & Comparable<T>> exten
         // Static initializer block for the array
         sb.append("static {\n");
         sb.append("    @SuppressWarnings(\"unchecked\")\n");
-        sb.append("    final ").append(arrayType(classImporter)).append(" a = (").append(arrayType(classImporter)).append(") ")
-        .append(classImporter.apply(Array.class)).append(".newInstance(").append(range(classImporter)).append(".class, ")
-        .append(constraints.size()).append(");\n");
+        sb.append("    final ").append(arrayType(classImporter)).append(" a = (").append(arrayType(classImporter))
+            .append(") ").append(classImporter.apply(Array.class)).append(".newInstance(").append(range(classImporter))
+            .append(".class, ").append(constraints.size()).append(");\n");
 
-        int i = 0;
+        int offset = 0;
         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(classImporter)).append(".closed(").append(min).append(", ")
-            .append(max).append(");\n");
+            sb.append("    a[").append(offset++).append("] = ").append(range(classImporter)).append(".closed(")
+                .append(min).append(", ").append(max).append(");\n");
         }
 
         sb.append("    ").append(fieldName).append(" = a;\n");
         sb.append("}\n");
 
         // Static enforcement method
-        sb.append("private static void ").append(checkerName).append("(final ").append(getTypeName()).append(" value) {\n");
+        sb.append("private static void ").append(checkerName).append("(final ").append(getTypeName())
+            .append(" value) {\n");
         sb.append("    for (").append(itemType(classImporter)).append(" r : ").append(fieldName).append(") {\n");
         sb.append("        if (r.contains(value)) {\n");
         sb.append("            return;\n");
         sb.append("        }\n");
         sb.append("    }\n");
 
-        sb.append("    ").append(classImporter.apply(CodeHelpers.class)).append(".throwInvalidRange(").append(fieldName).append(", value);\n");
+        sb.append("    ").append(classImporter.apply(CodeHelpers.class)).append(".throwInvalidRange(").append(fieldName)
+            .append(", value);\n");
         sb.append("}\n");
 
         return sb.toString();