From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 3 Jun 2019 18:52:36 +0000 (+0200)
Subject: Move byte-based serialization method
X-Git-Tag: v4.0.3~32^2~15
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9fa42d88cfcbc37d9e9c3db1de70efdab79b0a42;p=yangtools.git

Move byte-based serialization method

This is only used in testing, move the method out to testing class.

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

diff --git a/node/utils/stream/SerializationUtilsTest.java b/node/utils/stream/SerializationUtilsTest.java
index 50d06ada23..25b4f2a3e8 100644
--- a/node/utils/stream/SerializationUtilsTest.java
+++ b/node/utils/stream/SerializationUtilsTest.java
@@ -49,7 +49,7 @@ public class SerializationUtilsTest {
     @Test
     public void testSerializeDeserializeNodes() {
         final NormalizedNode<?, ?> normalizedNode = createNormalizedNode();
-        final byte[] bytes = SerializationUtils.serializeNormalizedNode(normalizedNode);
+        final byte[] bytes = serializeNormalizedNode(normalizedNode);
         Assert.assertEquals(normalizedNode, SerializationUtils.deserializeNormalizedNode(bytes));
 
     }
@@ -63,7 +63,7 @@ public class SerializationUtilsTest {
                 .withNodeIdentifier(id("anyXmlNode"))
                 .withValue(new DOMSource(parse))
                 .build();
-        final byte[] bytes = SerializationUtils.serializeNormalizedNode(anyXmlNode);
+        final byte[] bytes = serializeNormalizedNode(anyXmlNode);
         final NormalizedNode<?, ?> deserialized = SerializationUtils.deserializeNormalizedNode(bytes);
         final DOMSource value = (DOMSource) deserialized.getValue();
         final Diff diff = XMLUnit.compareXML((Document) anyXmlNode.getValue().getNode(),
@@ -104,6 +104,12 @@ public class SerializationUtilsTest {
         Assert.assertTrue(applierCalled.get());
     }
 
+    private static byte[] serializeNormalizedNode(final NormalizedNode<?, ?> node) {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        SerializationUtils.serializeNormalizedNode(node, new DataOutputStream(bos));
+        return bos.toByteArray();
+    }
+
     private static NormalizedNode<?, ?> createNormalizedNode() {
         final LeafSetNode<Object> leafSetNode = Builders.leafSetBuilder()
                 .withNodeIdentifier(id("leafSetNode"))