Report ErrorType.APPLICATION from codecs

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java
index 62aab281bba43bd55840da9c74598aacbb183ac4..920a19897e752f28575b76dfac756a4070fe868e 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java
@@ -7,20 +7,17 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
+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 com.google.common.io.BaseEncoding;
-import javax.xml.bind.DatatypeConverter;
+import java.util.Base64;
+import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
 import org.opendaylight.yangtools.yang.data.api.codec.BinaryCodec;
+import org.opendaylight.yangtools.yang.data.api.codec.YangInvalidValueException;
 import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 
-
 /**
  * Do not use this class outside of yangtools, its presence does not fall into the API stability contract.
  */
@@ -28,23 +25,20 @@ import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint;
 public abstract class BinaryStringCodec extends TypeDefinitionAwareCodec<byte[], BinaryTypeDefinition>
         implements BinaryCodec<String> {
     private static final class Restricted extends BinaryStringCodec {
-        private final RangeSet<Integer> ranges;
+        private final LengthConstraint lengthConstraint;
 
-        Restricted(final BinaryTypeDefinition typeDef) {
+        Restricted(final BinaryTypeDefinition typeDef, final LengthConstraint lengthConstraint) {
             super(typeDef);
-
-            final RangeSet<Integer> r = TreeRangeSet.create();
-            for (LengthConstraint c : typeDef.getLengthConstraints()) {
-                r.add(Range.closed(c.getMin().intValue(), c.getMax().intValue()));
-            }
-
-            ranges = ImmutableRangeSet.copyOf(r);
+            this.lengthConstraint = requireNonNull(lengthConstraint);
         }
 
         @Override
         void validate(final byte[] value) {
-            Preconditions.checkArgument(ranges.contains(value.length),
-                "Value length %s does not match constraints %s", value.length, ranges);
+            final RangeSet<Integer> ranges = lengthConstraint.getAllowedRanges();
+            if (!ranges.contains(value.length)) {
+                throw new YangInvalidValueException(ErrorType.APPLICATION, lengthConstraint,
+                        "Value length " + value.length + " is not in required ranges " + ranges);
+            }
         }
     }
 
@@ -60,27 +54,26 @@ public abstract class BinaryStringCodec extends TypeDefinitionAwareCodec<byte[],
     }
 
     BinaryStringCodec(final BinaryTypeDefinition typeDef) {
-        super(Optional.of(typeDef), byte[].class);
+        super(requireNonNull(typeDef), byte[].class);
     }
 
     public static BinaryStringCodec from(final BinaryTypeDefinition type) {
-        return type.getLengthConstraints().isEmpty() ? new Unrestricted(type) : new Restricted(type);
+        final java.util.Optional<LengthConstraint> optConstraint = type.getLengthConstraint();
+        return optConstraint.isPresent() ? new Restricted(type, optConstraint.get()) : new Unrestricted(type);
     }
 
     @Override
-    public String serialize(final byte[] data) {
-        return data == null ? "" : BaseEncoding.base64().encode(data);
+    public final byte[] deserializeImpl(final String product) {
+        // https://tools.ietf.org/html/rfc4648#section-4 plus lenient to allow for MIME blocks
+        final byte[] ret = Base64.getMimeDecoder().decode(product);
+        validate(ret);
+        return ret;
     }
 
     @Override
-    public byte[] deserialize(final String stringRepresentation) {
-        if (stringRepresentation == null) {
-            return null;
-        }
-
-        final byte[] ret = DatatypeConverter.parseBase64Binary(stringRepresentation);
-        validate(ret);
-        return ret;
+    protected final String serializeImpl(final byte[] data) {
+        // We do not split data on 76 characters on output
+        return Base64.getEncoder().encodeToString(data);
     }
 
     abstract void validate(byte[] value);