Switch CompositeModification to bypass thread-local streams

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / modification / WriteModification.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java
index 70125e29e52a063f9e5d0e8cbe2db30d79f5d0bb..63fa74069a5fe5d310e481276ae83eaaf90d5717 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/WriteModification.java
@@ -8,9 +8,12 @@
 
 package org.opendaylight.controller.cluster.datastore.modification;
 
 
 package org.opendaylight.controller.cluster.datastore.modification;
 

+import java.io.IOException;

 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import org.opendaylight.controller.cluster.datastore.DataStoreVersions;

+import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataInput;
+import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput;

 import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils;
 import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils.Applier;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
 import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils;
 import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils.Applier;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;


@@ -30,10 +33,15 @@ public class WriteModification extends AbstractModification {
         this(DataStoreVersions.CURRENT_VERSION);
     }
 
         this(DataStoreVersions.CURRENT_VERSION);
     }
 

-    public WriteModification(short version) {
+    public WriteModification(final short version) {

         super(version);
     }
 
         super(version);
     }
 

+    WriteModification(final short version, final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
+        super(version, path);
+        this.data = data;
+    }
+

     public WriteModification(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
         super(path);
         this.data = data;
     public WriteModification(final YangInstanceIdentifier path, final NormalizedNode<?, ?> data) {
         super(path);
         this.data = data;


@@ -59,19 +67,26 @@ public class WriteModification extends AbstractModification {
     }
 
     @Override
     }
 
     @Override

-    public void readExternal(ObjectInput in) {
+    public void readExternal(final ObjectInput in) {

         SerializationUtils.deserializePathAndNode(in, this, APPLIER);
     }
 
     @Override
         SerializationUtils.deserializePathAndNode(in, this, APPLIER);
     }
 
     @Override

-    public void writeExternal(ObjectOutput out) {
+    public void writeExternal(final ObjectOutput out) {

         SerializationUtils.serializePathAndNode(getPath(), data, out);
     }
 
         SerializationUtils.serializePathAndNode(getPath(), data, out);
     }
 

-    public static WriteModification fromStream(ObjectInput in, short version) {
-        WriteModification mod = new WriteModification(version);
-        mod.readExternal(in);
-        return mod;
+    public static WriteModification fromStream(final NormalizedNodeDataInput in, final short version)
+            throws IOException {
+        final NormalizedNode<?, ?> node = in.readNormalizedNode();
+        final YangInstanceIdentifier path = in.readYangInstanceIdentifier();
+        return new WriteModification(version, path, node);
+    }
+
+    public void writeTo(final NormalizedNodeDataOutput out) throws IOException {
+        // FIXME: this should be inverted, as the path helps receivers in establishment of context
+        out.writeNormalizedNode(data);
+        out.writeYangInstanceIdentifier(getPath());

     }
 
     private static final Applier<WriteModification> APPLIER = (instance, path, node) -> {
     }
 
     private static final Applier<WriteModification> APPLIER = (instance, path, node) -> {