import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList.Builder;
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.util.ImmutableOffsetMapTemplate;
+import org.opendaylight.yangtools.yang.common.Empty;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
return leafSetEntryBuilder().withNodeIdentifier(leafIdentifier).withValue(value).build();
case NodeTypes.MAP_ENTRY_NODE :
- NodeIdentifierWithPredicates entryIdentifier = new NodeIdentifierWithPredicates(
- readQName(), readKeyValueMap());
+ NodeIdentifierWithPredicates entryIdentifier = readNormalizedNodeWithPredicates();
LOG.trace("Reading map entry node {} ", entryIdentifier);
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();
+ return addLeafSetChildren(identifier.getNodeType(),
+ Builders.orderedLeafSetBuilder().withNodeIdentifier(identifier)).build();
- default :
+ default:
return null;
}
}
return codedStringMap.get(input.readInt());
} else if (valueType == TokenTypes.IS_STRING_VALUE) {
String value = input.readUTF().intern();
- codedStringMap.put(Integer.valueOf(codedStringMap.size()), value);
+ codedStringMap.put(codedStringMap.size(), value);
return value;
}
return children;
}
- private Map<QName, Object> readKeyValueMap() throws IOException {
- int count = input.readInt();
- Map<QName, Object> keyValueMap = new HashMap<>(count);
+ private NodeIdentifierWithPredicates readNormalizedNodeWithPredicates() throws IOException {
+ final QName qname = readQName();
+ final int count = input.readInt();
+ switch (count) {
+ case 0:
+ return new NodeIdentifierWithPredicates(qname);
+ case 1:
+ return new NodeIdentifierWithPredicates(qname, readQName(), readObject());
+ default:
+ // ImmutableList is used by ImmutableOffsetMapTemplate for lookups, hence we use that.
+ final Builder<QName> keys = ImmutableList.builderWithExpectedSize(count);
+ final Object[] values = new Object[count];
+ for (int i = 0; i < count; i++) {
+ keys.add(readQName());
+ values[i] = readObject();
+ }
- for (int i = 0; i < count; i++) {
- keyValueMap.put(readQName(), readObject());
+ return new NodeIdentifierWithPredicates(qname, ImmutableOffsetMapTemplate.ordered(keys.build())
+ .instantiateWithValues(values));
}
-
- return keyValueMap;
}
private Object readObject() throws IOException {
return readObjSet();
case ValueTypes.BOOL_TYPE :
- return Boolean.valueOf(input.readBoolean());
+ return input.readBoolean();
case ValueTypes.BYTE_TYPE :
- return Byte.valueOf(input.readByte());
+ return input.readByte();
case ValueTypes.INT_TYPE :
- return Integer.valueOf(input.readInt());
+ return input.readInt();
case ValueTypes.LONG_TYPE :
- return Long.valueOf(input.readLong());
+ return input.readLong();
case ValueTypes.QNAME_TYPE :
return readQName();
case ValueTypes.SHORT_TYPE :
- return Short.valueOf(input.readShort());
+ return input.readShort();
case ValueTypes.STRING_TYPE :
return input.readUTF();
case ValueTypes.YANG_IDENTIFIER_TYPE :
return readYangInstanceIdentifierInternal();
+ 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;
}
final boolean absolute = input.readBoolean();
final int size = input.readInt();
- final Collection<QName> qnames = new ArrayList<>(size);
+
+ final Builder<QName> qnames = ImmutableList.builderWithExpectedSize(size);
for (int i = 0; i < size; ++i) {
qnames.add(readQName());
}
-
- return SchemaPath.create(qnames, absolute);
+ return SchemaPath.create(qnames.build(), absolute);
}
@Override
private YangInstanceIdentifier readYangInstanceIdentifierInternal() throws IOException {
int size = input.readInt();
-
- List<PathArgument> pathArguments = new ArrayList<>(size);
-
+ final Builder<PathArgument> pathArguments = ImmutableList.builderWithExpectedSize(size);
for (int i = 0; i < size; i++) {
pathArguments.add(readPathArgument());
}
- return YangInstanceIdentifier.create(pathArguments);
+ return YangInstanceIdentifier.create(pathArguments.build());
}
private Set<String> readObjSet() throws IOException {
return new NodeIdentifier(readQName());
case PathArgumentTypes.NODE_IDENTIFIER_WITH_PREDICATES :
- return new NodeIdentifierWithPredicates(readQName(), readKeyValueMap());
+ return readNormalizedNodeWithPredicates();
case PathArgumentTypes.NODE_IDENTIFIER_WITH_VALUE :
return new NodeWithValue<>(readQName(), readObject());
Code Review / controller.git / blobdiff