From b1df382aeadfd33ad934ce683ee68882e27fca4b Mon Sep 17 00:00:00 2001 From: tpantelis Date: Mon, 27 Oct 2014 17:13:58 -0400 Subject: [PATCH] Bug 2265: Modified NormalizedNodeOutputStreamWriter to implement yangtools interface The NormalizedNodeOutputStreamWriter was originally written to implement a NormalizedNodeStreamWriter interface class that was copied from yangtools. This was done to get access to the NodeWithValue in the leafSetEntryNode method which isn't specified in the yangtools interface. However it turns out we don't actually need the NodeWithValue so NormalizedNodeOutputStreamWriter was changed to implement the yangtols interface and the copied NormalizedNodeStreamWriter interface was removed. Change-Id: I72f0c96359e4fe96e8e183aa7afba9291c5d519d Signed-off-by: tpantelis --- .../NormalizedNodeInputStreamReader.java | 31 ++- .../NormalizedNodeOutputStreamWriter.java | 13 +- .../stream/NormalizedNodeStreamWriter.java | 219 ------------------ .../NormalizedNodeStreamReaderWriterTest.java | 13 +- .../utils/stream/NormalizedNodeWriter.java | 190 --------------- .../SampleNormalizedNodeSerializable.java | 3 + 6 files changed, 34 insertions(+), 435 deletions(-) delete mode 100644 opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamWriter.java delete mode 100644 opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeWriter.java diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java index bdc52bca68..b59a32efc9 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java @@ -55,19 +55,22 @@ import java.util.Set; public class NormalizedNodeInputStreamReader implements NormalizedNodeStreamReader { - private DataInputStream reader; - private static final Logger LOG = LoggerFactory.getLogger(NormalizedNodeInputStreamReader.class); - private Map codedStringMap = new HashMap<>(); private static final String REVISION_ARG = "?revision="; + private final DataInputStream reader; + + private final Map codedStringMap = new HashMap<>(); + + private QName lastLeafSetQName; + public NormalizedNodeInputStreamReader(InputStream stream) throws IOException { Preconditions.checkNotNull(stream); reader = new DataInputStream(stream); } - + @Override public NormalizedNode readNormalizedNode() throws IOException { NormalizedNode node = null; @@ -89,20 +92,21 @@ public class NormalizedNodeInputStreamReader implements NormalizedNodeStreamRead node = augmentationBuilder.build(); } else { - QName qName = readQName(); - if(nodeType == NodeTypes.LEAF_SET_ENTRY_NODE) { LOG.debug("Reading leaf set entry node. Will create NodeWithValue instance identifier"); // Read the object value Object value = readObject(); - YangInstanceIdentifier.NodeWithValue nodeWithValue = new YangInstanceIdentifier.NodeWithValue(qName, value); - node = Builders.leafSetEntryBuilder().withNodeIdentifier(nodeWithValue).withValue(value).build(); + YangInstanceIdentifier.NodeWithValue nodeWithValue = new YangInstanceIdentifier.NodeWithValue( + lastLeafSetQName, value); + node = Builders.leafSetEntryBuilder().withNodeIdentifier(nodeWithValue). + withValue(value).build(); } else if(nodeType == NodeTypes.MAP_ENTRY_NODE) { LOG.debug("Reading map entry node. Will create node identifier with predicates."); + QName qName = readQName(); YangInstanceIdentifier.NodeIdentifierWithPredicates nodeIdentifier = new YangInstanceIdentifier.NodeIdentifierWithPredicates(qName, readKeyValueMap()); DataContainerNodeAttrBuilder mapEntryBuilder @@ -114,6 +118,8 @@ public class NormalizedNodeInputStreamReader implements NormalizedNodeStreamRead } else { LOG.debug("Creating standard node identifier. "); + + QName qName = readQName(); YangInstanceIdentifier.NodeIdentifier identifier = new YangInstanceIdentifier.NodeIdentifier(qName); node = readNodeIdentifierDependentNode(nodeType, identifier); @@ -186,7 +192,7 @@ public class NormalizedNodeInputStreamReader implements NormalizedNodeStreamRead LOG.debug("Read leaf set node"); ListNodeBuilder> leafSetBuilder = Builders.leafSetBuilder().withNodeIdentifier(identifier); - leafSetBuilder = addLeafSetChildren(leafSetBuilder); + leafSetBuilder = addLeafSetChildren(identifier.getNodeType(), leafSetBuilder); return leafSetBuilder.build(); default : @@ -325,11 +331,14 @@ public class NormalizedNodeInputStreamReader implements NormalizedNodeStreamRead } } - private ListNodeBuilder> addLeafSetChildren(ListNodeBuilder> builder) + private ListNodeBuilder> addLeafSetChildren(QName nodeType, + ListNodeBuilder> builder) throws IOException { LOG.debug("Reading children of leaf set"); + + lastLeafSetQName = nodeType; + LeafSetEntryNode child = (LeafSetEntryNode)readNormalizedNode(); while(child != null) { diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java index 05a47a0401..cbd7bf8853 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java @@ -14,6 +14,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,11 +42,11 @@ import java.util.Set; public class NormalizedNodeOutputStreamWriter implements NormalizedNodeStreamWriter{ - private DataOutputStream writer; - private static final Logger LOG = LoggerFactory.getLogger(NormalizedNodeOutputStreamWriter.class); - private Map stringCodeMap = new HashMap<>(); + private final DataOutputStream writer; + + private final Map stringCodeMap = new HashMap<>(); public NormalizedNodeOutputStreamWriter(OutputStream stream) throws IOException { Preconditions.checkNotNull(stream); @@ -70,12 +71,10 @@ public class NormalizedNodeOutputStreamWriter implements NormalizedNodeStreamWri } @Override - public void leafSetEntryNode(YangInstanceIdentifier.NodeWithValue name, Object value) throws IOException, IllegalArgumentException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); - + public void leafSetEntryNode(Object value) throws IOException, IllegalArgumentException { LOG.debug("Writing a new leaf set entry node"); - startNode(name.getNodeType(), NodeTypes.LEAF_SET_ENTRY_NODE); + writer.writeByte(NodeTypes.LEAF_SET_ENTRY_NODE); writeObject(value); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamWriter.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamWriter.java deleted file mode 100644 index af95b61423..0000000000 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamWriter.java +++ /dev/null @@ -1,219 +0,0 @@ - -/* - * Copyright (c) 2014 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.controller.cluster.datastore.node.utils.stream; - -import java.io.Closeable; -import java.io.Flushable; -import java.io.IOException; - -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; - -/** - * Event Stream Writer based on Normalized Node tree representation - * - *

Writing Event Stream

- * - *
    - *
  • container - Container node representation, start event is - * emitted using {@link #startContainerNode(YangInstanceIdentifier.NodeIdentifier, int)} - * and node end event is - * emitted using {@link #endNode()}. Container node is implementing - * {@link org.opendaylight.yangtools.yang.binding.DataObject} interface. - * - *
  • list - YANG list statement has two representation in event - * stream - unkeyed list and map. Unkeyed list is YANG list which did not - * specify key.
    • - * - *
      - *
    • Map - Map start event is emitted using - * {@link #startMapNode(YangInstanceIdentifier.NodeIdentifier, int)} - * and is ended using {@link #endNode()}. Each map entry start is emitted using - * {@link #startMapEntryNode(YangInstanceIdentifier.NodeIdentifierWithPredicates, int)} - * with Map of keys - * and finished using {@link #endNode()}.
      • - * - *
    • UnkeyedList - Unkeyed list represent list without keys, - * unkeyed list start is emitted using - * {@link #startUnkeyedList(YangInstanceIdentifier.NodeIdentifier, int)} list - * end is emitted using {@link #endNode()}. Each list item is emitted using - * {@link #startUnkeyedListItem(YangInstanceIdentifier.NodeIdentifier, int)} - * and ended using {@link #endNode()}.
      • - *
    - * - *
  • leaf - Leaf node event is emitted using - * {@link #leafNode(YangInstanceIdentifier.NodeIdentifier, Object)}. - * {@link #endNode()} MUST NOT BE emitted for - * leaf node.
    • - * - *
  • leaf-list - Leaf list start is emitted using - * {@link #startLeafSet(YangInstanceIdentifier.NodeIdentifier, int)}. - * Leaf list end is emitted using - * {@link #endNode()}. Leaf list entries are emitted using - * {@link #leafSetEntryNode(YangInstanceIdentifier.NodeWithValue name, Object). - * - *
  • anyxml - Anyxml node event is emitted using - * {@link #leafNode(YangInstanceIdentifier.NodeIdentifier, Object)}. {@link #endNode()} MUST NOT BE emitted - * for anyxml node.
    • - * - * - *
  • choice Choice node event is emmited by - * {@link #startChoiceNode(YangInstanceIdentifier.NodeIdentifier, int)} event and - * finished by invoking {@link #endNode()} - *
  • - * augment - Represents augmentation, augmentation node is started - * by invoking {@link #startAugmentationNode(YangInstanceIdentifier.AugmentationIdentifier)} and - * finished by invoking {@link #endNode()}.
    • - * - *
- * - *

Implementation notes

- * - *

- * Implementations of this interface must not hold user suppled objects - * and resources needlessly. - * - */ - -public interface NormalizedNodeStreamWriter extends Closeable, Flushable { - - public final int UNKNOWN_SIZE = -1; - - /** - * Write the leaf node identifier and value to the stream. - * @param name - * @param value - * @throws IOException - * @throws IllegalArgumentException - */ - void leafNode(YangInstanceIdentifier.NodeIdentifier name, Object value) - throws IOException, IllegalArgumentException; - - /** - * Start writing leaf Set node. You must call {@link #endNode()} once you are done writing all of its children. - * @param name - * @param childSizeHint is the estimated children count. Usage is optional in implementation. - * @throws IOException - * @throws IllegalArgumentException - */ - void startLeafSet(YangInstanceIdentifier.NodeIdentifier name, int childSizeHint) - throws IOException, IllegalArgumentException; - - /** - * Write the leaf Set Entry Node object to the stream with identifier and value. - * @param name - * @param value - * @throws IOException - * @throws IllegalArgumentException - */ - void leafSetEntryNode(YangInstanceIdentifier.NodeWithValue name, Object value) - throws IOException, IllegalArgumentException; - - /** - * Start writing container node. You must call {@link #endNode()} once you are done writing all of its children. - * @param name - * @param childSizeHint is the estimated children count. Usage is optional in implementation. - * @throws IOException - * @throws IllegalArgumentException - */ - void startContainerNode(YangInstanceIdentifier.NodeIdentifier name, int childSizeHint) - throws IOException, IllegalArgumentException; - - /** - * Start writing unkeyed list node. You must call {@link #endNode()} once you are done writing all of its children. - * @param name - * @param childSizeHint is the estimated children count. Usage is optional in implementation. - * @throws IOException - * @throws IllegalArgumentException - */ - void startUnkeyedList(YangInstanceIdentifier.NodeIdentifier name, int childSizeHint) - throws IOException, IllegalArgumentException; - - /** - * Start writing unkeyed list item. You must call {@link #endNode()} once you are done writing all of its children. - * @param name - * @param childSizeHint is the estimated children count. Usage is optional in implementation. - * @throws IOException - * @throws IllegalStateException - */ - void startUnkeyedListItem(YangInstanceIdentifier.NodeIdentifier name, int childSizeHint) - throws IOException, IllegalStateException; - - /** - * Start writing map node. You must call {@link #endNode()} once you are done writing all of its children. - * @param name - * @param childSizeHint is the estimated children count. Usage is optional in implementation. - * @throws IOException - * @throws IllegalArgumentException - */ - void startMapNode(YangInstanceIdentifier.NodeIdentifier name, int childSizeHint) - throws IOException, IllegalArgumentException; - - /** - * Start writing map entry node. You must call {@link #endNode()} once you are done writing all of its children. - * @param identifier - * @param childSizeHint is the estimated children count. Usage is optional in implementation. - * @throws IOException - * @throws IllegalArgumentException - */ - void startMapEntryNode(YangInstanceIdentifier.NodeIdentifierWithPredicates identifier, int childSizeHint) - throws IOException, IllegalArgumentException; - - /** - * Start writing ordered map node. You must call {@link #endNode()} once you are done writing all of its children. - * @param name - * @param childSizeHint is the estimated children count. Usage is optional in implementation. - * @throws IOException - * @throws IllegalArgumentException - */ - void startOrderedMapNode(YangInstanceIdentifier.NodeIdentifier name, int childSizeHint) - throws IOException, IllegalArgumentException; - - /** - * Start writing choice node. You must call {@link #endNode()} once you are done writing all of its children. - * @param name - * @param childSizeHint is the estimated children count. Usage is optional in implementation. - * @throws IOException - * @throws IllegalArgumentException - */ - void startChoiceNode(YangInstanceIdentifier.NodeIdentifier name, int childSizeHint) - throws IOException, IllegalArgumentException; - - /** - * Start writing augmentation node. You must call {@link #endNode()} once you are done writing all of its children. - * @param identifier - * @throws IOException - * @throws IllegalArgumentException - */ - void startAugmentationNode(YangInstanceIdentifier.AugmentationIdentifier identifier) - throws IOException, IllegalArgumentException; - - /** - * Write any xml node identifier and value to the stream - * @param name - * @param value - * @throws IOException - * @throws IllegalArgumentException - */ - void anyxmlNode(YangInstanceIdentifier.NodeIdentifier name, Object value) - throws IOException, IllegalArgumentException; - - /** - * This method should be used to add end symbol/identifier of node in the stream. - * @throws IOException - * @throws IllegalStateException - */ - void endNode() throws IOException, IllegalStateException; - - @Override - void close() throws IOException; - - @Override - void flush() throws IOException; -} diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java index 052f609e92..ae548dba23 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java @@ -16,19 +16,19 @@ import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.util.TestModel; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import static org.junit.Assert.fail; - public class NormalizedNodeStreamReaderWriterTest { final NormalizedNode input = TestModel.createTestContainer(); @Test - public void testNormalizedNodeStreamReaderWriter() { + public void testNormalizedNodeStreamReaderWriter() throws IOException { byte[] byteData = null; @@ -39,17 +39,14 @@ public class NormalizedNodeStreamReaderWriterTest { normalizedNodeWriter.write(input); byteData = byteArrayOutputStream.toByteArray(); - } catch (IOException e) { - fail("Writing to OutputStream failed :" + e.toString()); } - try(NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader(new ByteArrayInputStream(byteData))) { + try(NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader( + new ByteArrayInputStream(byteData))) { NormalizedNode node = reader.readNormalizedNode(); Assert.assertEquals(input, node); - } catch (IOException e) { - fail("Reading from InputStream failed :" + e.toString()); } } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeWriter.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeWriter.java deleted file mode 100644 index 845038e3fd..0000000000 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeWriter.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (c) 2014 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.controller.cluster.datastore.node.utils.stream; - -import com.google.common.base.Preconditions; -import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode; -import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode; -import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode; -import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; -import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; -import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.OrderedMapNode; -import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; - -import java.io.Closeable; -import java.io.Flushable; -import java.io.IOException; -import java.util.Collection; - -import static org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeStreamWriter.UNKNOWN_SIZE; - - -/** - * This class is used only for testing purpose for now, we may use similar logic while integrating - * with cluster - */ - -public class NormalizedNodeWriter implements Closeable, Flushable { - private final NormalizedNodeStreamWriter writer; - - private NormalizedNodeWriter(final NormalizedNodeStreamWriter writer) { - this.writer = Preconditions.checkNotNull(writer); - } - - protected final NormalizedNodeStreamWriter getWriter() { - return writer; - } - - /** - * Create a new writer backed by a {@link org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter}. - * - * @param writer Back-end writer - * @return A new instance. - */ - public static NormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer) { - return new NormalizedNodeWriter(writer); - } - - - /** - * Iterate over the provided {@link org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode} and emit write - * events to the encapsulated {@link org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter}. - * - * @param node Node - * @return - * @throws java.io.IOException when thrown from the backing writer. - */ - public final NormalizedNodeWriter write(final NormalizedNode node) throws IOException { - if (wasProcessedAsComplexNode(node)) { - return this; - } - - if (wasProcessAsSimpleNode(node)) { - return this; - } - - throw new IllegalStateException("It wasn't possible to serialize node " + node); - } - - @Override - public void flush() throws IOException { - writer.flush(); - } - - @Override - public void close() throws IOException { - writer.flush(); - writer.close(); - } - - /** - * Emit a best guess of a hint for a particular set of children. It evaluates the - * iterable to see if the size can be easily gotten to. If it is, we hint at the - * real number of child nodes. Otherwise we emit UNKNOWN_SIZE. - * - * @param children Child nodes - * @return Best estimate of the collection size required to hold all the children. - */ - static final int childSizeHint(final Iterable children) { - return (children instanceof Collection) ? ((Collection) children).size() : UNKNOWN_SIZE; - } - - private boolean wasProcessAsSimpleNode(final NormalizedNode node) throws IOException { - if (node instanceof LeafSetEntryNode) { - final LeafSetEntryNode nodeAsLeafList = (LeafSetEntryNode)node; - writer.leafSetEntryNode(nodeAsLeafList.getIdentifier(), nodeAsLeafList.getValue()); - return true; - } else if (node instanceof LeafNode) { - final LeafNode nodeAsLeaf = (LeafNode)node; - writer.leafNode(nodeAsLeaf.getIdentifier(), nodeAsLeaf.getValue()); - return true; - } else if (node instanceof AnyXmlNode) { - final AnyXmlNode anyXmlNode = (AnyXmlNode)node; - writer.anyxmlNode(anyXmlNode.getIdentifier(), anyXmlNode.getValue()); - return true; - } - - return false; - } - - /** - * Emit events for all children and then emit an endNode() event. - * - * @param children Child iterable - * @return True - * @throws java.io.IOException when the writer reports it - */ - protected final boolean writeChildren(final Iterable> children) throws IOException { - for (NormalizedNode child : children) { - write(child); - } - - writer.endNode(); - return true; - } - - protected boolean writeMapEntryNode(final MapEntryNode node) throws IOException { - writer.startMapEntryNode(node.getIdentifier(), childSizeHint(node.getValue())); - return writeChildren(node.getValue()); - } - - private boolean wasProcessedAsComplexNode(final NormalizedNode node) throws IOException { - if (node instanceof ContainerNode) { - final ContainerNode n = (ContainerNode) node; - writer.startContainerNode(n.getIdentifier(), childSizeHint(n.getValue())); - return writeChildren(n.getValue()); - } - if (node instanceof MapEntryNode) { - return writeMapEntryNode((MapEntryNode) node); - } - if (node instanceof UnkeyedListEntryNode) { - final UnkeyedListEntryNode n = (UnkeyedListEntryNode) node; - writer.startUnkeyedListItem(n.getIdentifier(), childSizeHint(n.getValue())); - return writeChildren(n.getValue()); - } - if (node instanceof ChoiceNode) { - final ChoiceNode n = (ChoiceNode) node; - writer.startChoiceNode(n.getIdentifier(), childSizeHint(n.getValue())); - return writeChildren(n.getValue()); - } - if (node instanceof AugmentationNode) { - final AugmentationNode n = (AugmentationNode) node; - writer.startAugmentationNode(n.getIdentifier()); - return writeChildren(n.getValue()); - } - if (node instanceof UnkeyedListNode) { - final UnkeyedListNode n = (UnkeyedListNode) node; - writer.startUnkeyedList(n.getIdentifier(), childSizeHint(n.getValue())); - return writeChildren(n.getValue()); - } - if (node instanceof OrderedMapNode) { - final OrderedMapNode n = (OrderedMapNode) node; - writer.startOrderedMapNode(n.getIdentifier(), childSizeHint(n.getValue())); - return writeChildren(n.getValue()); - } - if (node instanceof MapNode) { - final MapNode n = (MapNode) node; - writer.startMapNode(n.getIdentifier(), childSizeHint(n.getValue())); - return writeChildren(n.getValue()); - } - if (node instanceof LeafSetNode) { - //covers also OrderedLeafSetNode for which doesn't exist start* method - final LeafSetNode n = (LeafSetNode) node; - writer.startLeafSet(n.getIdentifier(), childSizeHint(n.getValue())); - return writeChildren(n.getValue()); - } - - return false; - } -} diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SampleNormalizedNodeSerializable.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SampleNormalizedNodeSerializable.java index 33d48a5278..10a2ad90a5 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SampleNormalizedNodeSerializable.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SampleNormalizedNodeSerializable.java @@ -10,6 +10,8 @@ package org.opendaylight.controller.cluster.datastore.node.utils.stream; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; +import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; import java.io.IOException; import java.io.ObjectInputStream; @@ -18,6 +20,7 @@ import java.io.Serializable; import java.net.URISyntaxException; public class SampleNormalizedNodeSerializable implements Serializable { + private static final long serialVersionUID = 1L; private NormalizedNode input; -- 2.36.6