Bug 2362: Added range validation as last part of deserialization.

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16StringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16StringCodec.java
index f686cc3816bb741b7932567c57e04f6428d303f1..5a0e90794a817841acb6f737773b3d8dc8aa307b 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16StringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Int16StringCodec.java
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
  *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License v1.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  */
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
@@ -11,13 +11,14 @@ import com.google.common.base.Optional;
 import org.opendaylight.yangtools.yang.data.api.codec.Int16Codec;
 import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
 
-class Int16StringCodec extends AbstractIntegerStringCodec<Short, IntegerTypeDefinition> implements
-        Int16Codec<String> {
+class Int16StringCodec extends AbstractIntegerStringCodec<Short, IntegerTypeDefinition> implements Int16Codec<String> {
 
     protected Int16StringCodec(final Optional<IntegerTypeDefinition> typeDef) {
-        super(typeDef, Short.class);
+        super(typeDef, extractRange(typeDef.orNull()), Short.class);
     }
 
+
+
     @Override
     public final Short deserialize(final String stringRepresentation, final int base) {
         return Short.valueOf(stringRepresentation, base);
@@ -27,4 +28,9 @@ class Int16StringCodec extends AbstractIntegerStringCodec<Short, IntegerTypeDefi
     public final String serialize(final Short data) {
         return data == null ? "" : data.toString();
     }
-}
\ No newline at end of file
+
+    @Override
+    protected Short convertValue(final Number value) {
+        return value.shortValue();
+    }
+}