From: Robert Varga Date: Wed, 25 Sep 2019 06:01:47 +0000 (+0200) Subject: Switch default stream output to Sodium SR1 X-Git-Tag: release/magnesium~65 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=e373f634d72fa6ef692d4fd0d016c6deeba8ffe8;hp=21a8c34586d37b6fc59abed2ca2287be3db56e00 Switch default stream output to Sodium SR1 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 --- diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java index 7e2fb2906f..2a9d1f708f 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java @@ -50,7 +50,7 @@ public final class NormalizedNodeInputOutput { * @return a new {@link NormalizedNodeDataOutput} instance */ public static NormalizedNodeDataOutput newDataOutput(final @NonNull DataOutput output) { - return new NeonSR2NormalizedNodeOutputStreamWriter(output); + return new SodiumSR1DataOutput(output); } /** diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java index 4024cefff8..4b45af48e9 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java @@ -75,7 +75,7 @@ public class NormalizedNodeStreamReaderWriterTest { nnout.writeNormalizedNode(toasterContainer); final byte[] bytes = bos.toByteArray(); - assertEquals(1049950, bytes.length); + assertEquals(1049619, bytes.length); NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes)); @@ -119,7 +119,7 @@ public class NormalizedNodeStreamReaderWriterTest { nnout.writeYangInstanceIdentifier(path); final byte[] bytes = bos.toByteArray(); - assertEquals(161, bytes.length); + assertEquals(139, bytes.length); NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes)); @@ -144,7 +144,7 @@ public class NormalizedNodeStreamReaderWriterTest { writer.writeYangInstanceIdentifier(path); final byte[] bytes = bos.toByteArray(); - assertEquals(1163, bytes.length); + assertEquals(826, bytes.length); NormalizedNodeDataInput reader = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes)); @@ -207,7 +207,7 @@ public class NormalizedNodeStreamReaderWriterTest { nnout.writeNormalizedNode(anyXmlContainer); final byte[] bytes = bos.toByteArray(); - assertEquals(235, bytes.length); + assertEquals(229, bytes.length); NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes)); @@ -236,7 +236,7 @@ public class NormalizedNodeStreamReaderWriterTest { } final byte[] bytes = bos.toByteArray(); - assertEquals(100, bytes.length); + assertEquals(99, bytes.length); NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes)); assertEquals(expected, nnin.readSchemaPath()); @@ -253,7 +253,7 @@ public class NormalizedNodeStreamReaderWriterTest { } final byte[] bytes = bos.toByteArray(); - assertEquals(105, bytes.length); + assertEquals(103, bytes.length); NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(bytes)); assertEquals(expected, nnin.readPathArgument()); @@ -287,7 +287,7 @@ public class NormalizedNodeStreamReaderWriterTest { } 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()); diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java index 388842661c..610a2328f3 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java @@ -54,7 +54,7 @@ public class SerializationUtilsTest { 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)); } @@ -68,7 +68,7 @@ public class SerializationUtilsTest { .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(), @@ -89,7 +89,7 @@ public class SerializationUtilsTest { 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))); @@ -105,7 +105,7 @@ public class SerializationUtilsTest { 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); @@ -129,7 +129,7 @@ public class SerializationUtilsTest { 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);