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=cf4ec56ced5b0882e191069bca1b5b70786b493b;hb=b08cec09b7113965fbda5ef1757ca23d7588e5cc;hp=002781a9b3e783bf07ec3a566223962cb8958d16;hpb=657b0b025a92f9d0ad6647d79950071031d7b0b4;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 index 002781a9b3..cf4ec56ced 100755 --- 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 @@ -7,7 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore.node.utils.stream; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.DataOutput; import java.io.IOException; @@ -15,7 +18,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; @@ -47,7 +50,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut private boolean inSimple; AbstractNormalizedNodeDataOutput(final DataOutput output) { - this.output = Preconditions.checkNotNull(output); + this.output = requireNonNull(output); } private void ensureHeaderWritten() throws IOException { @@ -60,8 +63,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 @@ -164,28 +165,26 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startLeafNode(final NodeIdentifier name) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); LOG.trace("Starting a new leaf node"); - startNode(name.getNodeType(), NodeTypes.LEAF_NODE); + startNode(name, NodeTypes.LEAF_NODE); inSimple = true; } @Override public void startLeafSet(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); LOG.trace("Starting a new leaf set"); - - lastLeafSetQName = name.getNodeType(); - startNode(name.getNodeType(), NodeTypes.LEAF_SET); + commonStartLeafSet(name, NodeTypes.LEAF_SET); } @Override public void startOrderedLeafSet(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); LOG.trace("Starting a new ordered leaf set"); + commonStartLeafSet(name, NodeTypes.ORDERED_LEAF_SET); + } + private void commonStartLeafSet(final NodeIdentifier name, final byte nodeType) throws IOException { + startNode(name, nodeType); lastLeafSetQName = name.getNodeType(); - startNode(name.getNodeType(), NodeTypes.ORDERED_LEAF_SET); } @Override @@ -204,75 +203,57 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startContainerNode(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.trace("Starting a new container node"); - - startNode(name.getNodeType(), NodeTypes.CONTAINER_NODE); + startNode(name, NodeTypes.CONTAINER_NODE); } @Override public void startYangModeledAnyXmlNode(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); - LOG.trace("Starting a new yang modeled anyXml node"); - - startNode(name.getNodeType(), NodeTypes.YANG_MODELED_ANY_XML_NODE); + startNode(name, NodeTypes.YANG_MODELED_ANY_XML_NODE); } @Override public void startUnkeyedList(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); LOG.trace("Starting a new unkeyed list"); - - startNode(name.getNodeType(), NodeTypes.UNKEYED_LIST); + startNode(name, NodeTypes.UNKEYED_LIST); } @Override public void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); LOG.trace("Starting a new unkeyed list item"); - - startNode(name.getNodeType(), NodeTypes.UNKEYED_LIST_ITEM); + startNode(name, NodeTypes.UNKEYED_LIST_ITEM); } @Override public void startMapNode(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); LOG.trace("Starting a new map node"); - - startNode(name.getNodeType(), NodeTypes.MAP_NODE); + startNode(name, NodeTypes.MAP_NODE); } @Override public void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(identifier, "Node identifier should not be null"); LOG.trace("Starting a new map entry node"); - startNode(identifier.getNodeType(), NodeTypes.MAP_ENTRY_NODE); - - writeKeyValueMap(identifier.getKeyValues()); + startNode(identifier, NodeTypes.MAP_ENTRY_NODE); + writeKeyValueMap(identifier.entrySet()); } @Override public void startOrderedMapNode(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); LOG.trace("Starting a new ordered map node"); - - startNode(name.getNodeType(), NodeTypes.ORDERED_MAP_NODE); + startNode(name, NodeTypes.ORDERED_MAP_NODE); } @Override public void startChoiceNode(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); LOG.trace("Starting a new choice node"); - - startNode(name.getNodeType(), NodeTypes.CHOICE_NODE); + startNode(name, NodeTypes.CHOICE_NODE); } @Override public void startAugmentationNode(final AugmentationIdentifier identifier) throws IOException { - Preconditions.checkNotNull(identifier, "Node identifier should not be null"); + requireNonNull(identifier, "Node identifier should not be null"); LOG.trace("Starting a new augmentation node"); output.writeByte(NodeTypes.AUGMENTATION_NODE); @@ -281,9 +262,8 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startAnyxmlNode(final NodeIdentifier name) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); LOG.trace("Starting any xml node"); - startNode(name.getNodeType(), NodeTypes.ANY_XML_NODE); + startNode(name, NodeTypes.ANY_XML_NODE); inSimple = true; } @@ -325,24 +305,22 @@ 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"); + private void startNode(final PathArgument arg, final byte nodeType) throws IOException { + requireNonNull(arg, "Node identifier should not be null"); + checkState(!inSimple, "Attempted to start a child in a simple node"); ensureHeaderWritten(); // First write the type of node output.writeByte(nodeType); // Write Start Tag - writeQName(qname); + writeQName(arg.getNodeType()); } private void writeObjSet(final Set set) throws IOException { output.writeInt(set.size()); for (Object o : set) { - Preconditions.checkArgument(o instanceof String, "Expected value type to be String but was %s (%s)", - o.getClass(), o); - + checkArgument(o instanceof String, "Expected value type to be String but was %s (%s)", o.getClass(), o); writeString((String) o); } } @@ -397,7 +375,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut (NodeIdentifierWithPredicates) pathArgument; writeQName(nodeIdentifierWithPredicates.getNodeType()); - writeKeyValueMap(nodeIdentifierWithPredicates.getKeyValues()); + writeKeyValueMap(nodeIdentifierWithPredicates.entrySet()); break; case PathArgumentTypes.NODE_IDENTIFIER_WITH_VALUE : @@ -419,11 +397,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()); }