X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fnode%2Futils%2Fstream%2FNormalizedNodeInputOutput.java;h=87aec1dc1188536065d84c7587e056b67c08b8a5;hb=bd7cfec55803f40773eda2412e7b93a3fefd3f9c;hp=486891dfd5e7328a7feb767852702fef43f5b627;hpb=763995ce31cdaed38be580781df1f5c20edf5225;p=controller.git

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 486891dfd5..87aec1dc11 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
@@ -11,7 +11,7 @@ import com.google.common.annotations.Beta;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 
 @Beta
 public final class NormalizedNodeInputOutput {
@@ -27,19 +27,8 @@ public final class NormalizedNodeInputOutput {
      * @return a new {@link NormalizedNodeDataInput} instance
      * @throws IOException if an error occurs reading from the input
      */
-    public static NormalizedNodeDataInput newDataInput(@Nonnull final DataInput input) throws IOException {
-        final byte marker = input.readByte();
-        if (marker != TokenTypes.SIGNATURE_MARKER) {
-            throw new InvalidNormalizedNodeStreamException(String.format("Invalid signature marker: %d", marker));
-        }
-
-        final short version = input.readShort();
-        switch (version) {
-            case TokenTypes.LITHIUM_VERSION:
-                return new NormalizedNodeInputStreamReader(input, true);
-            default:
-                throw new InvalidNormalizedNodeStreamException(String.format("Unhandled stream version %s", version));
-        }
+    public static NormalizedNodeDataInput newDataInput(final @NonNull DataInput input) throws IOException {
+        return new VersionedNormalizedNodeDataInput(input).delegate();
     }
 
     /**
@@ -49,17 +38,38 @@ public final class NormalizedNodeInputOutput {
      * @param input the DataInput to read from
      * @return a new {@link NormalizedNodeDataInput} instance
      */
-    public static NormalizedNodeDataInput newDataInputWithoutValidation(@Nonnull final DataInput input) {
-        return new NormalizedNodeInputStreamReader(input, false);
+    public static NormalizedNodeDataInput newDataInputWithoutValidation(final @NonNull DataInput input) {
+        return new VersionedNormalizedNodeDataInput(input);
+    }
+
+    /**
+     * Creates a new {@link NormalizedNodeDataOutput} instance that writes to the given output and latest current
+     * stream version.
+     *
+     * @param output the DataOutput to write to
+     * @return a new {@link NormalizedNodeDataOutput} instance
+     */
+    public static NormalizedNodeDataOutput newDataOutput(final @NonNull DataOutput output) {
+        return new NeonSR2NormalizedNodeOutputStreamWriter(output);
     }
 
     /**
      * Creates a new {@link NormalizedNodeDataOutput} instance that writes to the given output.
      *
      * @param output the DataOutput to write to
+     * @param version Streaming version to use
      * @return a new {@link NormalizedNodeDataOutput} instance
      */
-    public static NormalizedNodeDataOutput newDataOutput(@Nonnull final DataOutput output) {
-        return new NormalizedNodeOutputStreamWriter(output);
+    public static NormalizedNodeDataOutput newDataOutput(final @NonNull DataOutput output,
+            final @NonNull NormalizedNodeStreamVersion version) {
+        switch (version) {
+            case LITHIUM:
+                return new LithiumNormalizedNodeOutputStreamWriter(output);
+            case NEON_SR2:
+                return new NeonSR2NormalizedNodeOutputStreamWriter(output);
+            default:
+                throw new IllegalStateException("Unhandled version " + version);
+        }
     }
+
 }