From cb247b77dfab26658e434a593ca282fcd723022f Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Tue, 10 Feb 2015 13:08:23 +0100 Subject: [PATCH] Make JSON serializer always serialize empty containers Even if their presence is not required Change-Id: I5913a3a07d39be14391488ae88f0243c0c7189d3 Signed-off-by: Maros Marsalek --- .../data/codec/gson/JSONNormalizedNodeStreamWriter.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java index 53c8d5439e..59ef1f1e50 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java @@ -20,7 +20,6 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.impl.codec.SchemaTracker; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -163,10 +162,9 @@ public class JSONNormalizedNodeStreamWriter implements NormalizedNodeStreamWrite public void startContainerNode(final NodeIdentifier name, final int childSizeHint) throws IOException { final SchemaNode schema = tracker.startContainerNode(name); - final boolean isPresence = schema instanceof ContainerSchemaNode ? - ((ContainerSchemaNode) schema).isPresenceContainer() : DEFAULT_EMIT_EMPTY_CONTAINERS; - - context = new JSONStreamWriterNamedObjectContext(context, name, isPresence); + // FIXME this code ignores presence for containers + // but datastore does as well and it needs be fixed first (2399) + context = new JSONStreamWriterNamedObjectContext(context, name, DEFAULT_EMIT_EMPTY_CONTAINERS); } @Override -- 2.36.6