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/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java
index 3a04347a54faeef7fe74cfedea65ef55a0d8ad42..7e0de62111bf5e9c0c4d89eb8f8523fa745a5dd6 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtils.java
@@ -9,11 +9,9 @@ package org.opendaylight.controller.cluster.datastore.node.utils.stream;
 
 import com.google.common.base.Preconditions;
 import java.io.ByteArrayInputStream;
 
 import com.google.common.base.Preconditions;
 import java.io.ByteArrayInputStream;

-import java.io.ByteArrayOutputStream;

 import java.io.DataInput;
 import java.io.DataInputStream;
 import java.io.DataOutput;
 import java.io.DataInput;
 import java.io.DataInputStream;
 import java.io.DataOutput;

-import java.io.DataOutputStream;

 import java.io.IOException;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import java.io.IOException;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;


@@ -116,12 +114,6 @@ public final class SerializationUtils {
         }
     }
 
         }
     }
 

-    public static byte [] serializeNormalizedNode(NormalizedNode<?, ?> node) {
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        serializeNormalizedNode(node, new DataOutputStream(bos));
-        return bos.toByteArray();
-    }
-

     public static void serializePath(YangInstanceIdentifier path, DataOutput out) {
         Preconditions.checkNotNull(path);
         try {
     public static void serializePath(YangInstanceIdentifier path, DataOutput out) {
         Preconditions.checkNotNull(path);
         try {

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 50d06ada231c23ca611d1ad0234288ed9bedfce3..25b4f2a3e88b36ea9c7a2975548718c396b40f56 100644 (file)
--- 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
@@ -49,7 +49,7 @@ public class SerializationUtilsTest {
     @Test
     public void testSerializeDeserializeNodes() {
         final NormalizedNode<?, ?> normalizedNode = createNormalizedNode();
     @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));
 
     }
         Assert.assertEquals(normalizedNode, SerializationUtils.deserializeNormalizedNode(bytes));
 
     }


@@ -63,7 +63,7 @@ public class SerializationUtilsTest {
                 .withNodeIdentifier(id("anyXmlNode"))
                 .withValue(new DOMSource(parse))
                 .build();
                 .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(),
         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());
     }
 
         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"))
     private static NormalizedNode<?, ?> createNormalizedNode() {
         final LeafSetNode<Object> leafSetNode = Builders.leafSetBuilder()
                 .withNodeIdentifier(id("leafSetNode"))