Cleanup use of Guava library

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64StringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64StringCodec.java
index 5c98112fb237fe669fbb2cb042b28bb76d414534..753658097860859050b3c43dae01715c518727a1 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64StringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/Uint64StringCodec.java
@@ -5,26 +5,37 @@
  * 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;
 
-import com.google.common.base.Optional;
 import java.math.BigInteger;
+import java.util.Objects;
+import java.util.Optional;
 import org.opendaylight.yangtools.yang.data.api.codec.Uint64Codec;
 import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
 
-class Uint64StringCodec extends AbstractIntegerStringCodec<BigInteger, UnsignedIntegerTypeDefinition> implements Uint64Codec<String> {
+final class Uint64StringCodec extends AbstractIntegerStringCodec<BigInteger, UnsignedIntegerTypeDefinition> implements
+        Uint64Codec<String> {
 
-    protected Uint64StringCodec(final Optional<UnsignedIntegerTypeDefinition> typeDef) {
-        super(typeDef, BigInteger.class);
+    Uint64StringCodec(final Optional<UnsignedIntegerTypeDefinition> typeDef) {
+        super(typeDef, extractRange(typeDef.orElse(null)), BigInteger.class);
     }
 
     @Override
-    public final BigInteger deserialize(final String stringRepresentation, final int base) {
+    BigInteger deserialize(final String stringRepresentation, final int base) {
         return new BigInteger(stringRepresentation, base);
     }
 
     @Override
-    public final String serialize(final BigInteger data) {
-        return data == null ? "" : data.toString();
+    public String serialize(final BigInteger data) {
+        return Objects.toString(data, "");
+    }
+
+    @Override
+    BigInteger convertValue(final Number value) {
+        if (value instanceof BigInteger) {
+            return (BigInteger) value;
+        }
+        return BigInteger.valueOf(value.longValue());
     }
-}
\ No newline at end of file
+}