Improve often-used class imports

[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 0f98ae9472c75b7cd2fee18e4fad49df55b823ed..4684e3dfe541e444e16eadb68aa630907789c1f6 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,10 +11,9 @@ 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.binding.CodeHelpers;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,35 +35,33 @@ 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().append("length ");
-                if (min != max) {
-                    sb.append('>');
-                    if (min <= Integer.MAX_VALUE) {
-                        sb.append('=');
-                    }
-                    sb.append(' ').append(min);
-
-                    if (max < Integer.MAX_VALUE) {
-                        sb.append(" && length <= ").append(max);
-                    }
-                } else {
-                    // Single-value, use a direct comparison
-                    sb.append("== ").append(min);
-                }
-                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();
     }
@@ -85,8 +82,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();
@@ -108,21 +105,21 @@ 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)
                         : 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";
     }
 }