BUG-5280: switch transaction IDs from String to TransactionIdentifier

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java
index 212f2bca925f0adb11c6a99ac87bcd6434fd261e..4fc725bd0ac8be3d24928924d52baf59229e2528 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java
@@ -12,34 +12,35 @@ import com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;

+import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier;

 
 public class CloseTransactionChain extends VersionedExternalizableMessage {
     private static final long serialVersionUID = 1L;
 
 
 public class CloseTransactionChain extends VersionedExternalizableMessage {
     private static final long serialVersionUID = 1L;
 

-    private String transactionChainId;
+    private LocalHistoryIdentifier transactionChainId;

 
     public CloseTransactionChain() {
     }
 
 
     public CloseTransactionChain() {
     }
 

-    public CloseTransactionChain(final String transactionChainId, final short version) {
+    public CloseTransactionChain(final LocalHistoryIdentifier transactionChainId, final short version) {

         super(version);
         super(version);

-        this.transactionChainId = transactionChainId;
+        this.transactionChainId = Preconditions.checkNotNull(transactionChainId);

     }
 
     }
 

-    public String getTransactionChainId() {
+    public LocalHistoryIdentifier getTransactionChainId() {

         return transactionChainId;
     }
 
     @Override
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         super.readExternal(in);
         return transactionChainId;
     }
 
     @Override
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         super.readExternal(in);

-        transactionChainId = in.readUTF();
+        transactionChainId = LocalHistoryIdentifier.readFrom(in);

     }
 
     @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         super.writeExternal(out);
     }
 
     @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         super.writeExternal(out);

-        out.writeUTF(transactionChainId);
+        transactionChainId.writeTo(out);

     }
 
     public static CloseTransactionChain fromSerializable(final Object serializable){
     }
 
     public static CloseTransactionChain fromSerializable(final Object serializable){