X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fnode%2Futils%2Fstream%2FAbstractNormalizedNodeDataOutput.java;h=161a450ddc6b7993f49f4f6ff97ecad2ee0b0df2;hb=refs%2Fchanges%2F29%2F83829%2F3;hp=735f40d9a47c26fcedc04523af0e21a92e78b1c7;hpb=917283d6f5633ad981bebb6dfc6d6e0245876ab5;p=controller.git diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java old mode 100644 new mode 100755 index 735f40d9a4..161a450ddc --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java @@ -15,7 +15,7 @@ import java.io.OutputStream; import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.util.Collection; -import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; @@ -44,6 +44,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut private NormalizedNodeWriter normalizedNodeWriter; private boolean headerWritten; private QName lastLeafSetQName; + private boolean inSimple; AbstractNormalizedNodeDataOutput(final DataOutput output) { this.output = Preconditions.checkNotNull(output); @@ -59,8 +60,6 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut protected abstract short streamVersion(); - protected abstract void writeQName(QName qname) throws IOException; - protected abstract void writeString(String string) throws IOException; @Override @@ -162,146 +161,140 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut } @Override - public void leafNode(final NodeIdentifier name, final Object value) throws IOException, IllegalArgumentException { + public void startLeafNode(final NodeIdentifier name) throws IOException { Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.debug("Writing a new leaf node"); + LOG.trace("Starting a new leaf node"); startNode(name.getNodeType(), NodeTypes.LEAF_NODE); - - writeObject(value); + inSimple = true; } @Override - public void startLeafSet(final NodeIdentifier name, final int childSizeHint) - - throws IOException, IllegalArgumentException { + public void startLeafSet(final NodeIdentifier name, final int childSizeHint) throws IOException { Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.debug("Starting a new leaf set"); + LOG.trace("Starting a new leaf set"); lastLeafSetQName = name.getNodeType(); startNode(name.getNodeType(), NodeTypes.LEAF_SET); } @Override - public void startOrderedLeafSet(final NodeIdentifier name, final int childSizeHint) - throws IOException, IllegalArgumentException { + public void startOrderedLeafSet(final NodeIdentifier name, final int childSizeHint) throws IOException { Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.debug("Starting a new ordered leaf set"); + LOG.trace("Starting a new ordered leaf set"); lastLeafSetQName = name.getNodeType(); startNode(name.getNodeType(), NodeTypes.ORDERED_LEAF_SET); } @Override - public void leafSetEntryNode(final QName name, final Object value) throws IOException, IllegalArgumentException { - LOG.debug("Writing a new leaf set entry node"); + public void startLeafSetEntryNode(final NodeWithValue name) throws IOException { + LOG.trace("Starting a new leaf set entry node"); output.writeByte(NodeTypes.LEAF_SET_ENTRY_NODE); // lastLeafSetQName is set if the parent LeafSetNode was previously written. Otherwise this is a // stand alone LeafSetEntryNode so write out it's name here. if (lastLeafSetQName == null) { - writeQName(name); + writeQName(name.getNodeType()); } - - writeObject(value); + inSimple = true; } @Override - public void startContainerNode(final NodeIdentifier name, final int childSizeHint) - throws IOException, IllegalArgumentException { + public void startContainerNode(final NodeIdentifier name, final int childSizeHint) throws IOException { Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.debug("Starting a new container node"); + LOG.trace("Starting a new container node"); startNode(name.getNodeType(), NodeTypes.CONTAINER_NODE); } @Override - public void startYangModeledAnyXmlNode(final NodeIdentifier name, final int childSizeHint) - throws IOException, IllegalArgumentException { + public void startYangModeledAnyXmlNode(final NodeIdentifier name, final int childSizeHint) throws IOException { Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.debug("Starting a new yang modeled anyXml node"); + LOG.trace("Starting a new yang modeled anyXml node"); startNode(name.getNodeType(), NodeTypes.YANG_MODELED_ANY_XML_NODE); } @Override - public void startUnkeyedList(final NodeIdentifier name, final int childSizeHint) - throws IOException, IllegalArgumentException { + public void startUnkeyedList(final NodeIdentifier name, final int childSizeHint) throws IOException { Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.debug("Starting a new unkeyed list"); + LOG.trace("Starting a new unkeyed list"); startNode(name.getNodeType(), NodeTypes.UNKEYED_LIST); } @Override - public void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint) - throws IOException, IllegalStateException { + public void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint) throws IOException { Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.debug("Starting a new unkeyed list item"); + LOG.trace("Starting a new unkeyed list item"); startNode(name.getNodeType(), NodeTypes.UNKEYED_LIST_ITEM); } @Override - public void startMapNode(final NodeIdentifier name, final int childSizeHint) - throws IOException, IllegalArgumentException { + public void startMapNode(final NodeIdentifier name, final int childSizeHint) throws IOException { Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.debug("Starting a new map node"); + LOG.trace("Starting a new map node"); startNode(name.getNodeType(), NodeTypes.MAP_NODE); } @Override public void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint) - throws IOException, IllegalArgumentException { + throws IOException { Preconditions.checkNotNull(identifier, "Node identifier should not be null"); - LOG.debug("Starting a new map entry node"); + LOG.trace("Starting a new map entry node"); startNode(identifier.getNodeType(), NodeTypes.MAP_ENTRY_NODE); - writeKeyValueMap(identifier.getKeyValues()); - + writeKeyValueMap(identifier.entrySet()); } @Override - public void startOrderedMapNode(final NodeIdentifier name, final int childSizeHint) - throws IOException, IllegalArgumentException { + public void startOrderedMapNode(final NodeIdentifier name, final int childSizeHint) throws IOException { Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.debug("Starting a new ordered map node"); + LOG.trace("Starting a new ordered map node"); startNode(name.getNodeType(), NodeTypes.ORDERED_MAP_NODE); } @Override - public void startChoiceNode(final NodeIdentifier name, final int childSizeHint) - throws IOException, IllegalArgumentException { + public void startChoiceNode(final NodeIdentifier name, final int childSizeHint) throws IOException { Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.debug("Starting a new choice node"); + LOG.trace("Starting a new choice node"); startNode(name.getNodeType(), NodeTypes.CHOICE_NODE); } @Override - public void startAugmentationNode(final AugmentationIdentifier identifier) - throws IOException, IllegalArgumentException { + public void startAugmentationNode(final AugmentationIdentifier identifier) throws IOException { Preconditions.checkNotNull(identifier, "Node identifier should not be null"); - LOG.debug("Starting a new augmentation node"); + LOG.trace("Starting a new augmentation node"); output.writeByte(NodeTypes.AUGMENTATION_NODE); - writeQNameSet(identifier.getPossibleChildNames()); + writeAugmentationIdentifier(identifier); } @Override - public void anyxmlNode(final NodeIdentifier name, final Object value) throws IOException, IllegalArgumentException { + public void startAnyxmlNode(final NodeIdentifier name) throws IOException { Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.debug("Writing any xml node"); - + LOG.trace("Starting any xml node"); startNode(name.getNodeType(), NodeTypes.ANY_XML_NODE); + inSimple = true; + } + @Override + public void scalarValue(final Object value) throws IOException { + writeObject(value); + } + + @Override + public void domSourceValue(final DOMSource value) throws IOException { try { StreamResult xmlOutput = new StreamResult(new StringWriter()); - TransformerFactory.newInstance().newTransformer().transform((DOMSource)value, xmlOutput); + TransformerFactory.newInstance().newTransformer().transform(value, xmlOutput); writeObject(xmlOutput.getWriter().toString()); } catch (TransformerException | TransformerFactoryConfigurationError e) { throw new IOException("Error writing anyXml", e); @@ -309,10 +302,13 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut } @Override - public void endNode() throws IOException, IllegalStateException { - LOG.debug("Ending the node"); - - output.writeByte(NodeTypes.END_NODE); + public void endNode() throws IOException { + LOG.trace("Ending the node"); + if (!inSimple) { + lastLeafSetQName = null; + output.writeByte(NodeTypes.END_NODE); + } + inSimple = false; } @Override @@ -329,6 +325,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut private void startNode(final QName qname, final byte nodeType) throws IOException { Preconditions.checkNotNull(qname, "QName of node identifier should not be null."); + Preconditions.checkState(!inSimple, "Attempted to start a child in a simple node"); ensureHeaderWritten(); @@ -398,7 +395,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut (NodeIdentifierWithPredicates) pathArgument; writeQName(nodeIdentifierWithPredicates.getNodeType()); - writeKeyValueMap(nodeIdentifierWithPredicates.getKeyValues()); + writeKeyValueMap(nodeIdentifierWithPredicates.entrySet()); break; case PathArgumentTypes.NODE_IDENTIFIER_WITH_VALUE : @@ -411,10 +408,8 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut case PathArgumentTypes.AUGMENTATION_IDENTIFIER : - AugmentationIdentifier augmentationIdentifier = (AugmentationIdentifier) pathArgument; - // No Qname in augmentation identifier - writeQNameSet(augmentationIdentifier.getPossibleChildNames()); + writeAugmentationIdentifier((AugmentationIdentifier) pathArgument); break; default : throw new IllegalStateException("Unknown node identifier type is found : " @@ -422,11 +417,10 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut } } - private void writeKeyValueMap(final Map keyValueMap) throws IOException { - if (keyValueMap != null && !keyValueMap.isEmpty()) { - output.writeInt(keyValueMap.size()); - - for (Map.Entry entry : keyValueMap.entrySet()) { + private void writeKeyValueMap(final Set> entrySet) throws IOException { + if (!entrySet.isEmpty()) { + output.writeInt(entrySet.size()); + for (Entry entry : entrySet) { writeQName(entry.getKey()); writeObject(entry.getValue()); } @@ -435,11 +429,12 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut } } - private void writeQNameSet(final Set children) throws IOException { + void writeAugmentationIdentifier(final AugmentationIdentifier aid) throws IOException { + final Set qnames = aid.getPossibleChildNames(); // Write each child's qname separately, if list is empty send count as 0 - if (children != null && !children.isEmpty()) { - output.writeInt(children.size()); - for (QName qname : children) { + if (!qnames.isEmpty()) { + output.writeInt(qnames.size()); + for (QName qname : qnames) { writeQName(qname); } } else { @@ -484,7 +479,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut case ValueTypes.YANG_IDENTIFIER_TYPE: writeYangInstanceIdentifierInternal((YangInstanceIdentifier) value); break; - case ValueTypes.NULL_TYPE : + case ValueTypes.EMPTY_TYPE: break; case ValueTypes.STRING_BYTES_TYPE: final byte[] valueBytes = value.toString().getBytes(StandardCharsets.UTF_8);