Deprecate NormalizedNodeInputStreamReader(InputStream)

Using ByteStreams.newDataInput() allows us to deprecated ineffcient
constructor, keeping the API cleaner.

Change-Id: Ia8fa4114ce82ccb440f859584069a8c6d6a397ea
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java
index cea8fad4ea15d57bc57a4e3e8d1da820e2dab17f..0260de16639997f0a44fc50c6e2da9865d2ec78a 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputStreamReader.java
@@ -70,6 +70,10 @@ public class NormalizedNodeInputStreamReader implements NormalizedNodeStreamRead
 
     private boolean readSignatureMarker = true;
 
+    /**
+     * @deprecated Use {@link #NormalizedNodeInputStreamReader(DataInput)} instead.
+     */
+    @Deprecated
     public NormalizedNodeInputStreamReader(final InputStream stream) throws IOException {
         Preconditions.checkNotNull(stream);
         input = new DataInputStream(stream);

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java
index b155b5af11b67ffa7856ac5a23fabd90ff2661ec..670d3e513e9373ca0baca79336bbd52a0eabf99e 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java
@@ -60,9 +60,12 @@ public class NormalizedNodeOutputStreamWriter implements NormalizedNodeStreamWri
 
     private boolean wroteSignatureMarker;
 
-    public NormalizedNodeOutputStreamWriter(OutputStream stream) throws IOException {
-        Preconditions.checkNotNull(stream);
-        output = new DataOutputStream(stream);
+    /**
+     * @deprecated Use {@link #NormalizedNodeOutputStreamWriter(DataOutput)} instead.
+     */
+    @Deprecated
+    public NormalizedNodeOutputStreamWriter(final OutputStream stream) throws IOException {
+        this((DataOutput) new DataOutputStream(Preconditions.checkNotNull(stream)));
     }
 
     public NormalizedNodeOutputStreamWriter(DataOutput 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 6dbb0f8e64e7ec143fa54d993c1c802353601702..f2fa06c832b6e3ac424933413c065a1655f52175 100644 (file)
--- 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
@@ -8,7 +8,7 @@
 
 package org.opendaylight.controller.cluster.datastore.node.utils.stream;
 
-import java.io.ByteArrayInputStream;
+import com.google.common.io.ByteStreams;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import org.apache.commons.lang.SerializationUtils;
@@ -36,7 +36,8 @@ public class NormalizedNodeStreamReaderWriterTest {
     public void testNormalizedNodeStreaming() throws IOException {
 
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter(byteArrayOutputStream);
+        NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter(
+            ByteStreams.newDataOutput(byteArrayOutputStream));
 
         NormalizedNode<?, ?> testContainer = createTestContainer();
         writer.writeNormalizedNode(testContainer);
@@ -56,7 +57,7 @@ public class NormalizedNodeStreamReaderWriterTest {
         writer.writeNormalizedNode(toasterContainer);
 
         NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader(
-                new ByteArrayInputStream(byteArrayOutputStream.toByteArray()));
+            ByteStreams.newDataInput(byteArrayOutputStream.toByteArray()));
 
         NormalizedNode<?,?> node = reader.readNormalizedNode();
         Assert.assertEquals(testContainer, node);
@@ -103,11 +104,11 @@ public class NormalizedNodeStreamReaderWriterTest {
 
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         NormalizedNodeOutputStreamWriter writer =
-                new NormalizedNodeOutputStreamWriter(byteArrayOutputStream);
+                new NormalizedNodeOutputStreamWriter(ByteStreams.newDataOutput(byteArrayOutputStream));
         writer.writeYangInstanceIdentifier(path);
 
         NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader(
-                new ByteArrayInputStream(byteArrayOutputStream.toByteArray()));
+            ByteStreams.newDataInput(byteArrayOutputStream.toByteArray()));
 
         YangInstanceIdentifier newPath = reader.readYangInstanceIdentifier();
         Assert.assertEquals(path, newPath);
@@ -119,7 +120,8 @@ public class NormalizedNodeStreamReaderWriterTest {
     public void testNormalizedNodeAndYangInstanceIdentifierStreaming() throws IOException {
 
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter(byteArrayOutputStream);
+        NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter(
+            ByteStreams.newDataOutput(byteArrayOutputStream));
 
         NormalizedNode<?, ?> testContainer = TestModel.createBaseTestContainerBuilder().build();
         writer.writeNormalizedNode(testContainer);
@@ -131,7 +133,7 @@ public class NormalizedNodeStreamReaderWriterTest {
         writer.writeYangInstanceIdentifier(path);
 
         NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader(
-                new ByteArrayInputStream(byteArrayOutputStream.toByteArray()));
+            ByteStreams.newDataInput(byteArrayOutputStream.toByteArray()));
 
         NormalizedNode<?,?> node = reader.readNormalizedNode();
         Assert.assertEquals(testContainer, node);
@@ -148,7 +150,7 @@ public class NormalizedNodeStreamReaderWriterTest {
                 TestModel.createBaseTestContainerBuilder().build()).getNormalizedNode().toByteArray();
 
         NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader(
-                new ByteArrayInputStream(protobufBytes));
+            ByteStreams.newDataInput(protobufBytes));
 
         reader.readNormalizedNode();
     }
@@ -161,7 +163,7 @@ public class NormalizedNodeStreamReaderWriterTest {
                 InstanceIdentifierUtils.toSerializable(path)).build().toByteArray();
 
         NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader(
-                new ByteArrayInputStream(protobufBytes));
+            ByteStreams.newDataInput(protobufBytes));
 
         reader.readYangInstanceIdentifier();
     }
@@ -176,7 +178,7 @@ public class NormalizedNodeStreamReaderWriterTest {
 
     }
 
-    private String largeString(int pow){
+    private static String largeString(final int pow){
         String s = "X";
         for(int i=0;i<pow;i++){
             StringBuilder b = new StringBuilder();