Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Improve LocalProxyTransaction.doExists()
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
messages
/
AbstractThreePhaseCommitMessage.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java
index d96be31b2d1e598e494fc2030ee5f6370120072f..3b45e642cadddfe36c853d3376ad1909133f86e5 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java
@@
-7,11
+7,12
@@
*/
package org.opendaylight.controller.cluster.datastore.messages;
*/
package org.opendaylight.controller.cluster.datastore.messages;
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
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.
datastore.DataStoreVersions
;
+import org.opendaylight.controller.cluster.
access.concepts.TransactionIdentifier
;
/**
* Base class for a 3PC message.
/**
* Base class for a 3PC message.
@@
-21,42
+22,34
@@
import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
public abstract class AbstractThreePhaseCommitMessage extends VersionedExternalizableMessage {
private static final long serialVersionUID = 1L;
public abstract class AbstractThreePhaseCommitMessage extends VersionedExternalizableMessage {
private static final long serialVersionUID = 1L;
- private
String transactionID
;
+ private
TransactionIdentifier transactionId
;
protected AbstractThreePhaseCommitMessage() {
}
protected AbstractThreePhaseCommitMessage() {
}
- protected AbstractThreePhaseCommitMessage(final
String transactionID
, final short version) {
+ protected AbstractThreePhaseCommitMessage(final
TransactionIdentifier transactionId
, final short version) {
super(version);
super(version);
- this.transactionI
D = Preconditions.checkNotNull(transactionID
);
+ this.transactionI
d = requireNonNull(transactionId
);
}
}
- protected abstract Object newLegacySerializedInstance();
-
- public String getTransactionID() {
- return transactionID;
+ public TransactionIdentifier getTransactionId() {
+ return transactionId;
}
@Override
}
@Override
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ public void readExternal(
final
ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal(in);
super.readExternal(in);
- transactionI
D = in.readUTF(
);
+ transactionI
d = TransactionIdentifier.readFrom(in
);
}
@Override
}
@Override
- public void writeExternal(ObjectOutput out) throws IOException {
+ public void writeExternal(
final
ObjectOutput out) throws IOException {
super.writeExternal(out);
super.writeExternal(out);
- out.writeUTF(transactionID);
- }
-
- @Override
- public Object toSerializable() {
- return getVersion() >= DataStoreVersions.BORON_VERSION ? this : newLegacySerializedInstance();
+ transactionId.writeTo(out);
}
@Override
public String toString() {
}
@Override
public String toString() {
- return getClass().getSimpleName() + " [transactionID=" + transactionID + ", version=" + getVersion()
- + "]";
+ return getClass().getSimpleName() + " [transactionId=" + transactionId + ", version=" + getVersion() + "]";
}
}
}
}