X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FWriteData.java;h=a4f648b6b3ccb1a99fe1f3c66241f6801c4290bc;hb=daaef05cbf70e6cbec9af181258faead6d9620a6;hp=c5e3a6b05966c9c30f12c5f6f7dab93a78fbebf7;hpb=fcf65d723ef53f8da2dd6347f41ce19016fc36e5;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/WriteData.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/WriteData.java index c5e3a6b059..a4f648b6b3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/WriteData.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/WriteData.java @@ -16,7 +16,11 @@ import org.opendaylight.controller.protobuff.messages.transaction.ShardTransacti import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -public class WriteData extends ModifyData implements VersionedSerializableMessage { +/** + * @deprecated Replaced by BatchedModifications. + */ +@Deprecated +public class WriteData extends ModifyData { private static final long serialVersionUID = 1L; public static final Class SERIALIZABLE_CLASS = WriteData.class; @@ -24,14 +28,13 @@ public class WriteData extends ModifyData implements VersionedSerializableMessag public WriteData() { } - public WriteData(YangInstanceIdentifier path, NormalizedNode data) { - super(path, data); + public WriteData(YangInstanceIdentifier path, NormalizedNode data, short version) { + super(path, data, version); } @Override - public Object toSerializable(short toVersion) { - if(toVersion >= DataStoreVersions.LITHIUM_VERSION) { - setVersion(toVersion); + public Object toSerializable() { + if(getVersion() >= DataStoreVersions.LITHIUM_VERSION) { return this; } else { // To base or R1 Helium version @@ -50,12 +53,13 @@ public class WriteData extends ModifyData implements VersionedSerializableMessag ShardTransactionMessages.WriteData o = (ShardTransactionMessages.WriteData) serializable; Decoded decoded = new NormalizedNodeToNodeCodec(null).decode( o.getInstanceIdentifierPathArguments(), o.getNormalizedNode()); - return new WriteData(decoded.getDecodedPath(), decoded.getDecodedNode()); + return new WriteData(decoded.getDecodedPath(), decoded.getDecodedNode(), + DataStoreVersions.HELIUM_2_VERSION); } } public static boolean isSerializedType(Object message) { - return SERIALIZABLE_CLASS.isAssignableFrom(message.getClass()) || + return SERIALIZABLE_CLASS.isInstance(message) || message instanceof ShardTransactionMessages.WriteData; } }