Add JavaTypeNames for annotation types

[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 0e11d9c99c856d49a9fb50de221dc3752cceb90e..16aa0ecff7aa2590c820fd0535d61aebbe001535 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
@@ -8,13 +8,13 @@
 package org.opendaylight.mdsal.binding.java.api.generator;
 
 import com.google.common.collect.Range;
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+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.yangtools.yang.model.api.type.LengthConstraint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,49 +30,47 @@ final class LengthGenerator {
         return "check" + member + "Length";
     }
 
-    private static Collection<String> createExpressions(final Collection<LengthConstraint> constraints) {
+    private static Collection<String> createExpressions(final LengthConstraint constraint) {
+        final Set<Range<Integer>> constraints = constraint.getAllowedRanges().asRanges();
         final Collection<String> ret = new ArrayList<>(constraints.size());
 
-        for (LengthConstraint l : constraints) {
+        for (Range<Integer> l : constraints) {
             // We have to deal with restrictions being out of integer's range
-            final long min = l.getMin().longValue();
-            final long max = l.getMax().longValue();
-
-            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 String createLengthString(final Collection<LengthConstraint> constraints) {
-        final List<Range<BigInteger>> ranges = new ArrayList<>(constraints.size());
-
-        for (LengthConstraint c : constraints) {
-            ranges.add(Range.closed(new BigInteger(c.getMin().toString()), new BigInteger(c.getMax().toString())));
+    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;
+    }
 
-        return ranges.toString();
+    private static String createLengthString(final LengthConstraint constraint) {
+        return new ArrayList<>(constraint.getAllowedRanges().asRanges()).toString();
     }
 
-    private static String generateArrayLengthChecker(final String member,
-            final Collection<LengthConstraint> constraints) {
+    private static String generateArrayLengthChecker(final String member, final LengthConstraint constraint,
+            final JavaFileTemplate template) {
         final StringBuilder sb = new StringBuilder();
-        final Collection<String> expressions = createExpressions(constraints);
+        final Collection<String> expressions = createExpressions(constraint);
 
         sb.append("private static void ").append(lengthCheckerName(member)).append("(final byte[] value) {\n");
 
@@ -85,19 +83,17 @@ final class LengthGenerator {
                 sb.append("    }\n");
             }
 
-            sb.append("    throw new IllegalArgumentException(String.format(\"Invalid length: %s, expected: ")
-              .append(createLengthString(constraints)).append(".\", java.util.Arrays.toString(value)));\n");
+            sb.append("    ").append(template.importedName(CodeHelpers.class)).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 Collection<LengthConstraint> constraints) {
+    private static String generateStringLengthChecker(final String member, final LengthConstraint constraint,
+            final JavaFileTemplate template) {
         final StringBuilder sb = new StringBuilder();
-        final Collection<String> expressions = createExpressions(constraints);
+        final Collection<String> expressions = createExpressions(constraint);
 
         sb.append("private static void ").append(lengthCheckerName(member)).append("(final String value) {\n");
 
@@ -110,22 +106,21 @@ final class LengthGenerator {
                 sb.append("    }\n");
             }
 
-            sb.append("    throw new IllegalArgumentException(String.format(\"Invalid length: %s, expected: ")
-              .append(createLengthString(constraints)).append(".\", value));\n");
+            sb.append("    ").append(template.importedName(CodeHelpers.class)).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 Collection<LengthConstraint> constraints) {
+            final LengthConstraint constraint, final JavaFileTemplate template) {
         return TypeUtils.getBaseYangType(type).getName().indexOf('[') != -1
-                ? generateArrayLengthChecker(member, constraints) : generateStringLengthChecker(member, constraints);
+                ? 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";
     }
 }