Fix a minor typo

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

diff --git a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java
index 16aa0ecff7aa2590c820fd0535d61aebbe001535..978192fbca2f905f647b32c9cfd826870406a88c 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java
+++ b/binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/LengthGenerator.java
@@ -14,7 +14,7 @@ import java.util.Set;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.binding.model.api.Type;
-import org.opendaylight.yangtools.yang.binding.CodeHelpers;
+import org.opendaylight.mdsal.binding.model.ri.Types;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,7 +23,7 @@ final class LengthGenerator {
     private static final Logger LOG = LoggerFactory.getLogger(LengthGenerator.class);
 
     private LengthGenerator() {
-        throw new UnsupportedOperationException();
+        // Hidden on purpose
     }
 
     private static String lengthCheckerName(final String member) {
@@ -36,7 +36,7 @@ final class LengthGenerator {
 
         for (Range<Integer> l : constraints) {
             // We have to deal with restrictions being out of integer's range
-            final String expr = createExpression(l.lowerEndpoint().intValue(), l.upperEndpoint().intValue());
+            final String expr = createExpression(l.lowerEndpoint(), l.upperEndpoint());
             if (expr == null) {
                 // This range is implicitly capped by String/byte[] length returns
                 LOG.debug("Constraint {} implied by int type value domain, skipping", l);
@@ -83,8 +83,8 @@ final class LengthGenerator {
                 sb.append("    }\n");
             }
 
-            sb.append("    ").append(template.importedName(CodeHelpers.class)).append(".throwInvalidLength(\"")
-            .append(createLengthString(constraint)).append("\", value);\n");
+            sb.append("    ").append(template.importedName(JavaFileTemplate.CODEHELPERS))
+            .append(".throwInvalidLength(\"").append(createLengthString(constraint)).append("\", value);\n");
         }
 
         return sb.append("}\n").toString();
@@ -95,10 +95,11 @@ final class LengthGenerator {
         final StringBuilder sb = new StringBuilder();
         final Collection<String> expressions = createExpressions(constraint);
 
-        sb.append("private static void ").append(lengthCheckerName(member)).append("(final String value) {\n");
+        sb.append("private static void ").append(lengthCheckerName(member))
+            .append("(final ").append(template.importedName(Types.STRING)).append(" value) {\n");
 
         if (!expressions.isEmpty()) {
-            sb.append("    final int length = value.length();\n");
+            sb.append("    final int length = value.codePointCount(0, value.length());\n");
 
             for (String exp : expressions) {
                 sb.append("    if (").append(exp).append(") {\n");
@@ -106,14 +107,14 @@ final class LengthGenerator {
                 sb.append("    }\n");
             }
 
-            sb.append("    ").append(template.importedName(CodeHelpers.class)).append(".throwInvalidLength(\"")
-            .append(createLengthString(constraint)).append("\", value);\n");
+            sb.append("    ").append(template.importedName(JavaFileTemplate.CODEHELPERS))
+            .append(".throwInvalidLength(\"").append(createLengthString(constraint)).append("\", value);\n");
         }
 
         return sb.append("}\n").toString();
     }
 
-    static String generateLengthChecker(final String member, final Type type,
+    static String generateLengthChecker(final String member, final @NonNull Type type,
             final LengthConstraint constraint, final JavaFileTemplate template) {
         return TypeUtils.getBaseYangType(type).getName().indexOf('[') != -1
                 ? generateArrayLengthChecker(member, constraint, template)