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

[yangtools.git] / yang / yang-data-codec-xml / src / main / java / org / opendaylight / yangtools / yang / data / codec / xml / EmptyXmlCodec.java

diff --git a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/EmptyXmlCodec.java b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/EmptyXmlCodec.java
index c55a14f2715ee71d6fd4597c46a679ab2870095d..f6bbdd0bd0ef12ea9bbed3417112938fd0a7fed9 100644 (file)
--- a/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/EmptyXmlCodec.java
+++ b/yang/yang-data-codec-xml/src/main/java/org/opendaylight/yangtools/yang/data/codec/xml/EmptyXmlCodec.java
@@ -5,14 +5,16 @@
  * 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.codec.xml;
 
+import static java.util.Objects.requireNonNull;
+
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
+import org.opendaylight.yangtools.yang.common.Empty;
 
-final class EmptyXmlCodec implements XmlCodec<Void> {
+final class EmptyXmlCodec implements XmlCodec<Empty> {
 
     static final EmptyXmlCodec INSTANCE = new EmptyXmlCodec();
 
@@ -21,17 +23,18 @@ final class EmptyXmlCodec implements XmlCodec<Void> {
     }
 
     @Override
-    public Class<Void> getDataType() {
-        return Void.class;
+    public Class<Empty> getDataType() {
+        return Empty.class;
     }
 
     @Override
-    public Void parseValue(final NamespaceContext ctx, final String str) {
-        return null;
+    public Empty parseValue(final NamespaceContext ctx, final String str) {
+        return Empty.getInstance();
     }
 
     @Override
-    public void writeValue(final XMLStreamWriter ctx, final Void value) throws XMLStreamException {
+    public void writeValue(final XMLStreamWriter ctx, final Empty value) throws XMLStreamException {
+        requireNonNull(value);
         ctx.writeCharacters("");
     }
 }