}
}
- QName readQName() throws IOException {
+ @Override
+ public QName readQName() throws IOException {
// Read in the same sequence of writing
String localName = readCodedString();
String namespace = readCodedString();
String revision = Strings.emptyToNull(readCodedString());
- return QNameFactory.create(new QNameFactory.Key(localName, namespace, revision));
+ return QNameFactory.create(localName, namespace, revision);
}
-
- private String readCodedString() throws IOException {
+ final String readCodedString() throws IOException {
final byte valueType = input.readByte();
switch (valueType) {
case TokenTypes.IS_NULL_VALUE:
}
AugmentationIdentifier readAugmentationIdentifier() throws IOException {
- return new AugmentationIdentifier(readQNameSet());
+ return AugmentationIdentifier.create(readQNameSet());
}
NodeIdentifier readNodeIdentifier() throws IOException {
final int count = input.readInt();
switch (count) {
case 0:
- return new NodeIdentifierWithPredicates(qname);
+ return NodeIdentifierWithPredicates.of(qname);
case 1:
- return new NodeIdentifierWithPredicates(qname, readQName(), readObject());
+ return NodeIdentifierWithPredicates.of(qname, readQName(), readObject());
default:
// ImmutableList is used by ImmutableOffsetMapTemplate for lookups, hence we use that.
final Builder<QName> keys = ImmutableList.builderWithExpectedSize(count);
values[i] = readObject();
}
- return new NodeIdentifierWithPredicates(qname, ImmutableOffsetMapTemplate.ordered(keys.build())
+ return NodeIdentifierWithPredicates.of(qname, ImmutableOffsetMapTemplate.ordered(keys.build())
.instantiateWithValues(values));
}
}