Remove use of thread-local input

All callers are only called from top-level constructs, thus
not having a relationship with the context in which they are
deserialized.

JIRA: CONTROLLER-1888
Change-Id: I856f9109480fb83475a20ce4430d02a1dd055522
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/node/utils/stream/SerializationUtilsTest.java b/node/utils/stream/SerializationUtilsTest.java
index 50bfc09efa3b53fd36e5e454a5e0ffa0691e6064..1ddabe83daec81680786b7f68ce6edc881e48209 100644 (file)
--- a/node/utils/stream/SerializationUtilsTest.java
+++ b/node/utils/stream/SerializationUtilsTest.java
@@ -51,7 +51,7 @@ public class SerializationUtilsTest {
     public void testSerializeDeserializeNodes() throws IOException {
         final NormalizedNode<?, ?> normalizedNode = createNormalizedNode();
         final byte[] bytes = serializeNormalizedNode(normalizedNode);
-        Assert.assertEquals(normalizedNode, SerializationUtils.deserializeNormalizedNode(bytes));
+        Assert.assertEquals(normalizedNode, deserializeNormalizedNode(bytes));
     }
 
     @Test
@@ -64,7 +64,7 @@ public class SerializationUtilsTest {
                 .withValue(new DOMSource(parse))
                 .build();
         final byte[] bytes = serializeNormalizedNode(anyXmlNode);
-        final NormalizedNode<?, ?> deserialized = SerializationUtils.deserializeNormalizedNode(bytes);
+        final NormalizedNode<?, ?> deserialized = deserializeNormalizedNode(bytes);
         final DOMSource value = (DOMSource) deserialized.getValue();
         final Diff diff = XMLUnit.compareXML((Document) anyXmlNode.getValue().getNode(),
                 value.getNode().getOwnerDocument());
@@ -83,7 +83,7 @@ public class SerializationUtilsTest {
                 .build();
         SerializationUtils.writePath(out, path);
         final YangInstanceIdentifier deserialized =
-                SerializationUtils.deserializePath(new DataInputStream(new ByteArrayInputStream(bos.toByteArray())));
+                SerializationUtils.readPath(new DataInputStream(new ByteArrayInputStream(bos.toByteArray())));
         Assert.assertEquals(path, deserialized);
     }
 
@@ -96,7 +96,7 @@ public class SerializationUtilsTest {
         SerializationUtils.writeNodeAndPath(out, path, node);
         final DataInputStream in = new DataInputStream(new ByteArrayInputStream(bos.toByteArray()));
         final AtomicBoolean applierCalled = new AtomicBoolean(false);
-        SerializationUtils.deserializePathAndNode(in, applierCalled, (instance, deserializedPath, deserializedNode) -> {
+        SerializationUtils.readNodeAndPath(in, applierCalled, (instance, deserializedPath, deserializedNode) -> {
             Assert.assertEquals(path, deserializedPath);
             Assert.assertEquals(node, deserializedNode);
             applierCalled.set(true);
@@ -104,6 +104,10 @@ public class SerializationUtilsTest {
         Assert.assertTrue(applierCalled.get());
     }
 
+    private static NormalizedNode<?, ?> deserializeNormalizedNode(final byte [] bytes) throws IOException {
+        return SerializationUtils.readNormalizedNode(new DataInputStream(new ByteArrayInputStream(bytes))).get();
+    }
+
     private static byte[] serializeNormalizedNode(final NormalizedNode<?, ?> node) throws IOException {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         SerializationUtils.writeNormalizedNode(new DataOutputStream(bos), node);