Bump odlparent/yangtools/mdsal

[controller.git] / opendaylight / md-sal / sal-clustering-commons / src / main / java / org / opendaylight / controller / cluster / datastore / node / utils / stream / SerializationUtils.java

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 8e3944eb652e1c88a186bf20e68e9ab0ea541836..a2c456d17a65efb3fa5c2007379f75a1219dcc40 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
@@ -19,6 +19,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput;
 import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataOutput;
+import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion;
 
 /**
  * Provides various utility methods for serialization and de-serialization.
@@ -32,24 +33,23 @@ public final class SerializationUtils {
 
     @FunctionalInterface
     public interface Applier<T> {
-        void apply(T instance, YangInstanceIdentifier path, NormalizedNode<?, ?> node);
+        void apply(T instance, YangInstanceIdentifier path, NormalizedNode node);
     }
 
-    public static Optional<NormalizedNode<?, ?>> readNormalizedNode(final DataInput in) throws IOException {
+    public static Optional<NormalizedNode> readNormalizedNode(final DataInput in) throws IOException {
         if (!in.readBoolean()) {
             return Optional.empty();
         }
         return Optional.of(NormalizedNodeDataInput.newDataInput(in).readNormalizedNode());
     }
 
-    public static void writeNormalizedNode(final DataOutput out, final @Nullable NormalizedNode<?, ?> node)
+    public static void writeNormalizedNode(final DataOutput out, final @Nullable NormalizedNode node)
             throws IOException {
         writeNormalizedNode(out, MAGNESIUM, node);
     }
 
-    public static void writeNormalizedNode(final DataOutput out,
-            final org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion version,
-            final @Nullable NormalizedNode<?, ?> node) throws IOException {
+    public static void writeNormalizedNode(final DataOutput out, final NormalizedNodeStreamVersion version,
+            final @Nullable NormalizedNode node) throws IOException {
         if (node != null) {
             out.writeBoolean(true);
 
@@ -61,12 +61,6 @@ public final class SerializationUtils {
         }
     }
 
-    @Deprecated(forRemoval = true)
-    public static void writeNormalizedNode(final DataOutput out, final NormalizedNodeStreamVersion version,
-            final @Nullable NormalizedNode<?, ?> node) throws IOException {
-        writeNormalizedNode(out, version.toYangtools(), node);
-    }
-
     public static YangInstanceIdentifier readPath(final DataInput in) throws IOException {
         return NormalizedNodeDataInput.newDataInput(in).readYangInstanceIdentifier();
     }
@@ -76,31 +70,23 @@ public final class SerializationUtils {
         writePath(out, MAGNESIUM, path);
     }
 
-    public static void writePath(final DataOutput out,
-            final org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion version,
+    public static void writePath(final DataOutput out, final NormalizedNodeStreamVersion version,
             final @NonNull YangInstanceIdentifier path) throws IOException {
         try (NormalizedNodeDataOutput stream = version.newDataOutput(out)) {
             stream.writeYangInstanceIdentifier(path);
         }
     }
 
-    @Deprecated(forRemoval = true)
-    public static void writePath(final DataOutput out, final NormalizedNodeStreamVersion version,
-            final @NonNull YangInstanceIdentifier path) throws IOException {
-        writePath(out, version.toYangtools(), path);
-    }
-
     public static <T> void readNodeAndPath(final DataInput in, final T instance, final Applier<T> applier)
             throws IOException {
         final NormalizedNodeDataInput stream = NormalizedNodeDataInput.newDataInput(in);
-        NormalizedNode<?, ?> node = stream.readNormalizedNode();
+        NormalizedNode node = stream.readNormalizedNode();
         YangInstanceIdentifier path = stream.readYangInstanceIdentifier();
         applier.apply(instance, path, node);
     }
 
-    public static void writeNodeAndPath(final DataOutput out,
-            final org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion version,
-            final YangInstanceIdentifier path, final NormalizedNode<?, ?> node) throws IOException {
+    public static void writeNodeAndPath(final DataOutput out, final NormalizedNodeStreamVersion version,
+            final YangInstanceIdentifier path, final NormalizedNode node) throws IOException {
         try (NormalizedNodeDataOutput stream = version.newDataOutput(out)) {
             stream.writeNormalizedNode(node);
             stream.writeYangInstanceIdentifier(path);
@@ -108,7 +94,7 @@ public final class SerializationUtils {
     }
 
     public static void writeNodeAndPath(final DataOutput out, final YangInstanceIdentifier path,
-            final NormalizedNode<?, ?> node) throws IOException {
+            final NormalizedNode node) throws IOException {
         writeNodeAndPath(out, MAGNESIUM, path, node);
     }
 
@@ -116,13 +102,13 @@ public final class SerializationUtils {
             throws IOException {
         final NormalizedNodeDataInput stream = NormalizedNodeDataInput.newDataInput(in);
         YangInstanceIdentifier path = stream.readYangInstanceIdentifier();
-        NormalizedNode<?, ?> node = stream.readNormalizedNode();
+        NormalizedNode node = stream.readNormalizedNode();
         applier.apply(instance, path, node);
     }
 
     public static void writePathAndNode(final DataOutput out,
             final org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion version,
-            final YangInstanceIdentifier path, final NormalizedNode<?, ?> node) throws IOException {
+            final YangInstanceIdentifier path, final NormalizedNode node) throws IOException {
         try (NormalizedNodeDataOutput stream = version.newDataOutput(out)) {
             stream.writeYangInstanceIdentifier(path);
             stream.writeNormalizedNode(node);
@@ -130,7 +116,7 @@ public final class SerializationUtils {
     }
 
     public static void writePathAndNode(final DataOutput out, final YangInstanceIdentifier path,
-            final NormalizedNode<?, ?> node) throws IOException {
+            final NormalizedNode node) throws IOException {
         writePathAndNode(out, MAGNESIUM, path, node);
     }
 }