This flips the switch and uses Sodium SR1 format for all unversioned
users. Also updates tests to reflect new expected stream sizes.
JIRA: CONTROLLER-1919
Change-Id: I9973bb93f469c1b59533ce580c795cd30c9edda4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
* @return a new {@link NormalizedNodeDataOutput} instance
*/
public static NormalizedNodeDataOutput newDataOutput(final @NonNull DataOutput output) {
* @return a new {@link NormalizedNodeDataOutput} instance
*/
public static NormalizedNodeDataOutput newDataOutput(final @NonNull DataOutput output) {
- return new NeonSR2NormalizedNodeOutputStreamWriter(output);
+ return new SodiumSR1DataOutput(output);
nnout.writeNormalizedNode(toasterContainer);
final byte[] bytes = bos.toByteArray();
nnout.writeNormalizedNode(toasterContainer);
final byte[] bytes = bos.toByteArray();
- assertEquals(1049950, bytes.length);
+ assertEquals(1049619, bytes.length);
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
nnout.writeYangInstanceIdentifier(path);
final byte[] bytes = bos.toByteArray();
nnout.writeYangInstanceIdentifier(path);
final byte[] bytes = bos.toByteArray();
- assertEquals(161, bytes.length);
+ assertEquals(139, bytes.length);
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
writer.writeYangInstanceIdentifier(path);
final byte[] bytes = bos.toByteArray();
writer.writeYangInstanceIdentifier(path);
final byte[] bytes = bos.toByteArray();
- assertEquals(1163, bytes.length);
+ assertEquals(826, bytes.length);
NormalizedNodeDataInput reader = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
NormalizedNodeDataInput reader = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
nnout.writeNormalizedNode(anyXmlContainer);
final byte[] bytes = bos.toByteArray();
nnout.writeNormalizedNode(anyXmlContainer);
final byte[] bytes = bos.toByteArray();
- assertEquals(235, bytes.length);
+ assertEquals(229, bytes.length);
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
}
final byte[] bytes = bos.toByteArray();
}
final byte[] bytes = bos.toByteArray();
- assertEquals(100, bytes.length);
+ assertEquals(99, bytes.length);
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
assertEquals(expected, nnin.readSchemaPath());
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
assertEquals(expected, nnin.readSchemaPath());
}
final byte[] bytes = bos.toByteArray();
}
final byte[] bytes = bos.toByteArray();
- assertEquals(105, bytes.length);
+ assertEquals(103, bytes.length);
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
assertEquals(expected, nnin.readPathArgument());
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
assertEquals(expected, nnin.readPathArgument());
}
final byte[] bytes = bos.toByteArray();
}
final byte[] bytes = bos.toByteArray();
- assertEquals(5_577_993, bytes.length);
+ assertEquals(2_289_103, bytes.length);
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
assertEquals(expected, nnin.readNormalizedNode());
NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes));
assertEquals(expected, nnin.readNormalizedNode());
public void testSerializeDeserializeNodes() throws IOException {
final NormalizedNode<?, ?> normalizedNode = createNormalizedNode();
final byte[] bytes = serializeNormalizedNode(normalizedNode);
public void testSerializeDeserializeNodes() throws IOException {
final NormalizedNode<?, ?> normalizedNode = createNormalizedNode();
final byte[] bytes = serializeNormalizedNode(normalizedNode);
- assertEquals(10774, bytes.length);
+ assertEquals(10564, bytes.length);
assertEquals(normalizedNode, deserializeNormalizedNode(bytes));
}
assertEquals(normalizedNode, deserializeNormalizedNode(bytes));
}
.withValue(new DOMSource(parse))
.build();
final byte[] bytes = serializeNormalizedNode(anyXmlNode);
.withValue(new DOMSource(parse))
.build();
final byte[] bytes = serializeNormalizedNode(anyXmlNode);
- assertEquals(115, bytes.length);
+ assertEquals(113, bytes.length);
final NormalizedNode<?, ?> deserialized = deserializeNormalizedNode(bytes);
final DOMSource value = (DOMSource) deserialized.getValue();
final Diff diff = XMLUnit.compareXML((Document) anyXmlNode.getValue().getNode(),
final NormalizedNode<?, ?> deserialized = deserializeNormalizedNode(bytes);
final DOMSource value = (DOMSource) deserialized.getValue();
final Diff diff = XMLUnit.compareXML((Document) anyXmlNode.getValue().getNode(),
SerializationUtils.writePath(out, path);
final byte[] bytes = bos.toByteArray();
SerializationUtils.writePath(out, path);
final byte[] bytes = bos.toByteArray();
- assertEquals(150, bytes.length);
+ assertEquals(119, bytes.length);
final YangInstanceIdentifier deserialized =
SerializationUtils.readPath(new DataInputStream(new ByteArrayInputStream(bytes)));
final YangInstanceIdentifier deserialized =
SerializationUtils.readPath(new DataInputStream(new ByteArrayInputStream(bytes)));
SerializationUtils.writeNodeAndPath(out, path, node);
final byte[] bytes = bos.toByteArray();
SerializationUtils.writeNodeAndPath(out, path, node);
final byte[] bytes = bos.toByteArray();
- assertEquals(10783, bytes.length);
+ assertEquals(10566, bytes.length);
final DataInputStream in = new DataInputStream(new ByteArrayInputStream(bytes));
final AtomicBoolean applierCalled = new AtomicBoolean(false);
final DataInputStream in = new DataInputStream(new ByteArrayInputStream(bytes));
final AtomicBoolean applierCalled = new AtomicBoolean(false);
SerializationUtils.writePath(out, expected);
final byte[] bytes = bos.toByteArray();
SerializationUtils.writePath(out, expected);
final byte[] bytes = bos.toByteArray();
- assertEquals(47, bytes.length);
+ assertEquals(37, bytes.length);
final DataInputStream in = new DataInputStream(new ByteArrayInputStream(bytes));
final YangInstanceIdentifier read = SerializationUtils.readPath(in);
final DataInputStream in = new DataInputStream(new ByteArrayInputStream(bytes));
final YangInstanceIdentifier read = SerializationUtils.readPath(in);