Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 7521: Convert DatastoreSnapshot.ShardSnapshot to store Snapshot
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
messages
/
CreateTransaction.java
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 3d831a568c849a2c89542a5c8f155873f2ff400f..52e8824343fe1cafcf9398e58a340787ce2ea1e2 100644
(file)
--- 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 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;
public class CreateTransaction extends VersionedExternalizableMessage {
private static final long serialVersionUID = 1L;
- private
String
transactionId;
+ private
TransactionIdentifier
transactionId;
private int transactionType;
private int transactionType;
- private String transactionChainId;
public CreateTransaction() {
}
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;
super(version);
this.transactionId = Preconditions.checkNotNull(transactionId);
this.transactionType = transactionType;
- this.transactionChainId = transactionChainId != null ? transactionChainId : "";
}
}
- public
String
getTransactionId() {
+ public
TransactionIdentifier
getTransactionId() {
return transactionId;
}
return transactionId;
}
@@
-39,30
+37,23
@@
public class CreateTransaction extends VersionedExternalizableMessage {
return transactionType;
}
return transactionType;
}
- public String getTransactionChainId() {
- return transactionChainId;
- }
-
@Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal(in);
@Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal(in);
- transactionId =
in.readUTF(
);
+ transactionId =
TransactionIdentifier.readFrom(in
);
transactionType = in.readInt();
transactionType = in.readInt();
- transactionChainId = in.readUTF();
}
@Override
public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal(out);
}
@Override
public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal(out);
-
out.writeUTF(transactionId
);
+
transactionId.writeTo(out
);
out.writeInt(transactionType);
out.writeInt(transactionType);
- out.writeUTF(transactionChainId);
}
@Override
public String toString() {
}
@Override
public String toString() {
- return "CreateTransaction [transactionId=" + transactionId + ", transactionType=" + transactionType
- + ", transactionChainId=" + transactionChainId + "]";
+ return "CreateTransaction [transactionId=" + transactionId + ", transactionType=" + transactionType + "]";
}
public static CreateTransaction fromSerializable(Object message) {
}
public static CreateTransaction fromSerializable(Object message) {