BUG-8039: Enforce binary/string type length

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / codec / StringStringCodec.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/StringStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/StringStringCodec.java
index 4940722f1aed6e594b787b8a9bb5fdff917f5309..57602161e3c17f29151559ead11b1ea6355c3373 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/StringStringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/StringStringCodec.java
@@ -8,16 +8,36 @@
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
 import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableRangeSet;
+import com.google.common.collect.Range;
+import com.google.common.collect.RangeSet;
+import com.google.common.collect.TreeRangeSet;
+import java.util.Collection;
 import java.util.Objects;
 import org.opendaylight.yangtools.yang.data.api.codec.StringCodec;
+import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 
 class StringStringCodec extends TypeDefinitionAwareCodec<String, StringTypeDefinition> implements
         StringCodec<String> {
 
-    protected StringStringCodec(final StringTypeDefinition typeDef) {
+    private final RangeSet<Integer> lengths;
+
+    StringStringCodec(final StringTypeDefinition typeDef) {
         super(Optional.of(typeDef), String.class);
-        typeDef.getLengthConstraints();
+
+        final Collection<LengthConstraint> constraints = typeDef.getLengthConstraints();
+        if (!constraints.isEmpty()) {
+            final RangeSet<Integer> tmp = TreeRangeSet.create();
+            for (LengthConstraint c : constraints) {
+                tmp.add(Range.closed(c.getMin().intValue(), c.getMax().intValue()));
+            }
+
+            lengths = ImmutableRangeSet.copyOf(tmp);
+        } else {
+            lengths = null;
+        }
     }
 
     static TypeDefinitionAwareCodec<?, StringTypeDefinition> from(final StringTypeDefinition normalizedType) {
@@ -43,7 +63,10 @@ class StringStringCodec extends TypeDefinitionAwareCodec<String, StringTypeDefin
         return Objects.toString(data, "");
     }
 
-    protected void validate(final String s) {
-
+    void validate(final String s) {
+        if (lengths != null) {
+            Preconditions.checkArgument(lengths.contains(s.length()), "String '%s' does not match allowed lengths %s",
+                lengths);
+        }
     }
 }