BUG 2973 - correction of output for empty yang type

Empty" type supports (de)serializiation from
JSON array with null ( [null] ) as was specified in
Section 3.3.9 of draft-lhotka-netmod-yang-json-02

Change-Id: I6650893c00212828cd771e477b81811917000713
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/LoggingNormalizedNodeStreamWriter.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/LoggingNormalizedNodeStreamWriter.java
index d8a8edf611487f5e81d74a134d3e643bea0d16fc..6f27b61b88bd52baf9403724b0778ccf59849386 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/LoggingNormalizedNodeStreamWriter.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/stream/LoggingNormalizedNodeStreamWriter.java
@@ -2,10 +2,8 @@ package org.opendaylight.yangtools.yang.data.api.schema.stream;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Strings;
-
 import java.util.ArrayDeque;
 import java.util.Deque;
-
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
@@ -104,7 +102,11 @@ public final class LoggingNormalizedNodeStreamWriter implements NormalizedNodeSt
 
     @Override
     public void leafNode(final NodeIdentifier name, final Object value) {
-        LOG.debug("{}{}(leaf({}))=", ind(), name, value.getClass().getSimpleName(), value);
+        if (value == null) {
+            LOG.debug("{}{}(leaf(null))=null", ind(), name);
+        } else {
+            LOG.debug("{}{}(leaf({}))={}", ind(), name, value.getClass().getSimpleName(), value);
+        }
     }
 
     @Override

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java
index 58f2c8f3554e82169f01854ccb408a57966e12a6..9df9b347dc16c59a19931c650814420d59a8c221 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONCodecFactory.java
@@ -20,6 +20,7 @@ import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.InstanceIdentifierTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition;
@@ -118,6 +119,9 @@ public final class JSONCodecFactory {
         if (type instanceof InstanceIdentifierTypeDefinition) {
             return (JSONCodec<Object>) iidCodec;
         }
+        if (type instanceof EmptyTypeDefinition) {
+            return (JSONCodec<Object>) JSONEmptyCodec.INSTANCE;
+        }
 
         final TypeDefinitionAwareCodec<Object, ?> codec = TypeDefinitionAwareCodec.from(type);
         if (codec == null) {

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONEmptyCodec.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONEmptyCodec.java
new file mode 100644 (file)
index 0000000..d2a5d88
--- /dev/null
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONEmptyCodec.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the 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.gson;
+
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+
+final class JSONEmptyCodec implements JSONCodec<Object> {
+
+    static final JSONEmptyCodec INSTANCE = new JSONEmptyCodec();
+
+    private JSONEmptyCodec() {
+
+    }
+
+    @Override
+    public Object deserialize(final String input) {
+        return null;
+    }
+
+    @Override
+    public String serialize(final Object input) {
+        return null;
+    }
+
+    @Override
+    public boolean needQuotes() {
+        return false;
+    }
+
+    @Override
+    public void serializeToWriter(final JsonWriter writer, final Object value) throws IOException {
+        writer.beginArray();
+        writer.value((String) null);
+        writer.endArray();
+    }
+
+}

diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java
index 7922b95197b63badb9676c4e95286677017ad9ab..f7eeff3f01bf87a365860e59ae070fd2d76c0d0d 100644 (file)
--- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java
+++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonParserStream.java
@@ -127,8 +127,12 @@ public final class JsonParserStream implements Closeable, Flushable {
         case BEGIN_ARRAY:
             in.beginArray();
             while (in.hasNext()) {
-                final AbstractNodeDataWithSchema newChild = newArrayEntry(parent);
-                read(in, newChild);
+                if (parent instanceof LeafNodeDataWithSchema) {
+                    read(in, parent);
+                } else {
+                    final AbstractNodeDataWithSchema newChild = newArrayEntry(parent);
+                    read(in, newChild);
+                }
             }
             in.endArray();
             return;
@@ -184,8 +188,8 @@ public final class JsonParserStream implements Closeable, Flushable {
         }
     }
 
-    private boolean isArray(final AbstractNodeDataWithSchema parent) {
-        return parent instanceof ListNodeDataWithSchema || parent instanceof ListNodeDataWithSchema;
+    private static boolean isArray(final AbstractNodeDataWithSchema parent) {
+        return parent instanceof ListNodeDataWithSchema || parent instanceof LeafListNodeDataWithSchema;
     }
 
     private AbstractNodeDataWithSchema newArrayEntry(final AbstractNodeDataWithSchema parent) {

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java
index c1ff375d2374ba29a7e3a9e61bd02ad768e4ccf2..058c2747ad1aaadacd6af8f1baa3e62a946aafcf 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/JsonStreamToNormalizedNodeTest.java
@@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.data.codec.gson;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.loadModules;
 import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.loadTextFile;
 
@@ -20,8 +21,13 @@ import java.net.URISyntaxException;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
+import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
+import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
@@ -33,6 +39,8 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode;
  */
 public class JsonStreamToNormalizedNodeTest {
 
+    private static final QName CONT_1 = QName.create("ns:complex:json", "2014-08-11", "cont1");
+    private static final QName EMPTY_LEAF = QName.create(CONT_1,"empty");
     private static SchemaContext schemaContext;
 
     @BeforeClass
@@ -161,6 +169,7 @@ public class JsonStreamToNormalizedNodeTest {
         try {
             //second parameter isn't necessary because error will be raised before it is used.
             verifyTransformationToNormalizedNode(inputJson, null);
+            fail("Expected exception not raised");
         } catch (final IllegalStateException e) {
             final String errorMessage = e.getMessage();
             assertTrue(errorMessage.contains("Choose suitable module name for element lf11-namesake:"));
@@ -169,6 +178,17 @@ public class JsonStreamToNormalizedNodeTest {
         }
     }
 
+    @Test
+    public void emptyTypeTest() throws IOException, URISyntaxException {
+        final String inputJson = loadTextFile("/complexjson/type-empty.json");
+        final ContainerNode awaitedStructure = Builders.containerBuilder()
+                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(CONT_1))
+                .addChild(ImmutableNodes.leafNode(EMPTY_LEAF, null))
+                .build();
+
+        verifyTransformationToNormalizedNode(inputJson, awaitedStructure);
+    }
+
     /**
      *
      * Exception expected.

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java
index 90fd51b80302a420df40ef01a93ef81cec99a4f0..ed1634a2b3d99d94529fdb96bf59a959cc44e6e4 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/NormalizedNodeToJsonStreamTest.java
@@ -19,6 +19,7 @@ import static org.opendaylight.yangtools.yang.data.codec.gson.TestUtils.resolveC
 import com.google.common.collect.Sets;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import java.io.IOException;
@@ -30,9 +31,14 @@ import java.util.Iterator;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
+import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
+import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
 /**
@@ -43,6 +49,8 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
  */
 public class NormalizedNodeToJsonStreamTest {
 
+    private static final QName CONT_1 = QName.create("ns:complex:json", "2014-08-11", "cont1");
+    private static final QName EMPTY_LEAF = QName.create(CONT_1,"empty");
     private static SchemaContext schemaContext;
 
     public interface JsonValidator {
@@ -76,19 +84,19 @@ public class NormalizedNodeToJsonStreamTest {
 
     @Test
     public void leafNodeInContainer() throws IOException, URISyntaxException {
-        Writer writer = new StringWriter();
-        NormalizedNode<?, ?> leafNodeInContainer = TestingNormalizedNodeStructuresCreator.leafNodeInContainer();
-        String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafNodeInContainer);
+        final Writer writer = new StringWriter();
+        final NormalizedNode<?, ?> leafNodeInContainer = TestingNormalizedNodeStructuresCreator.leafNodeInContainer();
+        final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafNodeInContainer);
         new JsonValidator() {
 
             @Override
-            public void validate(String jsonOutput) {
-                JsonObject cont1 = resolveCont1(jsonOutput);
+            public void validate(final String jsonOutput) {
+                final JsonObject cont1 = resolveCont1(jsonOutput);
                 assertNotNull(cont1);
 
-                JsonPrimitive lf11 = childPrimitive(cont1, "complexjson:lf11", "lf11");
+                final JsonPrimitive lf11 = childPrimitive(cont1, "complexjson:lf11", "lf11");
                 assertNotNull(lf11);
-                int asInt = lf11.getAsInt();
+                final int asInt = lf11.getAsInt();
                 assertEquals(453, asInt);
             }
         }.validate(jsonOutput);
@@ -97,20 +105,20 @@ public class NormalizedNodeToJsonStreamTest {
 
     @Test
     public void leafListNodeInContainerMultiline() throws IOException, URISyntaxException {
-        Writer writer = new StringWriter();
-        NormalizedNode<?, ?> leafListNodeInContainer = TestingNormalizedNodeStructuresCreator.leafListNodeInContainerMultiline();
-        String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafListNodeInContainer);
+        final Writer writer = new StringWriter();
+        final NormalizedNode<?, ?> leafListNodeInContainer = TestingNormalizedNodeStructuresCreator.leafListNodeInContainerMultiline();
+        final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafListNodeInContainer);
         new JsonValidator() {
 
             @Override
-            public void validate(String jsonOutput) {
-                JsonObject cont1 = resolveCont1(jsonOutput);
+            public void validate(final String jsonOutput) {
+                final JsonObject cont1 = resolveCont1(jsonOutput);
                 assertNotNull(cont1);
-                JsonArray lflst11 = childArray(cont1, "complexjson:lflst11", "lflst11");
+                final JsonArray lflst11 = childArray(cont1, "complexjson:lflst11", "lflst11");
                 assertNotNull(lflst11);
 
-                HashSet<Object> lflst11Values = Sets.newHashSet();
-                for (JsonElement jsonElement : lflst11) {
+                final HashSet<Object> lflst11Values = Sets.newHashSet();
+                for (final JsonElement jsonElement : lflst11) {
                     assertTrue(jsonElement instanceof JsonPrimitive);
                     lflst11Values.add(((JsonPrimitive) jsonElement).getAsString());
                 }
@@ -123,20 +131,20 @@ public class NormalizedNodeToJsonStreamTest {
 
     @Test
     public void leafNodeViaAugmentationInContainer() throws IOException, URISyntaxException {
-        Writer writer = new StringWriter();
-        NormalizedNode<?, ?> leafNodeViaAugmentationInContainer = TestingNormalizedNodeStructuresCreator
+        final Writer writer = new StringWriter();
+        final NormalizedNode<?, ?> leafNodeViaAugmentationInContainer = TestingNormalizedNodeStructuresCreator
                 .leafNodeViaAugmentationInContainer();
-        String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafNodeViaAugmentationInContainer);
+        final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafNodeViaAugmentationInContainer);
         new JsonValidator() {
 
             @Override
-            public void validate(String jsonOutput) {
-                JsonObject cont1 = resolveCont1(jsonOutput);
+            public void validate(final String jsonOutput) {
+                final JsonObject cont1 = resolveCont1(jsonOutput);
                 assertNotNull(cont1);
 
-                JsonPrimitive lf12_1 = childPrimitive(cont1, "complexjson:lf12_1", "lf12_1");
+                final JsonPrimitive lf12_1 = childPrimitive(cont1, "complexjson:lf12_1", "lf12_1");
                 assertNotNull(lf12_1);
-                String asString = lf12_1.getAsString();
+                final String asString = lf12_1.getAsString();
                 assertEquals("lf12 value", asString);
             }
         }.validate(jsonOutput);
@@ -145,20 +153,20 @@ public class NormalizedNodeToJsonStreamTest {
 
     @Test
     public void leafListNodeInContainer() throws IOException, URISyntaxException {
-        Writer writer = new StringWriter();
-        NormalizedNode<?, ?> leafListNodeInContainer = TestingNormalizedNodeStructuresCreator.leafListNodeInContainer();
-        String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafListNodeInContainer);
+        final Writer writer = new StringWriter();
+        final NormalizedNode<?, ?> leafListNodeInContainer = TestingNormalizedNodeStructuresCreator.leafListNodeInContainer();
+        final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, leafListNodeInContainer);
         new JsonValidator() {
 
             @Override
-            public void validate(String jsonOutput) {
-                JsonObject cont1 = resolveCont1(jsonOutput);
+            public void validate(final String jsonOutput) {
+                final JsonObject cont1 = resolveCont1(jsonOutput);
                 assertNotNull(cont1);
-                JsonArray lflst11 = childArray(cont1, "complexjson:lflst11", "lflst11");
+                final JsonArray lflst11 = childArray(cont1, "complexjson:lflst11", "lflst11");
                 assertNotNull(lflst11);
 
-                HashSet<Object> lflst11Values = Sets.newHashSet();
-                for (JsonElement jsonElement : lflst11) {
+                final HashSet<Object> lflst11Values = Sets.newHashSet();
+                for (final JsonElement jsonElement : lflst11) {
                     assertTrue(jsonElement instanceof JsonPrimitive);
                     lflst11Values.add(((JsonPrimitive) jsonElement).getAsString());
                 }
@@ -170,33 +178,33 @@ public class NormalizedNodeToJsonStreamTest {
 
     @Test
     public void keyedListNodeInContainer() throws IOException, URISyntaxException {
-        Writer writer = new StringWriter();
-        NormalizedNode<?, ?> keyedListNodeInContainer = TestingNormalizedNodeStructuresCreator
+        final Writer writer = new StringWriter();
+        final NormalizedNode<?, ?> keyedListNodeInContainer = TestingNormalizedNodeStructuresCreator
                 .keyedListNodeInContainer();
-        String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, keyedListNodeInContainer);
+        final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, keyedListNodeInContainer);
         new JsonValidator() {
 
             @Override
-            public void validate(String jsonOutput) {
-                JsonObject cont1 = resolveCont1(jsonOutput);
+            public void validate(final String jsonOutput) {
+                final JsonObject cont1 = resolveCont1(jsonOutput);
                 assertNotNull(cont1);
-                JsonArray lst11 = childArray(cont1, "complexjson:lst11", "lst11");
+                final JsonArray lst11 = childArray(cont1, "complexjson:lst11", "lst11");
                 assertNotNull(lst11);
 
-                Iterator<JsonElement> iterator = lst11.iterator();
+                final Iterator<JsonElement> iterator = lst11.iterator();
                 assertTrue(iterator.hasNext());
-                JsonElement lst11Entry1Raw = iterator.next();
+                final JsonElement lst11Entry1Raw = iterator.next();
                 assertFalse(iterator.hasNext());
                 assertTrue(lst11Entry1Raw instanceof JsonObject);
-                JsonObject lst11Entry1 = (JsonObject) lst11Entry1Raw;
+                final JsonObject lst11Entry1 = (JsonObject) lst11Entry1Raw;
 
-                JsonPrimitive key111 = childPrimitive(lst11Entry1, "complexjson:key111", "key111");
+                final JsonPrimitive key111 = childPrimitive(lst11Entry1, "complexjson:key111", "key111");
                 assertNotNull(key111);
-                JsonPrimitive lf112 = childPrimitive(lst11Entry1, "complexjson:lf112", "lf112");
+                final JsonPrimitive lf112 = childPrimitive(lst11Entry1, "complexjson:lf112", "lf112");
                 assertNotNull(lf112);
-                JsonPrimitive lf113 = childPrimitive(lst11Entry1, "complexjson:lf113", "lf113");
+                final JsonPrimitive lf113 = childPrimitive(lst11Entry1, "complexjson:lf113", "lf113");
                 assertNotNull(lf113);
-                JsonPrimitive lf111 = childPrimitive(lst11Entry1, "complexjson:lf111", "lf111");
+                final JsonPrimitive lf111 = childPrimitive(lst11Entry1, "complexjson:lf111", "lf111");
                 assertNotNull(lf111);
 
                 assertEquals("key111 value", key111.getAsString());
@@ -209,16 +217,16 @@ public class NormalizedNodeToJsonStreamTest {
 
     @Test
     public void choiceNodeInContainer() throws IOException, URISyntaxException {
-        Writer writer = new StringWriter();
-        NormalizedNode<?, ?> choiceNodeInContainer = TestingNormalizedNodeStructuresCreator.choiceNodeInContainer();
-        String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, choiceNodeInContainer);
+        final Writer writer = new StringWriter();
+        final NormalizedNode<?, ?> choiceNodeInContainer = TestingNormalizedNodeStructuresCreator.choiceNodeInContainer();
+        final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, choiceNodeInContainer);
         new JsonValidator() {
 
             @Override
-            public void validate(String jsonOutput) {
-                JsonObject cont1 = resolveCont1(jsonOutput);
+            public void validate(final String jsonOutput) {
+                final JsonObject cont1 = resolveCont1(jsonOutput);
                 assertNotNull(cont1);
-                JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13");
+                final JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13");
                 assertNotNull(lf13);
 
                 assertEquals("lf13 value", lf13.getAsString());
@@ -239,24 +247,24 @@ public class NormalizedNodeToJsonStreamTest {
 //    @Ignore
     @Test
     public void caseNodeAugmentationInChoiceInContainer() throws IOException, URISyntaxException {
-        Writer writer = new StringWriter();
-        NormalizedNode<?, ?> caseNodeAugmentationInChoiceInContainer = TestingNormalizedNodeStructuresCreator
+        final Writer writer = new StringWriter();
+        final NormalizedNode<?, ?> caseNodeAugmentationInChoiceInContainer = TestingNormalizedNodeStructuresCreator
                 .caseNodeAugmentationInChoiceInContainer();
-        String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, caseNodeAugmentationInChoiceInContainer);
+        final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer, caseNodeAugmentationInChoiceInContainer);
         new JsonValidator() {
 
             @Override
-            public void validate(String jsonOutput) {
-                JsonObject cont1 = resolveCont1(jsonOutput);
+            public void validate(final String jsonOutput) {
+                final JsonObject cont1 = resolveCont1(jsonOutput);
                 assertNotNull(cont1);
 
-                JsonPrimitive lf15_21 = childPrimitive(cont1, "complexjson:lf15_21", "lf15_21");
+                final JsonPrimitive lf15_21 = childPrimitive(cont1, "complexjson:lf15_21", "lf15_21");
                 assertNotNull(lf15_21);
-                JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13");
+                final JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13");
                 assertNotNull(lf13);
-                JsonPrimitive lf15_11 = childPrimitive(cont1, "complexjson:lf15_11", "lf15_11");
+                final JsonPrimitive lf15_11 = childPrimitive(cont1, "complexjson:lf15_11", "lf15_11");
                 assertNotNull(lf15_11);
-                JsonPrimitive lf15_12 = childPrimitive(cont1, "complexjson:lf15_12", "lf15_12");
+                final JsonPrimitive lf15_12 = childPrimitive(cont1, "complexjson:lf15_12", "lf15_12");
                 assertNotNull(lf15_12);
 
                 assertEquals("lf15_21 value", lf15_21.getAsString());
@@ -281,27 +289,27 @@ public class NormalizedNodeToJsonStreamTest {
 //    @Ignore
     @Test
     public void caseNodeExternalAugmentationInChoiceInContainer() throws IOException, URISyntaxException {
-        Writer writer = new StringWriter();
-        NormalizedNode<?, ?> caseNodeExternalAugmentationInChoiceInContainer = TestingNormalizedNodeStructuresCreator
+        final Writer writer = new StringWriter();
+        final NormalizedNode<?, ?> caseNodeExternalAugmentationInChoiceInContainer = TestingNormalizedNodeStructuresCreator
                 .caseNodeExternalAugmentationInChoiceInContainer();
-        String jsonOutput = normalizedNodeToJsonStreamTransformation(writer,
+        final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer,
                 caseNodeExternalAugmentationInChoiceInContainer);
         new JsonValidator() {
 
             @Override
-            public void validate(String jsonOutput) {
-                JsonObject cont1 = resolveCont1(jsonOutput);
+            public void validate(final String jsonOutput) {
+                final JsonObject cont1 = resolveCont1(jsonOutput);
                 assertNotNull(cont1);
 
-                JsonPrimitive lf15_11Augment = childPrimitive(cont1, "complexjson-augmentation:lf15_11");
+                final JsonPrimitive lf15_11Augment = childPrimitive(cont1, "complexjson-augmentation:lf15_11");
                 assertNotNull(lf15_11Augment);
-                JsonPrimitive lf15_12Augment = childPrimitive(cont1, "complexjson-augmentation:lf15_12");
+                final JsonPrimitive lf15_12Augment = childPrimitive(cont1, "complexjson-augmentation:lf15_12");
                 assertNotNull(lf15_12Augment);
-                JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13");
+                final JsonPrimitive lf13 = childPrimitive(cont1, "complexjson:lf13", "lf13");
                 assertNotNull(lf13);
-                JsonPrimitive lf15_11 = childPrimitive(cont1, "complexjson:lf15_11", "lf15_11");
+                final JsonPrimitive lf15_11 = childPrimitive(cont1, "complexjson:lf15_11", "lf15_11");
                 assertNotNull(lf15_11);
-                JsonPrimitive lf15_12 = childPrimitive(cont1, "complexjson:lf15_12", "lf15_12");
+                final JsonPrimitive lf15_12 = childPrimitive(cont1, "complexjson:lf15_12", "lf15_12");
                 assertNotNull(lf15_12);
 
                 assertEquals("lf15_11 value from augmentation", lf15_11Augment.getAsString());
@@ -326,19 +334,19 @@ public class NormalizedNodeToJsonStreamTest {
 //    @Ignore
     @Test
     public void choiceNodeAugmentationInContainer() throws IOException, URISyntaxException {
-        Writer writer = new StringWriter();
-        NormalizedNode<?, ?> choiceNodeAugmentationInContainer = TestingNormalizedNodeStructuresCreator
+        final Writer writer = new StringWriter();
+        final NormalizedNode<?, ?> choiceNodeAugmentationInContainer = TestingNormalizedNodeStructuresCreator
                 .choiceNodeAugmentationInContainer();
-        String jsonOutput = normalizedNodeToJsonStreamTransformation(writer,
+        final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer,
                 choiceNodeAugmentationInContainer);
         new JsonValidator() {
 
             @Override
-            public void validate(String jsonOutput) {
-                JsonObject cont1 = resolveCont1(jsonOutput);
+            public void validate(final String jsonOutput) {
+                final JsonObject cont1 = resolveCont1(jsonOutput);
                 assertNotNull(cont1);
 
-                JsonPrimitive lf17 = childPrimitive(cont1, "complexjson:lf17","lf17");
+                final JsonPrimitive lf17 = childPrimitive(cont1, "complexjson:lf17","lf17");
                 assertNotNull(lf17);
                 assertEquals("lf17 value",lf17.getAsString());
             }
@@ -347,29 +355,29 @@ public class NormalizedNodeToJsonStreamTest {
 
     @Test
     public void unkeyedNodeInContainer() throws IOException, URISyntaxException {
-        Writer writer = new StringWriter();
-        NormalizedNode<?, ?> unkeyedNodeInContainer = TestingNormalizedNodeStructuresCreator
+        final Writer writer = new StringWriter();
+        final NormalizedNode<?, ?> unkeyedNodeInContainer = TestingNormalizedNodeStructuresCreator
                 .unkeyedNodeInContainer();
-        String jsonOutput = normalizedNodeToJsonStreamTransformation(writer,
+        final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer,
                 unkeyedNodeInContainer);
         new JsonValidator() {
 
             @Override
-            public void validate(String jsonOutput) {
-                JsonObject cont1 = resolveCont1(jsonOutput);
+            public void validate(final String jsonOutput) {
+                final JsonObject cont1 = resolveCont1(jsonOutput);
                 assertNotNull(cont1);
 
-                JsonArray lst12 = childArray(cont1, "complexjson:lst12","lst12");
+                final JsonArray lst12 = childArray(cont1, "complexjson:lst12","lst12");
                 assertNotNull(lst12);
 
-                Iterator<JsonElement> iterator = lst12.iterator();
+                final Iterator<JsonElement> iterator = lst12.iterator();
                 assertTrue(iterator.hasNext());
-                JsonElement lst12Entry1Raw = iterator.next();
+                final JsonElement lst12Entry1Raw = iterator.next();
                 assertFalse(iterator.hasNext());
 
                 assertTrue(lst12Entry1Raw instanceof JsonObject);
-                JsonObject lst12Entry1 = (JsonObject)lst12Entry1Raw;
-                JsonPrimitive lf121 = childPrimitive(lst12Entry1, "complexjson:lf121", "lf121");
+                final JsonObject lst12Entry1 = (JsonObject)lst12Entry1Raw;
+                final JsonPrimitive lf121 = childPrimitive(lst12Entry1, "complexjson:lf121", "lf121");
                 assertNotNull(lf121);
 
                 assertEquals("lf121 value",lf121.getAsString());
@@ -379,6 +387,23 @@ public class NormalizedNodeToJsonStreamTest {
 
     }
 
+    @Test
+    public void emptyTypeTest() throws IOException, URISyntaxException {
+        final StringWriter writer = new StringWriter();
+        final ContainerNode emptyStructure = Builders.containerBuilder()
+                .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(CONT_1))
+                .addChild(ImmutableNodes.leafNode(EMPTY_LEAF, null))
+                .build();
+        final String jsonOutput = normalizedNodeToJsonStreamTransformation(writer,
+                emptyStructure);
+        final JsonObject cont1 = resolveCont1(jsonOutput);
+        final JsonElement emptyObj = cont1.get("empty");
+        assertNotNull(emptyObj);
+        assertTrue(emptyObj instanceof JsonArray);
+        assertEquals(1,emptyObj.getAsJsonArray().size());
+        assertTrue(emptyObj.getAsJsonArray().get(0) instanceof JsonNull);
+    }
+
     private String normalizedNodeToJsonStreamTransformation(final Writer writer,
             final NormalizedNode<?, ?> inputStructure) throws IOException {
 

diff --git a/yang/yang-data-codec-gson/src/test/resources/complexjson/complex-json.json b/yang/yang-data-codec-gson/src/test/resources/complexjson/complex-json.json
index 07490bdb633bd712fe96f3c4c039cdc30c98d069..355e2c2cff44e7f9f4ab80f10e2fddc9975652d4 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/resources/complexjson/complex-json.json
+++ b/yang/yang-data-codec-gson/src/test/resources/complexjson/complex-json.json
@@ -1,5 +1,6 @@
 {
     "complexjson:cont1": {
+        "empty": [null],
         "lf12-any":[
             {
                 "anyxml-in-data":"foo"

diff --git a/yang/yang-data-codec-gson/src/test/resources/complexjson/type-empty.json b/yang/yang-data-codec-gson/src/test/resources/complexjson/type-empty.json
new file mode 100644 (file)
index 0000000..ae5ca47
--- /dev/null
+++ b/yang/yang-data-codec-gson/src/test/resources/complexjson/type-empty.json
@@ -0,0 +1,6 @@
+{
+    "complexjson:cont1": 
+    {
+        "empty": [null]
+    }
+}
\ No newline at end of file

diff --git a/yang/yang-data-codec-gson/src/test/resources/complexjson/yang/complexjson.yang b/yang/yang-data-codec-gson/src/test/resources/complexjson/yang/complexjson.yang
index 051fe45901debf14115318e33a66cbffcb2a6658..b48b952b9de0593a84b70d8dbf3f9aa51f8336df 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/resources/complexjson/yang/complexjson.yang
+++ b/yang/yang-data-codec-gson/src/test/resources/complexjson/yang/complexjson.yang
@@ -14,6 +14,10 @@ module complexjson {
 
     container cont1 {
 
+        leaf empty {
+            type empty;
+        }
+
         anyxml lf12-any;
         anyxml lf13-any;
         anyxml lf14-any;