X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmodification%2FMergeModification.java;h=098a89521a722caaa9efc2012898727618412d70;hp=b484f85491df8e402963b62ed6eec0f5e6d6333d;hb=abaef4a5ae37f27542155457fe7306a4662b1eeb;hpb=1e59825dbec7b354d76bd7efa6a61e4ad802c802

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java
index b484f85491..098a89521a 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java
@@ -5,61 +5,58 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.cluster.datastore.modification;
 
-import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec;
-import org.opendaylight.controller.cluster.datastore.utils.InstanceIdentifierUtils;
-import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages;
-import org.opendaylight.controller.protobuff.messages.persistent.PersistentMessages;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import java.io.IOException;
+import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.data.api.schema.stream.ReusableStreamReceiver;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
+import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput;
 
 /**
- * MergeModification stores all the parameters required to merge data into the specified path
+ * MergeModification stores all the parameters required to merge data into the specified path.
  */
-public class MergeModification extends AbstractModification {
-    private final NormalizedNode data;
-    private final SchemaContext schemaContext;
-
+public class MergeModification extends WriteModification {
+    private static final long serialVersionUID = 1L;
 
-    public MergeModification(InstanceIdentifier path, NormalizedNode data,
-        SchemaContext schemaContext) {
-        super(path);
-        this.data = data;
-        this.schemaContext = schemaContext;
+    public MergeModification() {
+        this(DataStoreVersions.CURRENT_VERSION);
     }
 
-    @Override
-    public void apply(DOMStoreWriteTransaction transaction) {
-        transaction.merge(path, data);
+    public MergeModification(final short version) {
+        super(version);
     }
 
-    @Override public Object toSerializable() {
-        NormalizedNodeMessages.Container encode =
-            new NormalizedNodeToNodeCodec(schemaContext).encode(
-                InstanceIdentifierUtils.from(path.toString()), data);
-
-        return PersistentMessages.Modification.newBuilder()
-            .setType(this.getClass().toString())
-            .setPath(this.path.toString())
-            .setData(encode.getNormalizedNode())
-            .build();
+    public MergeModification(final YangInstanceIdentifier path, final NormalizedNode data) {
+        super(path, data);
+    }
 
+    MergeModification(final short version, final YangInstanceIdentifier path, final NormalizedNode data) {
+        super(version, path, data);
     }
 
-    public static MergeModification fromSerializable(
-        Object serializable,
-        SchemaContext schemaContext) {
-        PersistentMessages.Modification o = (PersistentMessages.Modification) serializable;
+    @Override
+    public void apply(final DOMStoreWriteTransaction transaction) {
+        transaction.merge(getPath(), getData());
+    }
 
-        InstanceIdentifier path = InstanceIdentifierUtils.from(o.getPath());
-        NormalizedNode data = new NormalizedNodeToNodeCodec(schemaContext).decode(
-            path, o.getData());
+    @Override
+    public void apply(final DataTreeModification transaction) {
+        transaction.merge(getPath(), getData());
+    }
 
-        return new MergeModification(path, data, schemaContext);
+    @Override
+    public byte getType() {
+        return MERGE;
     }
 
+    public static MergeModification fromStream(final NormalizedNodeDataInput in, final short version,
+            final ReusableStreamReceiver receiver) throws IOException {
+        final NormalizedNode node = in.readNormalizedNode(receiver);
+        final YangInstanceIdentifier path = in.readYangInstanceIdentifier();
+        return new MergeModification(version, path, node);
+    }
 }