BUG-8043: correct LengthConstraint definition

[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 9a608bf977db62691363fbe732926fb7a7f5242f..b905305b018234f67f1b38cb44b089e034db9dda 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
@@ -7,15 +7,11 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-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 java.util.Optional;
 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;
@@ -27,22 +23,11 @@ import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
 public class StringStringCodec extends TypeDefinitionAwareCodec<String, StringTypeDefinition>
         implements StringCodec<String> {
 
-    private final RangeSet<Integer> lengths;
+    private final LengthConstraint lengthConstraint;
 
     StringStringCodec(final StringTypeDefinition typeDef) {
         super(Optional.of(typeDef), String.class);
-
-        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;
-        }
+        lengthConstraint = typeDef.getLengthConstraint().orElse(null);
     }
 
     public static StringStringCodec from(final StringTypeDefinition normalizedType) {
@@ -55,23 +40,19 @@ public class StringStringCodec extends TypeDefinitionAwareCodec<String, StringTy
 
     @Override
     public final String deserialize(final String stringRepresentation) {
-        if (stringRepresentation == null) {
-            // FIXME: These seems buggy, but someone may be using this behaviour
-            return "";
-        }
-        validate(stringRepresentation);
+        validate(requireNonNull(stringRepresentation));
         return stringRepresentation;
     }
 
     @Override
     public final String serialize(final String data) {
-        return Objects.toString(data, "");
+        return requireNonNull(data);
     }
 
     void validate(final String str) {
-        if (lengths != null) {
-            Preconditions.checkArgument(lengths.contains(str.length()), "String '%s' does not match allowed lengths %s",
-                lengths);
+        if (lengthConstraint != null) {
+            checkArgument(lengthConstraint.getAllowedRanges().contains(str.length()),
+                    "String '%s' does not match allowed length constraint %s", lengthConstraint);
         }
     }
 }