YANGTOOLS-621: introduce specialized integer types

[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 d5e28228c852926adb9d736d0c9faee48dbf3024..da4d68e48baa248bafe45bacbd41b56d8d23e84e 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
@@ -8,27 +8,24 @@
 
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
-import com.google.common.base.Optional;
+import java.util.Objects;
+import java.util.Optional;
 import org.opendaylight.yangtools.yang.data.api.codec.Int16Codec;
-import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.Int16TypeDefinition;
 
-final class Int16StringCodec extends AbstractIntegerStringCodec<Short, IntegerTypeDefinition> implements Int16Codec<String> {
-    Int16StringCodec(final Optional<IntegerTypeDefinition> typeDef) {
-        super(typeDef, extractRange(typeDef.orNull()), Short.class);
+final class Int16StringCodec extends AbstractIntegerStringCodec<Short, Int16TypeDefinition>
+        implements Int16Codec<String> {
+    Int16StringCodec(final Optional<Int16TypeDefinition> typeDef) {
+        super(typeDef, extractRange(typeDef.orElse(null)), Short.class);
     }
 
     @Override
-    public Short deserialize(final String stringRepresentation, final int base) {
+    Short deserialize(final String stringRepresentation, final int base) {
         return Short.valueOf(stringRepresentation, base);
     }
 
     @Override
     public String serialize(final Short data) {
-        return data == null ? "" : data.toString();
-    }
-
-    @Override
-    protected Short convertValue(final Number value) {
-        return value.shortValue();
+        return Objects.toString(data, "");
     }
 }