If we have an unrestricted string/binary or the constraint is
satisfied by the combination of String/array length return
values and integer value domain, we can skip the checks altogether,
leading to less generated code.
Cuts down size of ietf-inet-types by 1%.
Change-Id: Ibd8ea57a4746e1332447dd5454b36407d066ea0a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
6ec25955ea5d5263b0a8dd49cd66a0f7ab7c0641)
import javax.annotation.Nullable;
import org.opendaylight.mdsal.binding.model.api.Type;
import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
import javax.annotation.Nullable;
import org.opendaylight.mdsal.binding.model.api.Type;
import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
final class LengthGenerator {
final class LengthGenerator {
+ private static final Logger LOG = LoggerFactory.getLogger(LengthGenerator.class);
+
private LengthGenerator() {
throw new UnsupportedOperationException();
}
private LengthGenerator() {
throw new UnsupportedOperationException();
}
final Collection<String> ret = new ArrayList<>(constraints.size());
for (LengthConstraint l : constraints) {
final Collection<String> ret = new ArrayList<>(constraints.size());
for (LengthConstraint l : constraints) {
- final StringBuilder sb = new StringBuilder("length >");
-
// We have to deal with restrictions being out of integer's range
// We have to deal with restrictions being out of integer's range
- if (l.getMin().longValue() <= Integer.MAX_VALUE) {
- sb.append('=');
- }
- sb.append(' ').append(l.getMin().intValue());
-
- final int max = l.getMax().intValue();
- if (max < Integer.MAX_VALUE) {
- sb.append(" && length <= ").append(max);
+ 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 {
+ // This range is implicitly capped by String/byte[] length returns
+ LOG.debug("Constraint {} implied by int type value domain, skipping", l);
-
- ret.add(sb.toString());
return ranges.toString();
}
return ranges.toString();
}
- private static String generateArrayLengthChecker(final String member, final Collection<LengthConstraint> constraints) {
+ private static String generateArrayLengthChecker(final String member,
+ final Collection<LengthConstraint> constraints) {
final StringBuilder sb = new StringBuilder();
final Collection<String> expressions = createExpressions(constraints);
final StringBuilder sb = new StringBuilder();
final Collection<String> expressions = createExpressions(constraints);
- private static String generateStringLengthChecker(final String member, final Collection<LengthConstraint> constraints) {
+ private static String generateStringLengthChecker(final String member,
+ final Collection<LengthConstraint> constraints) {
final StringBuilder sb = new StringBuilder();
final Collection<String> expressions = createExpressions(constraints);
final StringBuilder sb = new StringBuilder();
final Collection<String> expressions = createExpressions(constraints);
- static String generateLengthChecker(final String member, final Type type, final Collection<LengthConstraint> constraints) {
- if (TypeUtils.getBaseYangType(type).getName().contains("[")) {
- return generateArrayLengthChecker(member, constraints);
- } else {
- return generateStringLengthChecker(member, constraints);
- }
+ static String generateLengthChecker(final String member, final Type type,
+ final Collection<LengthConstraint> constraints) {
+ return TypeUtils.getBaseYangType(type).getName().indexOf('[') != -1
+ ? generateArrayLengthChecker(member, constraints) : generateStringLengthChecker(member, constraints);
}
static String generateLengthCheckerCall(@Nullable final String member, @Nonnull final String valueReference) {
}
static String generateLengthCheckerCall(@Nullable final String member, @Nonnull final String valueReference) {