Fix String length checker

[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 177f2e75c85ded99b1c1cfae3422033b71ee6fa5..379f5f808acfbd6fb8f53f8810f7c19bc4e2c238 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
@@ -11,8 +11,8 @@ import com.google.common.collect.Range;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+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.model.api.type.LengthConstraint;
 import org.slf4j.Logger;
@@ -35,35 +35,39 @@ final class LengthGenerator {
 
         for (Range<Integer> l : constraints) {
             // We have to deal with restrictions being out of integer's range
-            final int min = l.lowerEndpoint().intValue();
-            final int max = l.upperEndpoint().intValue();
-
-            if (min > 0 || max < Integer.MAX_VALUE) {
-                final StringBuilder sb = new StringBuilder("length >");
-                if (min <= Integer.MAX_VALUE) {
-                    sb.append('=');
-                }
-                sb.append(' ').append(min);
-
-                if (max < Integer.MAX_VALUE) {
-                    sb.append(" && length <= ").append(max);
-                }
-
-                ret.add(sb.toString());
-            } else {
+            final String expr = createExpression(l.lowerEndpoint().intValue(), l.upperEndpoint().intValue());
+            if (expr == null) {
                 // This range is implicitly capped by String/byte[] length returns
                 LOG.debug("Constraint {} implied by int type value domain, skipping", l);
+            } else {
+                ret.add(expr);
             }
         }
 
         return ret;
     }
 
+    private static @Nullable String createExpression(final int min, final int max) {
+        if (min == max) {
+            return min < Integer.MAX_VALUE ? "length == " + min : null;
+        }
+        if (min > 0) {
+            final StringBuilder sb = new StringBuilder("length >= ").append(min);
+            if (max < Integer.MAX_VALUE) {
+                sb.append(" && length <= ").append(max);
+            }
+            return sb.toString();
+        }
+
+        return max < Integer.MAX_VALUE ? "length <= " + max : null;
+    }
+
     private static String createLengthString(final LengthConstraint constraint) {
         return new ArrayList<>(constraint.getAllowedRanges().asRanges()).toString();
     }
 
-    private static String generateArrayLengthChecker(final String member, final LengthConstraint constraint) {
+    private static String generateArrayLengthChecker(final String member, final LengthConstraint constraint,
+            final JavaFileTemplate template) {
         final StringBuilder sb = new StringBuilder();
         final Collection<String> expressions = createExpressions(constraint);
 
@@ -78,23 +82,22 @@ final class LengthGenerator {
                 sb.append("    }\n");
             }
 
-            sb.append("    throw new IllegalArgumentException(String.format(\"Invalid length: %s, expected: ")
-              .append(createLengthString(constraint)).append(".\", java.util.Arrays.toString(value)));\n");
+            sb.append("    ").append(template.importedName(JavaFileTemplate.CODEHELPERS))
+            .append(".throwInvalidLength(\"").append(createLengthString(constraint)).append("\", value);\n");
         }
 
-        sb.append("}\n");
-
-        return sb.toString();
+        return sb.append("}\n").toString();
     }
 
-    private static String generateStringLengthChecker(final String member, final LengthConstraint constraint) {
+    private static String generateStringLengthChecker(final String member, final LengthConstraint constraint,
+            final JavaFileTemplate template) {
         final StringBuilder sb = new StringBuilder();
         final Collection<String> expressions = createExpressions(constraint);
 
         sb.append("private static void ").append(lengthCheckerName(member)).append("(final String 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");
@@ -102,22 +105,21 @@ final class LengthGenerator {
                 sb.append("    }\n");
             }
 
-            sb.append("    throw new IllegalArgumentException(String.format(\"Invalid length: %s, expected: ")
-              .append(createLengthString(constraint)).append(".\", value));\n");
+            sb.append("    ").append(template.importedName(JavaFileTemplate.CODEHELPERS))
+            .append(".throwInvalidLength(\"").append(createLengthString(constraint)).append("\", value);\n");
         }
 
-        sb.append("}\n");
-
-        return sb.toString();
+        return sb.append("}\n").toString();
     }
 
-    static String generateLengthChecker(final String member, final Type type,
-            final LengthConstraint constraint) {
+    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) : generateStringLengthChecker(member, constraint);
+                ? generateArrayLengthChecker(member, constraint, template)
+                        : generateStringLengthChecker(member, constraint, template);
     }
 
-    static String generateLengthCheckerCall(@Nullable final String member, @Nonnull final String valueReference) {
+    static String generateLengthCheckerCall(final @Nullable String member, final @NonNull String valueReference) {
         return lengthCheckerName(member) + '(' + valueReference + ");\n";
     }
 }