Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump versions 9.0.4-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..5ef056e8a0cb7127db01c680230564abc216e6bd 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
@@
-5,33
+5,35
@@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.controller.cluster.datastore.messages;
package org.opendaylight.controller.cluster.datastore.messages;
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+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.access.concepts.TransactionIdentifier;
-public class CreateTransaction extends VersionedExternalizableMessage {
+@Deprecated(since = "9.0.0", forRemoval = true)
+public final class CreateTransaction extends VersionedExternalizableMessage {
+ @java.io.Serial
private static final long serialVersionUID = 1L;
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(
final TransactionIdentifier transactionId, final int transactionType
,
+
final
short version) {
super(version);
super(version);
- this.transactionId =
Preconditions.checkNot
Null(transactionId);
+ this.transactionId =
requireNon
Null(transactionId);
this.transactionType = transactionType;
this.transactionType = transactionType;
- this.transactionChainId = transactionChainId != null ? transactionChainId : "";
}
}
- public
String
getTransactionId() {
+ public
TransactionIdentifier
getTransactionId() {
return transactionId;
}
return transactionId;
}
@@
-39,38
+41,31
@@
public class CreateTransaction extends VersionedExternalizableMessage {
return transactionType;
}
return transactionType;
}
- public String getTransactionChainId() {
- return transactionChainId;
- }
-
@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);
- transactionId =
in.readUTF(
);
+ transactionId =
TransactionIdentifier.readFrom(in
);
transactionType = in.readInt();
transactionType = in.readInt();
- transactionChainId = in.readUTF();
}
@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
);
+
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) {
-
Preconditions.
checkArgument(message instanceof CreateTransaction);
+ public static CreateTransaction fromSerializable(
final
Object message) {
+ checkArgument(message instanceof CreateTransaction);
return (CreateTransaction)message;
}
return (CreateTransaction)message;
}
- public static boolean isSerializedType(Object message) {
+ public static boolean isSerializedType(
final
Object message) {
return message instanceof CreateTransaction;
}
}
return message instanceof CreateTransaction;
}
}