Remove SchemaUtils.findParentSchemaNodesOnPath()

[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 57602161e3c17f29151559ead11b1ea6355c3373..15a5b9c6d454117b512aef2bc85e9bc95919cffe 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,66 +7,52 @@
  */
 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 static java.util.Objects.requireNonNull;
+
+import com.google.common.annotations.Beta;
 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.common.RpcError.ErrorType;
 import org.opendaylight.yangtools.yang.data.api.codec.StringCodec;
+import org.opendaylight.yangtools.yang.data.api.codec.YangInvalidValueException;
 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> {
-
-    private final RangeSet<Integer> lengths;
+/**
+ * Do not use this class outside of yangtools, its presence does not fall into the API stability contract.
+ */
+@Beta
+public class StringStringCodec extends TypeDefinitionAwareCodec<String, StringTypeDefinition>
+        implements StringCodec<String> {
+    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;
-        }
+        super(requireNonNull(typeDef), String.class);
+        lengthConstraint = typeDef.getLengthConstraint().orElse(null);
     }
 
-    static TypeDefinitionAwareCodec<?, StringTypeDefinition> from(final StringTypeDefinition normalizedType) {
-        if (normalizedType.getPatternConstraints().isEmpty()) {
-            return new StringStringCodec(normalizedType);
-        }
-
-        return new StringPatternCheckingCodec(normalizedType);
+    public static StringStringCodec from(final StringTypeDefinition normalizedType) {
+        return normalizedType.getPatternConstraints().isEmpty() ? new StringStringCodec(normalizedType)
+                : new StringPatternCheckingCodec(normalizedType);
     }
 
     @Override
-    public final String deserialize(final String stringRepresentation) {
-        if (stringRepresentation == null) {
-            // FIXME: These seems buggy, but someone may be using this behaviour
-            return "";
-        }
+    protected final String deserializeImpl(final String stringRepresentation) {
         validate(stringRepresentation);
         return stringRepresentation;
     }
 
     @Override
-    public final String serialize(final String data) {
-        return Objects.toString(data, "");
+    protected final String serializeImpl(final String data) {
+        return data;
     }
 
-    void validate(final String s) {
-        if (lengths != null) {
-            Preconditions.checkArgument(lengths.contains(s.length()), "String '%s' does not match allowed lengths %s",
-                lengths);
+    void validate(final String str) {
+        if (lengthConstraint != null) {
+            final RangeSet<Integer> ranges = lengthConstraint.getAllowedRanges();
+            if (!ranges.contains(str.length())) {
+                throw new YangInvalidValueException(ErrorType.PROTOCOL, lengthConstraint,
+                    "String " + str + " does not match allowed lengths " + ranges);
+            }
         }
     }
 }