BUG-8039: Enforce binary/string type length

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanStringCodec.java
index 54bd3372deaaba57106e8fcea4a9e4415741d55f..2ba3a450c901970edded9dff23cd2311b42573c0 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanStringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BooleanStringCodec.java
@@ -8,27 +8,38 @@
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
 import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import java.util.Objects;
 import org.opendaylight.yangtools.yang.data.api.codec.BooleanCodec;
 import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition;
 
-class BooleanStringCodec extends TypeDefinitionAwareCodec<Boolean, BooleanTypeDefinition>
+final class BooleanStringCodec extends TypeDefinitionAwareCodec<Boolean, BooleanTypeDefinition>
         implements BooleanCodec<String> {
 
-    protected BooleanStringCodec(final Optional<BooleanTypeDefinition> typeDef) {
+    BooleanStringCodec(final Optional<BooleanTypeDefinition> typeDef) {
         super(typeDef, Boolean.class);
     }
 
     @Override
-    public final String serialize(final Boolean data) {
-        return data == null ? "" : data.toString();
+    public String serialize(final Boolean data) {
+        return Objects.toString(data, "");
     }
 
     @Override
-    public final Boolean deserialize(final String stringRepresentation) {
+    public Boolean deserialize(final String stringRepresentation) {
+        if (stringRepresentation == null) {
+            return null;
+        }
+        validate(stringRepresentation);
         return Boolean.valueOf(stringRepresentation);
     }
 
+    private static void validate(final String string) {
+        Preconditions.checkArgument("true".equalsIgnoreCase(string) || "false".equalsIgnoreCase(string),
+                "Invalid value '%s' for boolean type. Allowed values are true and false", string);
+    }
+
     static TypeDefinitionAwareCodec<?,BooleanTypeDefinition> from(final BooleanTypeDefinition normalizedType) {
         return new BooleanStringCodec(Optional.fromNullable(normalizedType));
     }
-}
\ No newline at end of file
+}