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%2Fmessages%2FCommitTransaction.java;h=fe13e5d8b177439cc31e1e72520a3bfb2e5868ef;hp=d607fe50fef33bc170c58088f2243dd7100c885b;hb=e78622411319748472b5d9edab14eb6dc92cf6b1;hpb=c36bb2bc93ea0fbdd3ca8b2663447fc921450aee

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java
index d607fe50fe..fe13e5d8b1 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransaction.java
@@ -8,30 +8,25 @@
 
 package org.opendaylight.controller.cluster.datastore.messages;
 
-import org.opendaylight.controller.protobuff.messages.cohort3pc.ThreePhaseCommitCohortMessages;
+import com.google.common.base.Preconditions;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 
-public class CommitTransaction implements SerializableMessage {
-    public static final Class<ThreePhaseCommitCohortMessages.CommitTransaction> SERIALIZABLE_CLASS =
-            ThreePhaseCommitCohortMessages.CommitTransaction.class;
+public class CommitTransaction extends AbstractThreePhaseCommitMessage {
+    private static final long serialVersionUID = 1L;
 
-    private final String transactionID;
-
-    public CommitTransaction(String transactionID) {
-        this.transactionID = transactionID;
+    public CommitTransaction() {
     }
 
-    public String getTransactionID() {
-        return transactionID;
+    public CommitTransaction(TransactionIdentifier transactionID, final short version) {
+        super(transactionID, version);
     }
 
-    @Override
-    public Object toSerializable() {
-        return ThreePhaseCommitCohortMessages.CommitTransaction.newBuilder().setTransactionId(
-                transactionID).build();
+    public static CommitTransaction fromSerializable(Object serializable) {
+        Preconditions.checkArgument(serializable instanceof CommitTransaction);
+        return (CommitTransaction)serializable;
     }
 
-    public static CommitTransaction fromSerializable(Object message) {
-        return new CommitTransaction(((ThreePhaseCommitCohortMessages.
-                CommitTransaction)message).getTransactionId());
+    public static boolean isSerializedType(Object message) {
+        return message instanceof CommitTransaction;
     }
 }