/*
+ * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved.
*
- * 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
- *
+ * 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 com.google.common.base.Strings;
+import java.io.DataInput;
+import java.io.IOException;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.dom.DOMSource;
import org.opendaylight.controller.cluster.datastore.node.utils.QNameFactory;
+import org.opendaylight.yangtools.yang.common.Empty;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.Node;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-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.DataContainerChild;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+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.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 org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
- * NormalizedNodeInputStreamReader reads the byte stream and constructs the normalized node including its children nodes.
- * This process goes in recursive manner, where each NodeTypes object signifies the start of the object, except END_NODE.
- * If a node can have children, then that node's end is calculated based on appearance of END_NODE.
- *
+ * NormalizedNodeInputStreamReader reads the byte stream and constructs the normalized node including its children
+ * nodes. This process goes in recursive manner, where each NodeTypes object signifies the start of the object, except
+ * END_NODE. If a node can have children, then that node's end is calculated based on appearance of END_NODE.
*/
-
-public class NormalizedNodeInputStreamReader implements NormalizedNodeStreamReader {
+public class NormalizedNodeInputStreamReader implements NormalizedNodeDataInput {
private static final Logger LOG = LoggerFactory.getLogger(NormalizedNodeInputStreamReader.class);
private static final String REVISION_ARG = "?revision=";
- private final DataInputStream reader;
+ private final DataInput input;
private final Map<Integer, String> codedStringMap = new HashMap<>();
private QName lastLeafSetQName;
- public NormalizedNodeInputStreamReader(InputStream stream) throws IOException {
- Preconditions.checkNotNull(stream);
- reader = new DataInputStream(stream);
+ private NormalizedNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier,
+ Object, LeafNode<Object>> leafBuilder;
+
+ @SuppressWarnings("rawtypes")
+ private NormalizedNodeAttrBuilder<NodeWithValue, Object, LeafSetEntryNode<Object>> leafSetEntryBuilder;
+
+ private final StringBuilder reusableStringBuilder = new StringBuilder(50);
+
+ private boolean readSignatureMarker = true;
+
+ NormalizedNodeInputStreamReader(final DataInput input, final boolean versionChecked) {
+ this.input = Preconditions.checkNotNull(input);
+ readSignatureMarker = !versionChecked;
}
@Override
public NormalizedNode<?, ?> readNormalizedNode() throws IOException {
- NormalizedNode<?, ?> node = null;
+ readSignatureMarkerAndVersionIfNeeded();
+ return readNormalizedNodeInternal();
+ }
+
+ private void readSignatureMarkerAndVersionIfNeeded() throws IOException {
+ if (readSignatureMarker) {
+ readSignatureMarker = false;
+ final byte marker = input.readByte();
+ if (marker != TokenTypes.SIGNATURE_MARKER) {
+ throw new InvalidNormalizedNodeStreamException(String.format(
+ "Invalid signature marker: %d", marker));
+ }
+
+ final short version = input.readShort();
+ if (version != TokenTypes.LITHIUM_VERSION) {
+ throw new InvalidNormalizedNodeStreamException(String.format("Unhandled stream version %s", version));
+ }
+ }
+ }
+
+ private NormalizedNode<?, ?> readNormalizedNodeInternal() throws IOException {
// each node should start with a byte
- byte nodeType = reader.readByte();
+ byte nodeType = input.readByte();
- if(nodeType == NodeTypes.END_NODE) {
- LOG.debug("End node reached. return");
+ if (nodeType == NodeTypes.END_NODE) {
+ LOG.trace("End node reached. return");
+ lastLeafSetQName = null;
return null;
}
- else if(nodeType == NodeTypes.AUGMENTATION_NODE) {
- LOG.debug("Reading augmentation node. will create augmentation identifier");
- YangInstanceIdentifier.AugmentationIdentifier identifier =
- new YangInstanceIdentifier.AugmentationIdentifier(readQNameSet());
- DataContainerNodeBuilder<YangInstanceIdentifier.AugmentationIdentifier, AugmentationNode> augmentationBuilder =
- Builders.augmentationBuilder().withNodeIdentifier(identifier);
- augmentationBuilder = addDataContainerChildren(augmentationBuilder);
- node = augmentationBuilder.build();
+ switch (nodeType) {
+ case NodeTypes.AUGMENTATION_NODE :
+ YangInstanceIdentifier.AugmentationIdentifier augIdentifier =
+ new YangInstanceIdentifier.AugmentationIdentifier(readQNameSet());
- } else {
- if(nodeType == NodeTypes.LEAF_SET_ENTRY_NODE) {
- LOG.debug("Reading leaf set entry node. Will create NodeWithValue instance identifier");
+ LOG.trace("Reading augmentation node {} ", augIdentifier);
+
+ return addDataContainerChildren(Builders.augmentationBuilder()
+ .withNodeIdentifier(augIdentifier)).build();
+
+ case NodeTypes.LEAF_SET_ENTRY_NODE :
+ QName name = lastLeafSetQName;
+ if (name == null) {
+ name = readQName();
+ }
- // Read the object value
Object value = readObject();
+ NodeWithValue<Object> leafIdentifier = new NodeWithValue<>(name, value);
- YangInstanceIdentifier.NodeWithValue nodeWithValue = new YangInstanceIdentifier.NodeWithValue(
- lastLeafSetQName, value);
- node = Builders.leafSetEntryBuilder().withNodeIdentifier(nodeWithValue).
- withValue(value).build();
+ LOG.trace("Reading leaf set entry node {}, value {}", leafIdentifier, value);
- } else if(nodeType == NodeTypes.MAP_ENTRY_NODE) {
- LOG.debug("Reading map entry node. Will create node identifier with predicates.");
+ return leafSetEntryBuilder().withNodeIdentifier(leafIdentifier).withValue(value).build();
- QName qName = readQName();
- YangInstanceIdentifier.NodeIdentifierWithPredicates nodeIdentifier =
- new YangInstanceIdentifier.NodeIdentifierWithPredicates(qName, readKeyValueMap());
- DataContainerNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> mapEntryBuilder
- = Builders.mapEntryBuilder().withNodeIdentifier(nodeIdentifier);
+ case NodeTypes.MAP_ENTRY_NODE :
+ NodeIdentifierWithPredicates entryIdentifier = new NodeIdentifierWithPredicates(
+ readQName(), readKeyValueMap());
- mapEntryBuilder = (DataContainerNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifierWithPredicates,
- MapEntryNode>)addDataContainerChildren(mapEntryBuilder);
- node = mapEntryBuilder.build();
+ LOG.trace("Reading map entry node {} ", entryIdentifier);
- } else {
- LOG.debug("Creating standard node identifier. ");
+ return addDataContainerChildren(Builders.mapEntryBuilder()
+ .withNodeIdentifier(entryIdentifier)).build();
- QName qName = readQName();
- YangInstanceIdentifier.NodeIdentifier identifier = new YangInstanceIdentifier.NodeIdentifier(qName);
- node = readNodeIdentifierDependentNode(nodeType, identifier);
+ default :
+ return readNodeIdentifierDependentNode(nodeType, new NodeIdentifier(readQName()));
+ }
+ }
- }
+ private NormalizedNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier,
+ Object, LeafNode<Object>> leafBuilder() {
+ if (leafBuilder == null) {
+ leafBuilder = Builders.leafBuilder();
+ }
+
+ return leafBuilder;
+ }
+
+ @SuppressWarnings("rawtypes")
+ private NormalizedNodeAttrBuilder<NodeWithValue, Object,
+ LeafSetEntryNode<Object>> leafSetEntryBuilder() {
+ if (leafSetEntryBuilder == null) {
+ leafSetEntryBuilder = Builders.leafSetEntryBuilder();
}
- return node;
+
+ return leafSetEntryBuilder;
}
- private NormalizedNode<?, ?> readNodeIdentifierDependentNode(byte nodeType, YangInstanceIdentifier.NodeIdentifier identifier)
+ private NormalizedNode<?, ?> readNodeIdentifierDependentNode(final byte nodeType, final NodeIdentifier identifier)
throws IOException {
- switch(nodeType) {
+ switch (nodeType) {
case NodeTypes.LEAF_NODE :
- LOG.debug("Read leaf node");
+ LOG.trace("Read leaf node {}", identifier);
// Read the object value
- NormalizedNodeAttrBuilder leafBuilder = Builders.leafBuilder();
- return leafBuilder.withNodeIdentifier(identifier).withValue(readObject()).build();
+ return leafBuilder().withNodeIdentifier(identifier).withValue(readObject()).build();
case NodeTypes.ANY_XML_NODE :
- LOG.debug("Read xml node");
- Node<?> value = (Node<?>) readObject();
- return Builders.anyXmlBuilder().withValue(value).build();
+ LOG.trace("Read xml node");
+ return Builders.anyXmlBuilder().withNodeIdentifier(identifier).withValue(readDOMSource()).build();
case NodeTypes.MAP_NODE :
- LOG.debug("Read map node");
- CollectionNodeBuilder<MapEntryNode, MapNode> mapBuilder = Builders.mapBuilder().withNodeIdentifier(identifier);
- mapBuilder = addMapNodeChildren(mapBuilder);
- return mapBuilder.build();
-
- case NodeTypes.CHOICE_NODE :
- LOG.debug("Read choice node");
- DataContainerNodeBuilder<YangInstanceIdentifier.NodeIdentifier, ChoiceNode> choiceBuilder =
- Builders.choiceBuilder().withNodeIdentifier(identifier);
- choiceBuilder = addDataContainerChildren(choiceBuilder);
- return choiceBuilder.build();
-
- case NodeTypes.ORDERED_MAP_NODE :
- LOG.debug("Reading ordered map node");
- CollectionNodeBuilder<MapEntryNode, OrderedMapNode> orderedMapBuilder =
- Builders.orderedMapBuilder().withNodeIdentifier(identifier);
- orderedMapBuilder = addMapNodeChildren(orderedMapBuilder);
- return orderedMapBuilder.build();
-
- case NodeTypes.UNKEYED_LIST :
- LOG.debug("Read unkeyed list node");
- CollectionNodeBuilder<UnkeyedListEntryNode, UnkeyedListNode> unkeyedListBuilder =
- Builders.unkeyedListBuilder().withNodeIdentifier(identifier);
- unkeyedListBuilder = addUnkeyedListChildren(unkeyedListBuilder);
- return unkeyedListBuilder.build();
-
- case NodeTypes.UNKEYED_LIST_ITEM :
- LOG.debug("Read unkeyed list item node");
- DataContainerNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier, UnkeyedListEntryNode> unkeyedListEntryBuilder
- = Builders.unkeyedListEntryBuilder().withNodeIdentifier(identifier);
-
- unkeyedListEntryBuilder = (DataContainerNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier, UnkeyedListEntryNode>)
- addDataContainerChildren(unkeyedListEntryBuilder);
- return unkeyedListEntryBuilder.build();
-
- case NodeTypes.CONTAINER_NODE :
- LOG.debug("Read container node");
- DataContainerNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode> containerBuilder =
- Builders.containerBuilder().withNodeIdentifier(identifier);
-
- containerBuilder = (DataContainerNodeAttrBuilder<YangInstanceIdentifier.NodeIdentifier, ContainerNode>)
- addDataContainerChildren(containerBuilder);
- return containerBuilder.build();
+ LOG.trace("Read map node {}", identifier);
+ return addDataContainerChildren(Builders.mapBuilder().withNodeIdentifier(identifier)).build();
+
+ case NodeTypes.CHOICE_NODE:
+ LOG.trace("Read choice node {}", identifier);
+ return addDataContainerChildren(Builders.choiceBuilder().withNodeIdentifier(identifier)).build();
+
+ case NodeTypes.ORDERED_MAP_NODE:
+ LOG.trace("Reading ordered map node {}", identifier);
+ return addDataContainerChildren(Builders.orderedMapBuilder().withNodeIdentifier(identifier)).build();
+
+ case NodeTypes.UNKEYED_LIST:
+ LOG.trace("Read unkeyed list node {}", identifier);
+ return addDataContainerChildren(Builders.unkeyedListBuilder().withNodeIdentifier(identifier)).build();
+
+ case NodeTypes.UNKEYED_LIST_ITEM:
+ LOG.trace("Read unkeyed list item node {}", identifier);
+ return addDataContainerChildren(Builders.unkeyedListEntryBuilder()
+ .withNodeIdentifier(identifier)).build();
+
+ case NodeTypes.CONTAINER_NODE:
+ LOG.trace("Read container node {}", identifier);
+ return addDataContainerChildren(Builders.containerBuilder().withNodeIdentifier(identifier)).build();
case NodeTypes.LEAF_SET :
- LOG.debug("Read leaf set node");
- ListNodeBuilder<Object, LeafSetEntryNode<Object>> leafSetBuilder =
- Builders.leafSetBuilder().withNodeIdentifier(identifier);
- leafSetBuilder = addLeafSetChildren(identifier.getNodeType(), leafSetBuilder);
- return leafSetBuilder.build();
+ LOG.trace("Read leaf set node {}", identifier);
+ return addLeafSetChildren(identifier.getNodeType(),
+ Builders.leafSetBuilder().withNodeIdentifier(identifier)).build();
+
+ case NodeTypes.ORDERED_LEAF_SET:
+ LOG.trace("Read ordered leaf set node {}", identifier);
+ ListNodeBuilder<Object, LeafSetEntryNode<Object>> orderedLeafSetBuilder =
+ Builders.orderedLeafSetBuilder().withNodeIdentifier(identifier);
+ orderedLeafSetBuilder = addLeafSetChildren(identifier.getNodeType(), orderedLeafSetBuilder);
+ return orderedLeafSetBuilder.build();
default :
return null;
}
}
+ private DOMSource readDOMSource() throws IOException {
+ String xml = readObject().toString();
+ try {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ Element node = factory.newDocumentBuilder().parse(
+ new InputSource(new StringReader(xml))).getDocumentElement();
+ return new DOMSource(node);
+ } catch (SAXException | ParserConfigurationException e) {
+ throw new IOException("Error parsing XML: " + xml, e);
+ }
+ }
+
private QName readQName() throws IOException {
// Read in the same sequence of writing
String localName = readCodedString();
String namespace = readCodedString();
String revision = readCodedString();
- String qName;
- // Not using stringbuilder as compiler optimizes string concatenation of +
- if(revision != null){
- qName = "(" + namespace+ REVISION_ARG + revision + ")" +localName;
+
+ String qname;
+ if (!Strings.isNullOrEmpty(revision)) {
+ qname = reusableStringBuilder.append('(').append(namespace).append(REVISION_ARG).append(revision)
+ .append(')').append(localName).toString();
} else {
- qName = "(" + namespace + ")" +localName;
+ qname = reusableStringBuilder.append('(').append(namespace).append(')').append(localName).toString();
}
- return QNameFactory.create(qName);
+ reusableStringBuilder.delete(0, reusableStringBuilder.length());
+ return QNameFactory.create(qname);
}
private String readCodedString() throws IOException {
- boolean readFromMap = reader.readBoolean();
- if(readFromMap) {
- return codedStringMap.get(reader.readInt());
- } else {
- String value = reader.readUTF();
- if(value != null) {
- codedStringMap.put(Integer.valueOf(codedStringMap.size()), value);
- }
+ byte valueType = input.readByte();
+ if (valueType == TokenTypes.IS_CODE_VALUE) {
+ return codedStringMap.get(input.readInt());
+ } else if (valueType == TokenTypes.IS_STRING_VALUE) {
+ String value = input.readUTF().intern();
+ codedStringMap.put(codedStringMap.size(), value);
return value;
}
+
+ return null;
}
- private Set<QName> readQNameSet() throws IOException{
+ private Set<QName> readQNameSet() throws IOException {
// Read the children count
- int count = reader.readInt();
+ int count = input.readInt();
Set<QName> children = new HashSet<>(count);
- for(int i = 0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
children.add(readQName());
}
return children;
}
private Map<QName, Object> readKeyValueMap() throws IOException {
- int count = reader.readInt();
+ int count = input.readInt();
Map<QName, Object> keyValueMap = new HashMap<>(count);
- for(int i = 0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
keyValueMap.put(readQName(), readObject());
}
}
private Object readObject() throws IOException {
- byte objectType = reader.readByte();
- switch(objectType) {
+ byte objectType = input.readByte();
+ switch (objectType) {
case ValueTypes.BITS_TYPE:
return readObjSet();
case ValueTypes.BOOL_TYPE :
- return reader.readBoolean();
+ return input.readBoolean();
case ValueTypes.BYTE_TYPE :
- return reader.readByte();
+ return input.readByte();
case ValueTypes.INT_TYPE :
- return reader.readInt();
+ return input.readInt();
case ValueTypes.LONG_TYPE :
- return reader.readLong();
+ return input.readLong();
case ValueTypes.QNAME_TYPE :
return readQName();
case ValueTypes.SHORT_TYPE :
- return reader.readShort();
+ return input.readShort();
case ValueTypes.STRING_TYPE :
- return reader.readUTF();
+ return input.readUTF();
+
+ case ValueTypes.STRING_BYTES_TYPE:
+ return readStringBytes();
case ValueTypes.BIG_DECIMAL_TYPE :
- return new BigDecimal(reader.readUTF());
+ return new BigDecimal(input.readUTF());
case ValueTypes.BIG_INTEGER_TYPE :
- return new BigInteger(reader.readUTF());
+ return new BigInteger(input.readUTF());
- case ValueTypes.YANG_IDENTIFIER_TYPE :
- int size = reader.readInt();
+ case ValueTypes.BINARY_TYPE :
+ byte[] bytes = new byte[input.readInt()];
+ input.readFully(bytes);
+ return bytes;
- List<YangInstanceIdentifier.PathArgument> pathArguments = new ArrayList<>(size);
+ case ValueTypes.YANG_IDENTIFIER_TYPE :
+ return readYangInstanceIdentifierInternal();
- for(int i=0; i<size; i++) {
- pathArguments.add(readPathArgument());
- }
- return YangInstanceIdentifier.create(pathArguments);
+ case ValueTypes.EMPTY_TYPE:
+ // Leaf nodes no longer allow null values and thus we no longer emit null values. Previously, the "empty"
+ // yang type was represented as null so we translate an incoming null value to Empty. It was possible for
+ // a BI user to set a string leaf to null and we're rolling the dice here but the chances for that are
+ // very low. We'd have to know the yang type but, even if we did, we can't let a null value pass upstream
+ // so we'd have to drop the leaf which might cause other issues.
+ case ValueTypes.NULL_TYPE:
+ return Empty.getInstance();
default :
return null;
}
}
+ private String readStringBytes() throws IOException {
+ byte[] bytes = new byte[input.readInt()];
+ input.readFully(bytes);
+ return new String(bytes, StandardCharsets.UTF_8);
+ }
+
+ @Override
+ public SchemaPath readSchemaPath() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+
+ final boolean absolute = input.readBoolean();
+ final int size = input.readInt();
+ final Collection<QName> qnames = new ArrayList<>(size);
+ for (int i = 0; i < size; ++i) {
+ qnames.add(readQName());
+ }
+
+ return SchemaPath.create(qnames, absolute);
+ }
+
+ @Override
+ public YangInstanceIdentifier readYangInstanceIdentifier() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return readYangInstanceIdentifierInternal();
+ }
+
+ private YangInstanceIdentifier readYangInstanceIdentifierInternal() throws IOException {
+ int size = input.readInt();
+
+ List<PathArgument> pathArguments = new ArrayList<>(size);
+
+ for (int i = 0; i < size; i++) {
+ pathArguments.add(readPathArgument());
+ }
+ return YangInstanceIdentifier.create(pathArguments);
+ }
+
private Set<String> readObjSet() throws IOException {
- int count = reader.readInt();
+ int count = input.readInt();
Set<String> children = new HashSet<>(count);
- for(int i = 0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
children.add(readCodedString());
}
return children;
}
- private YangInstanceIdentifier.PathArgument readPathArgument() throws IOException {
+ @Override
+ public PathArgument readPathArgument() throws IOException {
// read Type
- int type = reader.readByte();
+ int type = input.readByte();
- switch(type) {
+ switch (type) {
case PathArgumentTypes.AUGMENTATION_IDENTIFIER :
return new YangInstanceIdentifier.AugmentationIdentifier(readQNameSet());
case PathArgumentTypes.NODE_IDENTIFIER :
- return new YangInstanceIdentifier.NodeIdentifier(readQName());
+ return new NodeIdentifier(readQName());
case PathArgumentTypes.NODE_IDENTIFIER_WITH_PREDICATES :
- return new YangInstanceIdentifier.NodeIdentifierWithPredicates(readQName(), readKeyValueMap());
+ return new NodeIdentifierWithPredicates(readQName(), readKeyValueMap());
case PathArgumentTypes.NODE_IDENTIFIER_WITH_VALUE :
- return new YangInstanceIdentifier.NodeWithValue(readQName(), readObject());
+ return new NodeWithValue<>(readQName(), readObject());
default :
return null;
}
}
- private ListNodeBuilder<Object, LeafSetEntryNode<Object>> addLeafSetChildren(QName nodeType,
- ListNodeBuilder<Object, LeafSetEntryNode<Object>> builder)
- throws IOException {
+ @SuppressWarnings("unchecked")
+ private ListNodeBuilder<Object, LeafSetEntryNode<Object>> addLeafSetChildren(final QName nodeType,
+ final ListNodeBuilder<Object, LeafSetEntryNode<Object>> builder) throws IOException {
- LOG.debug("Reading children of leaf set");
+ LOG.trace("Reading children of leaf set");
lastLeafSetQName = nodeType;
- LeafSetEntryNode<Object> child = (LeafSetEntryNode<Object>)readNormalizedNode();
+ LeafSetEntryNode<Object> child = (LeafSetEntryNode<Object>)readNormalizedNodeInternal();
- while(child != null) {
+ while (child != null) {
builder.withChild(child);
- child = (LeafSetEntryNode<Object>)readNormalizedNode();
+ child = (LeafSetEntryNode<Object>)readNormalizedNodeInternal();
}
return builder;
}
- private CollectionNodeBuilder<UnkeyedListEntryNode, UnkeyedListNode> addUnkeyedListChildren(
- CollectionNodeBuilder<UnkeyedListEntryNode, UnkeyedListNode> builder)
- throws IOException{
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ private NormalizedNodeContainerBuilder addDataContainerChildren(
+ final NormalizedNodeContainerBuilder builder) throws IOException {
+ LOG.trace("Reading data container (leaf nodes) nodes");
- LOG.debug("Reading children of unkeyed list");
- UnkeyedListEntryNode child = (UnkeyedListEntryNode)readNormalizedNode();
+ NormalizedNode<?, ?> child = readNormalizedNodeInternal();
- while(child != null) {
- builder.withChild(child);
- child = (UnkeyedListEntryNode)readNormalizedNode();
+ while (child != null) {
+ builder.addChild(child);
+ child = readNormalizedNodeInternal();
}
return builder;
}
- private DataContainerNodeBuilder addDataContainerChildren(DataContainerNodeBuilder builder)
- throws IOException {
- LOG.debug("Reading data container (leaf nodes) nodes");
+ @Override
+ public void readFully(final byte[] value) throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ input.readFully(value);
+ }
- DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> child =
- (DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>) readNormalizedNode();
+ @Override
+ public void readFully(final byte[] str, final int off, final int len) throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ input.readFully(str, off, len);
+ }
- while(child != null) {
- builder.withChild(child);
- child =
- (DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?>) readNormalizedNode();
- }
- return builder;
+ @Override
+ public int skipBytes(final int num) throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.skipBytes(num);
}
+ @Override
+ public boolean readBoolean() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readBoolean();
+ }
- private CollectionNodeBuilder addMapNodeChildren(CollectionNodeBuilder builder)
- throws IOException {
- LOG.debug("Reading map node children");
- MapEntryNode child = (MapEntryNode)readNormalizedNode();
+ @Override
+ public byte readByte() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readByte();
+ }
- while(child != null){
- builder.withChild(child);
- child = (MapEntryNode)readNormalizedNode();
- }
+ @Override
+ public int readUnsignedByte() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readUnsignedByte();
+ }
- return builder;
+ @Override
+ public short readShort() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readShort();
+ }
+
+ @Override
+ public int readUnsignedShort() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readUnsignedShort();
+ }
+
+ @Override
+ public char readChar() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readChar();
+ }
+
+ @Override
+ public int readInt() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readInt();
}
+ @Override
+ public long readLong() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readLong();
+ }
@Override
- public void close() throws IOException {
- reader.close();
+ public float readFloat() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readFloat();
}
+ @Override
+ public double readDouble() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readDouble();
+ }
+
+ @Override
+ public String readLine() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readLine();
+ }
+
+ @Override
+ public String readUTF() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+ return input.readUTF();
+ }
}
Code Review / controller.git / blobdiff