Bump upstream versions

[controller.git] / opendaylight / md-sal / cds-access-api / src / main / java / org / opendaylight / controller / cluster / access / commands / AbstractReadPathTransactionRequestProxyV1.java

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadPathTransactionRequestProxyV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadPathTransactionRequestProxyV1.java
index bafa3d9083ed57b4eada744fea295d31f61a88a2..2cd4ec9e73340ecbcb60f96b2c7bd4370c884e8b 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadPathTransactionRequestProxyV1.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadPathTransactionRequestProxyV1.java
@@ -12,9 +12,10 @@ import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputOutput;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+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;
 
 /**
  * Abstract base class for serialization proxies associated with {@link AbstractReadTransactionRequest}s. It implements
@@ -27,7 +28,9 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 abstract class AbstractReadPathTransactionRequestProxyV1<T extends AbstractReadPathTransactionRequest<T>>
         extends AbstractReadTransactionRequestProxyV1<T> {
     private static final long serialVersionUID = 1L;
+
     private YangInstanceIdentifier path;
+    private transient NormalizedNodeStreamVersion streamVersion;
 
     protected AbstractReadPathTransactionRequestProxyV1() {
         // For Externalizable
@@ -36,12 +39,13 @@ abstract class AbstractReadPathTransactionRequestProxyV1<T extends AbstractReadP
     AbstractReadPathTransactionRequestProxyV1(final T request) {
         super(request);
         path = request.getPath();
+        streamVersion = request.getVersion().getStreamVersion();
     }
 
     @Override
     public final void writeExternal(final ObjectOutput out) throws IOException {
         super.writeExternal(out);
-        try (NormalizedNodeDataOutput nnout = NormalizedNodeInputOutput.newDataOutput(out)) {
+        try (NormalizedNodeDataOutput nnout = streamVersion.newDataOutput(out)) {
             nnout.writeYangInstanceIdentifier(path);
         }
     }
@@ -49,7 +53,7 @@ abstract class AbstractReadPathTransactionRequestProxyV1<T extends AbstractReadP
     @Override
     public final void readExternal(final ObjectInput in) throws ClassNotFoundException, IOException {
         super.readExternal(in);
-        path = NormalizedNodeInputOutput.newDataInput(in).readYangInstanceIdentifier();
+        path = NormalizedNodeDataInput.newDataInput(in).readYangInstanceIdentifier();
     }
 
     @Override