BUG-9265: Switch empty type mapping from Void to Empty

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

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyStringCodec.java
index dde3ec96293ac3a74eaf9f9e5dc2205c2f4abf12..4a62a291feacf27890001826dc0e92fddc77cc91 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyStringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/EmptyStringCodec.java
@@ -7,28 +7,31 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
+import java.util.Optional;
+import org.opendaylight.yangtools.yang.common.Empty;
 import org.opendaylight.yangtools.yang.data.api.codec.EmptyCodec;
 import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition;
 
-final class EmptyStringCodec extends TypeDefinitionAwareCodec<Void, EmptyTypeDefinition> implements
+final class EmptyStringCodec extends TypeDefinitionAwareCodec<Empty, EmptyTypeDefinition> implements
         EmptyCodec<String> {
     static final EmptyStringCodec INSTANCE = new EmptyStringCodec();
 
     private EmptyStringCodec() {
-        super(Optional.<EmptyTypeDefinition>absent(), Void.class);
+        super(Optional.empty(), Empty.class);
     }
 
     @Override
-    public String serialize(final Void data) {
+    public String serialize(final Empty data) {
+        requireNonNull(data);
         return "";
     }
 
     @Override
-    public Void deserialize(final String stringRepresentation) {
-        Preconditions.checkArgument(Strings.isNullOrEmpty(stringRepresentation), "The value must be empty");
-        return null;
+    public Empty deserialize(final String stringRepresentation) {
+        checkArgument(stringRepresentation.isEmpty(), "The value must be empty");
+        return Empty.getInstance();
     }
 }
\ No newline at end of file