Cleanup leafref path parsing

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalStringCodec.java
index 32571d43305088b7ddd9a5f9bdfaa78f951afe98..166c758b40db06efe24e770348086e9ee18b9658 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalStringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/DecimalStringCodec.java
@@ -7,31 +7,39 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+
+import com.google.common.annotations.Beta;
 import java.math.BigDecimal;
+import java.util.Objects;
+import java.util.Optional;
 import org.opendaylight.yangtools.yang.data.api.codec.DecimalCodec;
 import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition;
 
-class DecimalStringCodec extends TypeDefinitionAwareCodec<BigDecimal, DecimalTypeDefinition>
+/**
+ * Do not use this class outside of yangtools, its presence does not fall into the API stability contract.
+ */
+@Beta
+public final class DecimalStringCodec extends TypeDefinitionAwareCodec<BigDecimal, DecimalTypeDefinition>
         implements DecimalCodec<String> {
 
-    protected DecimalStringCodec(final Optional<DecimalTypeDefinition> typeDef) {
+    private DecimalStringCodec(final Optional<DecimalTypeDefinition> typeDef) {
         super(typeDef, BigDecimal.class);
     }
 
-    static TypeDefinitionAwareCodec<?,DecimalTypeDefinition> from(final DecimalTypeDefinition normalizedType) {
-        return new DecimalStringCodec(Optional.fromNullable(normalizedType));
+    public static DecimalStringCodec from(final DecimalTypeDefinition type) {
+        return new DecimalStringCodec(Optional.of(type));
     }
 
     @Override
-    public final String serialize(final BigDecimal data) {
-        return data == null ? "" : data.toString();
+    public String serialize(final BigDecimal data) {
+        return Objects.toString(data, "");
     }
 
     @Override
-    public final BigDecimal deserialize(final String stringRepresentation) {
-        Preconditions.checkArgument( stringRepresentation != null , "Input cannot be null" );
+    public BigDecimal deserialize(final String stringRepresentation) {
+        checkArgument(stringRepresentation != null, "Input cannot be null");
+        // FIXME: run value validation
         return new BigDecimal(stringRepresentation);
     }
-}
\ No newline at end of file
+}