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%2FCreateTransaction.java;h=52e8824343fe1cafcf9398e58a340787ce2ea1e2;hp=3d831a568c849a2c89542a5c8f155873f2ff400f;hb=aafb8cb044e992dd784d1f4f66508599cc4cd588;hpb=24c074a4b32ac97980a652b78824b7c2f97ffb78 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java index 3d831a568c..52e8824343 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java @@ -12,26 +12,24 @@ import com.google.common.base.Preconditions; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; public class CreateTransaction extends VersionedExternalizableMessage { private static final long serialVersionUID = 1L; - private String transactionId; + private TransactionIdentifier transactionId; private int transactionType; - private String transactionChainId; public CreateTransaction() { } - public CreateTransaction(String transactionId, int transactionType, String transactionChainId, - short version) { + public CreateTransaction(TransactionIdentifier transactionId, int transactionType, short version) { super(version); this.transactionId = Preconditions.checkNotNull(transactionId); this.transactionType = transactionType; - this.transactionChainId = transactionChainId != null ? transactionChainId : ""; } - public String getTransactionId() { + public TransactionIdentifier getTransactionId() { return transactionId; } @@ -39,30 +37,23 @@ public class CreateTransaction extends VersionedExternalizableMessage { return transactionType; } - public String getTransactionChainId() { - return transactionChainId; - } - @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { super.readExternal(in); - transactionId = in.readUTF(); + transactionId = TransactionIdentifier.readFrom(in); transactionType = in.readInt(); - transactionChainId = in.readUTF(); } @Override public void writeExternal(ObjectOutput out) throws IOException { super.writeExternal(out); - out.writeUTF(transactionId); + transactionId.writeTo(out); out.writeInt(transactionType); - out.writeUTF(transactionChainId); } @Override public String toString() { - return "CreateTransaction [transactionId=" + transactionId + ", transactionType=" + transactionType - + ", transactionChainId=" + transactionChainId + "]"; + return "CreateTransaction [transactionId=" + transactionId + ", transactionType=" + transactionType + "]"; } public static CreateTransaction fromSerializable(Object message) {