From: Tom Pantelis Date: Wed, 20 Jan 2016 06:19:18 +0000 (-0500) Subject: Deprecate CloseTransaction protobuff message X-Git-Tag: release/boron~421 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=11e722671c6dc194761471038a4e3ca5f7fd8970 Deprecate CloseTransaction protobuff message Deprecated the associated CloseTransaction and CloseTransactionReply protobuff messages and changed the message classes to extend VersionedExternalizableMessage. Backwards compatibility with pre-boron is maintained. Related code was modified accordingly. While the backend sends back the CloseTransactionReply, the transaction front-end doesn't actually use it so I removed the protobuff-related code in CloseTransactionReply as it doesn't matter which serialized version is returned. Change-Id: I42946bbb38c5ff84d05ee0578d8ca9c8f124d5ed Signed-off-by: Tom Pantelis --- diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java index e1e6ef7dec..9b4ab7c7a9 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java @@ -3,6 +3,7 @@ package org.opendaylight.controller.protobuff.messages.transaction; +@Deprecated public final class ShardTransactionMessages { private ShardTransactionMessages() {} public static void registerAllExtensions( @@ -29,6 +30,7 @@ public final class ShardTransactionMessages { return defaultInstance; } + @Override public CloseTransaction getDefaultInstanceForType() { return defaultInstance; } @@ -78,6 +80,7 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor; } + @Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_fieldAccessorTable @@ -87,7 +90,8 @@ public final class ShardTransactionMessages { public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public CloseTransaction parsePartialFrom( + @Override + public CloseTransaction parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -103,14 +107,18 @@ public final class ShardTransactionMessages { private void initFields() { } private byte memoizedIsInitialized = -1; + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; + if (isInitialized != -1) { + return isInitialized == 1; + } memoizedIsInitialized = 1; return true; } + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -118,9 +126,12 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; + @Override public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) return size; + if (size != -1) { + return size; + } size = 0; size += getUnknownFields().getSerializedSize(); @@ -189,10 +200,12 @@ public final class ShardTransactionMessages { } public static Builder newBuilder() { return Builder.create(); } + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction prototype) { return newBuilder().mergeFrom(prototype); } + @Override public Builder toBuilder() { return newBuilder(this); } @java.lang.Override @@ -212,7 +225,8 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -237,25 +251,30 @@ public final class ShardTransactionMessages { return new Builder(); } - public Builder clear() { + @Override + public Builder clear() { super.clear(); return this; } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor + @Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction getDefaultInstanceForType() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction getDefaultInstanceForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction.getDefaultInstance(); } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction build() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction build() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); @@ -263,13 +282,15 @@ public final class ShardTransactionMessages { return result; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction buildPartial() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction buildPartial() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction(this); onBuilt(); return result; } - public Builder mergeFrom(com.google.protobuf.Message other) { + @Override + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction) { return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction)other); } else { @@ -279,16 +300,20 @@ public final class ShardTransactionMessages { } public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction other) { - if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction.getDefaultInstance()) return this; + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction.getDefaultInstance()) { + return this; + } this.mergeUnknownFields(other.getUnknownFields()); return this; } - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { return true; } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -338,6 +363,7 @@ public final class ShardTransactionMessages { return defaultInstance; } + @Override public CloseTransactionReply getDefaultInstanceForType() { return defaultInstance; } @@ -387,6 +413,7 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor; } + @Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_fieldAccessorTable @@ -396,7 +423,8 @@ public final class ShardTransactionMessages { public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public CloseTransactionReply parsePartialFrom( + @Override + public CloseTransactionReply parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -412,14 +440,18 @@ public final class ShardTransactionMessages { private void initFields() { } private byte memoizedIsInitialized = -1; + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; + if (isInitialized != -1) { + return isInitialized == 1; + } memoizedIsInitialized = 1; return true; } + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -427,9 +459,12 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; + @Override public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) return size; + if (size != -1) { + return size; + } size = 0; size += getUnknownFields().getSerializedSize(); @@ -498,10 +533,12 @@ public final class ShardTransactionMessages { } public static Builder newBuilder() { return Builder.create(); } + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply prototype) { return newBuilder().mergeFrom(prototype); } + @Override public Builder toBuilder() { return newBuilder(this); } @java.lang.Override @@ -521,7 +558,8 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -546,25 +584,30 @@ public final class ShardTransactionMessages { return new Builder(); } - public Builder clear() { + @Override + public Builder clear() { super.clear(); return this; } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor + @Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply getDefaultInstanceForType() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply getDefaultInstanceForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply.getDefaultInstance(); } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply build() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply build() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); @@ -572,13 +615,15 @@ public final class ShardTransactionMessages { return result; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply buildPartial() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply buildPartial() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply(this); onBuilt(); return result; } - public Builder mergeFrom(com.google.protobuf.Message other) { + @Override + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply) { return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply)other); } else { @@ -588,16 +633,20 @@ public final class ShardTransactionMessages { } public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply other) { - if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply.getDefaultInstance()) return this; + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply.getDefaultInstance()) { + return this; + } this.mergeUnknownFields(other.getUnknownFields()); return this; } - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { return true; } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -697,6 +746,7 @@ public final class ShardTransactionMessages { return defaultInstance; } + @Override public CreateTransaction getDefaultInstanceForType() { return defaultInstance; } @@ -767,6 +817,7 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor; } + @Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_fieldAccessorTable @@ -776,7 +827,8 @@ public final class ShardTransactionMessages { public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public CreateTransaction parsePartialFrom( + @Override + public CreateTransaction parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -796,18 +848,20 @@ public final class ShardTransactionMessages { /** * required string transactionId = 1; */ + @Override public boolean hasTransactionId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** * required string transactionId = 1; */ + @Override public java.lang.String getTransactionId() { java.lang.Object ref = transactionId_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); if (bs.isValidUtf8()) { @@ -819,11 +873,12 @@ public final class ShardTransactionMessages { /** * required string transactionId = 1; */ + @Override public com.google.protobuf.ByteString getTransactionIdBytes() { java.lang.Object ref = transactionId_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); transactionId_ = b; @@ -839,12 +894,14 @@ public final class ShardTransactionMessages { /** * required int32 transactionType = 2; */ + @Override public boolean hasTransactionType() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** * required int32 transactionType = 2; */ + @Override public int getTransactionType() { return transactionType_; } @@ -855,18 +912,20 @@ public final class ShardTransactionMessages { /** * optional string transactionChainId = 3; */ + @Override public boolean hasTransactionChainId() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** * optional string transactionChainId = 3; */ + @Override public java.lang.String getTransactionChainId() { java.lang.Object ref = transactionChainId_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); if (bs.isValidUtf8()) { @@ -878,11 +937,12 @@ public final class ShardTransactionMessages { /** * optional string transactionChainId = 3; */ + @Override public com.google.protobuf.ByteString getTransactionChainIdBytes() { java.lang.Object ref = transactionChainId_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); transactionChainId_ = b; @@ -898,12 +958,14 @@ public final class ShardTransactionMessages { /** * optional int32 messageVersion = 4; */ + @Override public boolean hasMessageVersion() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** * optional int32 messageVersion = 4; */ + @Override public int getMessageVersion() { return messageVersion_; } @@ -915,9 +977,12 @@ public final class ShardTransactionMessages { messageVersion_ = 0; } private byte memoizedIsInitialized = -1; + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; + if (isInitialized != -1) { + return isInitialized == 1; + } if (!hasTransactionId()) { memoizedIsInitialized = 0; @@ -931,6 +996,7 @@ public final class ShardTransactionMessages { return true; } + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -950,9 +1016,12 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; + @Override public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) return size; + if (size != -1) { + return size; + } size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -1037,10 +1106,12 @@ public final class ShardTransactionMessages { } public static Builder newBuilder() { return Builder.create(); } + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction prototype) { return newBuilder().mergeFrom(prototype); } + @Override public Builder toBuilder() { return newBuilder(this); } @java.lang.Override @@ -1060,7 +1131,8 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -1085,7 +1157,8 @@ public final class ShardTransactionMessages { return new Builder(); } - public Builder clear() { + @Override + public Builder clear() { super.clear(); transactionId_ = ""; bitField0_ = (bitField0_ & ~0x00000001); @@ -1098,20 +1171,24 @@ public final class ShardTransactionMessages { return this; } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor + @Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction getDefaultInstanceForType() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction getDefaultInstanceForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction.getDefaultInstance(); } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction build() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction build() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); @@ -1119,7 +1196,8 @@ public final class ShardTransactionMessages { return result; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction buildPartial() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction buildPartial() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; @@ -1144,7 +1222,8 @@ public final class ShardTransactionMessages { return result; } - public Builder mergeFrom(com.google.protobuf.Message other) { + @Override + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction) { return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction)other); } else { @@ -1154,7 +1233,9 @@ public final class ShardTransactionMessages { } public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction other) { - if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction.getDefaultInstance()) return this; + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction.getDefaultInstance()) { + return this; + } if (other.hasTransactionId()) { bitField0_ |= 0x00000001; transactionId_ = other.transactionId_; @@ -1175,19 +1256,21 @@ public final class ShardTransactionMessages { return this; } - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { if (!hasTransactionId()) { - + return false; } if (!hasTransactionType()) { - + return false; } return true; } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1211,13 +1294,15 @@ public final class ShardTransactionMessages { /** * required string transactionId = 1; */ - public boolean hasTransactionId() { + @Override + public boolean hasTransactionId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** * required string transactionId = 1; */ - public java.lang.String getTransactionId() { + @Override + public java.lang.String getTransactionId() { java.lang.Object ref = transactionId_; if (!(ref instanceof java.lang.String)) { java.lang.String s = ((com.google.protobuf.ByteString) ref) @@ -1231,11 +1316,12 @@ public final class ShardTransactionMessages { /** * required string transactionId = 1; */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getTransactionIdBytes() { java.lang.Object ref = transactionId_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); transactionId_ = b; @@ -1285,13 +1371,15 @@ public final class ShardTransactionMessages { /** * required int32 transactionType = 2; */ - public boolean hasTransactionType() { + @Override + public boolean hasTransactionType() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** * required int32 transactionType = 2; */ - public int getTransactionType() { + @Override + public int getTransactionType() { return transactionType_; } /** @@ -1318,13 +1406,15 @@ public final class ShardTransactionMessages { /** * optional string transactionChainId = 3; */ - public boolean hasTransactionChainId() { + @Override + public boolean hasTransactionChainId() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** * optional string transactionChainId = 3; */ - public java.lang.String getTransactionChainId() { + @Override + public java.lang.String getTransactionChainId() { java.lang.Object ref = transactionChainId_; if (!(ref instanceof java.lang.String)) { java.lang.String s = ((com.google.protobuf.ByteString) ref) @@ -1338,11 +1428,12 @@ public final class ShardTransactionMessages { /** * optional string transactionChainId = 3; */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getTransactionChainIdBytes() { java.lang.Object ref = transactionChainId_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); transactionChainId_ = b; @@ -1392,13 +1483,15 @@ public final class ShardTransactionMessages { /** * optional int32 messageVersion = 4; */ - public boolean hasMessageVersion() { + @Override + public boolean hasMessageVersion() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** * optional int32 messageVersion = 4; */ - public int getMessageVersion() { + @Override + public int getMessageVersion() { return messageVersion_; } /** @@ -1492,6 +1585,7 @@ public final class ShardTransactionMessages { return defaultInstance; } + @Override public CreateTransactionReply getDefaultInstanceForType() { return defaultInstance; } @@ -1557,6 +1651,7 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor; } + @Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_fieldAccessorTable @@ -1566,7 +1661,8 @@ public final class ShardTransactionMessages { public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public CreateTransactionReply parsePartialFrom( + @Override + public CreateTransactionReply parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -1586,18 +1682,20 @@ public final class ShardTransactionMessages { /** * required string transactionActorPath = 1; */ + @Override public boolean hasTransactionActorPath() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** * required string transactionActorPath = 1; */ + @Override public java.lang.String getTransactionActorPath() { java.lang.Object ref = transactionActorPath_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); if (bs.isValidUtf8()) { @@ -1609,11 +1707,12 @@ public final class ShardTransactionMessages { /** * required string transactionActorPath = 1; */ + @Override public com.google.protobuf.ByteString getTransactionActorPathBytes() { java.lang.Object ref = transactionActorPath_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); transactionActorPath_ = b; @@ -1629,18 +1728,20 @@ public final class ShardTransactionMessages { /** * required string transactionId = 2; */ + @Override public boolean hasTransactionId() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** * required string transactionId = 2; */ + @Override public java.lang.String getTransactionId() { java.lang.Object ref = transactionId_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); if (bs.isValidUtf8()) { @@ -1652,11 +1753,12 @@ public final class ShardTransactionMessages { /** * required string transactionId = 2; */ + @Override public com.google.protobuf.ByteString getTransactionIdBytes() { java.lang.Object ref = transactionId_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); transactionId_ = b; @@ -1672,12 +1774,14 @@ public final class ShardTransactionMessages { /** * optional int32 messageVersion = 3; */ + @Override public boolean hasMessageVersion() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** * optional int32 messageVersion = 3; */ + @Override public int getMessageVersion() { return messageVersion_; } @@ -1688,9 +1792,12 @@ public final class ShardTransactionMessages { messageVersion_ = 0; } private byte memoizedIsInitialized = -1; + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; + if (isInitialized != -1) { + return isInitialized == 1; + } if (!hasTransactionActorPath()) { memoizedIsInitialized = 0; @@ -1704,6 +1811,7 @@ public final class ShardTransactionMessages { return true; } + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -1720,9 +1828,12 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; + @Override public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) return size; + if (size != -1) { + return size; + } size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -1803,10 +1914,12 @@ public final class ShardTransactionMessages { } public static Builder newBuilder() { return Builder.create(); } + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply prototype) { return newBuilder().mergeFrom(prototype); } + @Override public Builder toBuilder() { return newBuilder(this); } @java.lang.Override @@ -1826,7 +1939,8 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -1851,7 +1965,8 @@ public final class ShardTransactionMessages { return new Builder(); } - public Builder clear() { + @Override + public Builder clear() { super.clear(); transactionActorPath_ = ""; bitField0_ = (bitField0_ & ~0x00000001); @@ -1862,20 +1977,24 @@ public final class ShardTransactionMessages { return this; } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor + @Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply getDefaultInstanceForType() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply getDefaultInstanceForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply.getDefaultInstance(); } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply build() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply build() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); @@ -1883,7 +2002,8 @@ public final class ShardTransactionMessages { return result; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply buildPartial() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply buildPartial() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; @@ -1904,7 +2024,8 @@ public final class ShardTransactionMessages { return result; } - public Builder mergeFrom(com.google.protobuf.Message other) { + @Override + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply) { return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply)other); } else { @@ -1914,7 +2035,9 @@ public final class ShardTransactionMessages { } public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply other) { - if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply.getDefaultInstance()) return this; + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply.getDefaultInstance()) { + return this; + } if (other.hasTransactionActorPath()) { bitField0_ |= 0x00000001; transactionActorPath_ = other.transactionActorPath_; @@ -1932,19 +2055,21 @@ public final class ShardTransactionMessages { return this; } - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { if (!hasTransactionActorPath()) { - + return false; } if (!hasTransactionId()) { - + return false; } return true; } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1968,13 +2093,15 @@ public final class ShardTransactionMessages { /** * required string transactionActorPath = 1; */ - public boolean hasTransactionActorPath() { + @Override + public boolean hasTransactionActorPath() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** * required string transactionActorPath = 1; */ - public java.lang.String getTransactionActorPath() { + @Override + public java.lang.String getTransactionActorPath() { java.lang.Object ref = transactionActorPath_; if (!(ref instanceof java.lang.String)) { java.lang.String s = ((com.google.protobuf.ByteString) ref) @@ -1988,11 +2115,12 @@ public final class ShardTransactionMessages { /** * required string transactionActorPath = 1; */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getTransactionActorPathBytes() { java.lang.Object ref = transactionActorPath_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); transactionActorPath_ = b; @@ -2042,13 +2170,15 @@ public final class ShardTransactionMessages { /** * required string transactionId = 2; */ - public boolean hasTransactionId() { + @Override + public boolean hasTransactionId() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** * required string transactionId = 2; */ - public java.lang.String getTransactionId() { + @Override + public java.lang.String getTransactionId() { java.lang.Object ref = transactionId_; if (!(ref instanceof java.lang.String)) { java.lang.String s = ((com.google.protobuf.ByteString) ref) @@ -2062,11 +2192,12 @@ public final class ShardTransactionMessages { /** * required string transactionId = 2; */ - public com.google.protobuf.ByteString + @Override + public com.google.protobuf.ByteString getTransactionIdBytes() { java.lang.Object ref = transactionId_; if (ref instanceof String) { - com.google.protobuf.ByteString b = + com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); transactionId_ = b; @@ -2116,13 +2247,15 @@ public final class ShardTransactionMessages { /** * optional int32 messageVersion = 3; */ - public boolean hasMessageVersion() { + @Override + public boolean hasMessageVersion() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** * optional int32 messageVersion = 3; */ - public int getMessageVersion() { + @Override + public int getMessageVersion() { return messageVersion_; } /** @@ -2190,6 +2323,7 @@ public final class ShardTransactionMessages { return defaultInstance; } + @Override public ReadData getDefaultInstanceForType() { return defaultInstance; } @@ -2253,6 +2387,7 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor; } + @Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_fieldAccessorTable @@ -2262,7 +2397,8 @@ public final class ShardTransactionMessages { public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public ReadData parsePartialFrom( + @Override + public ReadData parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -2282,18 +2418,21 @@ public final class ShardTransactionMessages { /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ + @Override public boolean hasInstanceIdentifierPathArguments() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ + @Override public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier getInstanceIdentifierPathArguments() { return instanceIdentifierPathArguments_; } /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ + @Override public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder getInstanceIdentifierPathArgumentsOrBuilder() { return instanceIdentifierPathArguments_; } @@ -2302,9 +2441,12 @@ public final class ShardTransactionMessages { instanceIdentifierPathArguments_ = org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.getDefaultInstance(); } private byte memoizedIsInitialized = -1; + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; + if (isInitialized != -1) { + return isInitialized == 1; + } if (!hasInstanceIdentifierPathArguments()) { memoizedIsInitialized = 0; @@ -2318,6 +2460,7 @@ public final class ShardTransactionMessages { return true; } + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -2328,9 +2471,12 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; + @Override public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) return size; + if (size != -1) { + return size; + } size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -2403,10 +2549,12 @@ public final class ShardTransactionMessages { } public static Builder newBuilder() { return Builder.create(); } + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData prototype) { return newBuilder().mergeFrom(prototype); } + @Override public Builder toBuilder() { return newBuilder(this); } @java.lang.Override @@ -2426,7 +2574,8 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -2452,7 +2601,8 @@ public final class ShardTransactionMessages { return new Builder(); } - public Builder clear() { + @Override + public Builder clear() { super.clear(); if (instanceIdentifierPathArgumentsBuilder_ == null) { instanceIdentifierPathArguments_ = org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.getDefaultInstance(); @@ -2463,20 +2613,24 @@ public final class ShardTransactionMessages { return this; } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor + @Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData getDefaultInstanceForType() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData getDefaultInstanceForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData.getDefaultInstance(); } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData build() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData build() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); @@ -2484,7 +2638,8 @@ public final class ShardTransactionMessages { return result; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData buildPartial() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData buildPartial() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; @@ -2501,7 +2656,8 @@ public final class ShardTransactionMessages { return result; } - public Builder mergeFrom(com.google.protobuf.Message other) { + @Override + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData) { return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData)other); } else { @@ -2511,7 +2667,9 @@ public final class ShardTransactionMessages { } public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData other) { - if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData.getDefaultInstance()) return this; + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData.getDefaultInstance()) { + return this; + } if (other.hasInstanceIdentifierPathArguments()) { mergeInstanceIdentifierPathArguments(other.getInstanceIdentifierPathArguments()); } @@ -2519,19 +2677,21 @@ public final class ShardTransactionMessages { return this; } - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { if (!hasInstanceIdentifierPathArguments()) { - + return false; } if (!getInstanceIdentifierPathArguments().isInitialized()) { - + return false; } return true; } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2557,13 +2717,15 @@ public final class ShardTransactionMessages { /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ - public boolean hasInstanceIdentifierPathArguments() { + @Override + public boolean hasInstanceIdentifierPathArguments() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ - public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier getInstanceIdentifierPathArguments() { + @Override + public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier getInstanceIdentifierPathArguments() { if (instanceIdentifierPathArgumentsBuilder_ == null) { return instanceIdentifierPathArguments_; } else { @@ -2643,7 +2805,8 @@ public final class ShardTransactionMessages { /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ - public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder getInstanceIdentifierPathArgumentsOrBuilder() { + @Override + public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder getInstanceIdentifierPathArgumentsOrBuilder() { if (instanceIdentifierPathArgumentsBuilder_ != null) { return instanceIdentifierPathArgumentsBuilder_.getMessageOrBuilder(); } else { @@ -2654,7 +2817,7 @@ public final class ShardTransactionMessages { * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ private com.google.protobuf.SingleFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder> + org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder> getInstanceIdentifierPathArgumentsFieldBuilder() { if (instanceIdentifierPathArgumentsBuilder_ == null) { instanceIdentifierPathArgumentsBuilder_ = new com.google.protobuf.SingleFieldBuilder< @@ -3232,6 +3395,7 @@ public final class ShardTransactionMessages { return defaultInstance; } + @Override public DataExists getDefaultInstanceForType() { return defaultInstance; } @@ -3295,6 +3459,7 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DataExists_descriptor; } + @Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DataExists_fieldAccessorTable @@ -3304,7 +3469,8 @@ public final class ShardTransactionMessages { public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public DataExists parsePartialFrom( + @Override + public DataExists parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3324,18 +3490,21 @@ public final class ShardTransactionMessages { /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ + @Override public boolean hasInstanceIdentifierPathArguments() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ + @Override public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier getInstanceIdentifierPathArguments() { return instanceIdentifierPathArguments_; } /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ + @Override public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder getInstanceIdentifierPathArgumentsOrBuilder() { return instanceIdentifierPathArguments_; } @@ -3344,9 +3513,12 @@ public final class ShardTransactionMessages { instanceIdentifierPathArguments_ = org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.getDefaultInstance(); } private byte memoizedIsInitialized = -1; + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; + if (isInitialized != -1) { + return isInitialized == 1; + } if (!hasInstanceIdentifierPathArguments()) { memoizedIsInitialized = 0; @@ -3360,6 +3532,7 @@ public final class ShardTransactionMessages { return true; } + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -3370,9 +3543,12 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; + @Override public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) return size; + if (size != -1) { + return size; + } size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -3445,10 +3621,12 @@ public final class ShardTransactionMessages { } public static Builder newBuilder() { return Builder.create(); } + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists prototype) { return newBuilder().mergeFrom(prototype); } + @Override public Builder toBuilder() { return newBuilder(this); } @java.lang.Override @@ -3468,7 +3646,8 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DataExists_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DataExists_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -3494,7 +3673,8 @@ public final class ShardTransactionMessages { return new Builder(); } - public Builder clear() { + @Override + public Builder clear() { super.clear(); if (instanceIdentifierPathArgumentsBuilder_ == null) { instanceIdentifierPathArguments_ = org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.getDefaultInstance(); @@ -3505,20 +3685,24 @@ public final class ShardTransactionMessages { return this; } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor + @Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DataExists_descriptor; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists getDefaultInstanceForType() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists getDefaultInstanceForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists.getDefaultInstance(); } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists build() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists build() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); @@ -3526,7 +3710,8 @@ public final class ShardTransactionMessages { return result; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists buildPartial() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists buildPartial() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; @@ -3543,7 +3728,8 @@ public final class ShardTransactionMessages { return result; } - public Builder mergeFrom(com.google.protobuf.Message other) { + @Override + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists) { return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists)other); } else { @@ -3553,7 +3739,9 @@ public final class ShardTransactionMessages { } public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists other) { - if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists.getDefaultInstance()) return this; + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExists.getDefaultInstance()) { + return this; + } if (other.hasInstanceIdentifierPathArguments()) { mergeInstanceIdentifierPathArguments(other.getInstanceIdentifierPathArguments()); } @@ -3561,19 +3749,21 @@ public final class ShardTransactionMessages { return this; } - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { if (!hasInstanceIdentifierPathArguments()) { - + return false; } if (!getInstanceIdentifierPathArguments().isInitialized()) { - + return false; } return true; } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3599,13 +3789,15 @@ public final class ShardTransactionMessages { /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ - public boolean hasInstanceIdentifierPathArguments() { + @Override + public boolean hasInstanceIdentifierPathArguments() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ - public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier getInstanceIdentifierPathArguments() { + @Override + public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier getInstanceIdentifierPathArguments() { if (instanceIdentifierPathArgumentsBuilder_ == null) { return instanceIdentifierPathArguments_; } else { @@ -3685,7 +3877,8 @@ public final class ShardTransactionMessages { /** * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ - public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder getInstanceIdentifierPathArgumentsOrBuilder() { + @Override + public org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder getInstanceIdentifierPathArgumentsOrBuilder() { if (instanceIdentifierPathArgumentsBuilder_ != null) { return instanceIdentifierPathArgumentsBuilder_.getMessageOrBuilder(); } else { @@ -3696,7 +3889,7 @@ public final class ShardTransactionMessages { * required .org.opendaylight.controller.mdsal.InstanceIdentifier instanceIdentifierPathArguments = 1; */ private com.google.protobuf.SingleFieldBuilder< - org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder> + org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifier.Builder, org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.InstanceIdentifierOrBuilder> getInstanceIdentifierPathArgumentsFieldBuilder() { if (instanceIdentifierPathArgumentsBuilder_ == null) { instanceIdentifierPathArgumentsBuilder_ = new com.google.protobuf.SingleFieldBuilder< @@ -3751,6 +3944,7 @@ public final class ShardTransactionMessages { return defaultInstance; } + @Override public DataExistsReply getDefaultInstanceForType() { return defaultInstance; } @@ -3806,6 +4000,7 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DataExistsReply_descriptor; } + @Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DataExistsReply_fieldAccessorTable @@ -3815,7 +4010,8 @@ public final class ShardTransactionMessages { public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public DataExistsReply parsePartialFrom( + @Override + public DataExistsReply parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3835,12 +4031,14 @@ public final class ShardTransactionMessages { /** * required bool exists = 1; */ + @Override public boolean hasExists() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** * required bool exists = 1; */ + @Override public boolean getExists() { return exists_; } @@ -3849,9 +4047,12 @@ public final class ShardTransactionMessages { exists_ = false; } private byte memoizedIsInitialized = -1; + @Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; + if (isInitialized != -1) { + return isInitialized == 1; + } if (!hasExists()) { memoizedIsInitialized = 0; @@ -3861,6 +4062,7 @@ public final class ShardTransactionMessages { return true; } + @Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); @@ -3871,9 +4073,12 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; + @Override public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) return size; + if (size != -1) { + return size; + } size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -3946,10 +4151,12 @@ public final class ShardTransactionMessages { } public static Builder newBuilder() { return Builder.create(); } + @Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply prototype) { return newBuilder().mergeFrom(prototype); } + @Override public Builder toBuilder() { return newBuilder(this); } @java.lang.Override @@ -3969,7 +4176,8 @@ public final class ShardTransactionMessages { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DataExistsReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + @Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DataExistsReply_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -3994,27 +4202,32 @@ public final class ShardTransactionMessages { return new Builder(); } - public Builder clear() { + @Override + public Builder clear() { super.clear(); exists_ = false; bitField0_ = (bitField0_ & ~0x00000001); return this; } - public Builder clone() { + @Override + public Builder clone() { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor + @Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DataExistsReply_descriptor; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply getDefaultInstanceForType() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply getDefaultInstanceForType() { return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply.getDefaultInstance(); } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply build() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply build() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); @@ -4022,7 +4235,8 @@ public final class ShardTransactionMessages { return result; } - public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply buildPartial() { + @Override + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply buildPartial() { org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; @@ -4035,7 +4249,8 @@ public final class ShardTransactionMessages { return result; } - public Builder mergeFrom(com.google.protobuf.Message other) { + @Override + public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply) { return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply)other); } else { @@ -4045,7 +4260,9 @@ public final class ShardTransactionMessages { } public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply other) { - if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply.getDefaultInstance()) return this; + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DataExistsReply.getDefaultInstance()) { + return this; + } if (other.hasExists()) { setExists(other.getExists()); } @@ -4053,15 +4270,17 @@ public final class ShardTransactionMessages { return this; } - public final boolean isInitialized() { + @Override + public final boolean isInitialized() { if (!hasExists()) { - + return false; } return true; } - public Builder mergeFrom( + @Override + public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -4085,13 +4304,15 @@ public final class ShardTransactionMessages { /** * required bool exists = 1; */ - public boolean hasExists() { + @Override + public boolean hasExists() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** * required bool exists = 1; */ - public boolean getExists() { + @Override + public boolean getExists() { return exists_; } /** @@ -4196,6 +4417,7 @@ public final class ShardTransactionMessages { }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + @Override public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor root) { descriptor = root; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java index 1f22222b5b..3a24260a88 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataStoreVersions.java @@ -17,5 +17,6 @@ public interface DataStoreVersions { short HELIUM_1_VERSION = 1; short HELIUM_2_VERSION = 2; short LITHIUM_VERSION = 3; - short CURRENT_VERSION = LITHIUM_VERSION; + short BORON_VERSION = 5; + short CURRENT_VERSION = BORON_VERSION; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContext.java index af0c871409..a2560bd369 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContext.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContext.java @@ -80,7 +80,7 @@ public class RemoteTransactionContext extends AbstractTransactionContext { LOG.debug("Tx {} closeTransaction called", getIdentifier()); TransactionContextCleanup.untrack(this); - actorContext.sendOperationAsync(getActor(), CloseTransaction.INSTANCE.toSerializable()); + actorContext.sendOperationAsync(getActor(), new CloseTransaction(remoteTransactionVersion).toSerializable()); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java index 3d54b4e814..c6d13dcc81 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java @@ -80,7 +80,7 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering @Override public void handleReceive(Object message) throws Exception { - if (message.getClass().equals(CloseTransaction.SERIALIZABLE_CLASS)) { + if (CloseTransaction.isSerializedType(message)) { closeTransaction(true); } else if (message instanceof ReceiveTimeout) { if(LOG.isDebugEnabled()) { @@ -100,7 +100,7 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering getDOMStoreTransaction().abort(); if(sendReply && returnCloseTransactionReply()) { - getSender().tell(CloseTransactionReply.INSTANCE.toSerializable(), getSelf()); + getSender().tell(new CloseTransactionReply(), getSelf()); } getSelf().tell(PoisonPill.getInstance(), getSelf()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransaction.java index ef1aac8d4b..738a74f17b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransaction.java @@ -8,19 +8,28 @@ package org.opendaylight.controller.cluster.datastore.messages; +import org.opendaylight.controller.cluster.datastore.DataStoreVersions; import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; -public class CloseTransaction implements SerializableMessage{ - public static final Class SERIALIZABLE_CLASS = - ShardTransactionMessages.CloseTransaction.class; +public class CloseTransaction extends VersionedExternalizableMessage { + private static final long serialVersionUID = 1L; private static final Object SERIALIZED_INSTANCE = ShardTransactionMessages.CloseTransaction.newBuilder().build(); - public static final CloseTransaction INSTANCE = new CloseTransaction(); + public CloseTransaction() { + } + + public CloseTransaction(short version) { + super(version); + } @Override public Object toSerializable() { - return SERIALIZED_INSTANCE; + return getVersion() >= DataStoreVersions.BORON_VERSION ? this : SERIALIZED_INSTANCE; + } + + public static boolean isSerializedType(Object message) { + return message instanceof CloseTransaction || message instanceof ShardTransactionMessages.CloseTransaction; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionReply.java index 1c47a1827f..3e32233959 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionReply.java @@ -8,19 +8,14 @@ package org.opendaylight.controller.cluster.datastore.messages; -import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; +public class CloseTransactionReply extends VersionedExternalizableMessage { + private static final long serialVersionUID = 1L; -public class CloseTransactionReply implements SerializableMessage { - public static final Class SERIALIZABLE_CLASS = - ShardTransactionMessages.CloseTransactionReply.class; - - private static final Object SERIALIZED_INSTANCE = - ShardTransactionMessages.CloseTransactionReply.newBuilder().build(); - - public static final CloseTransactionReply INSTANCE = new CloseTransactionReply(); + public CloseTransactionReply() { + } @Override public Object toSerializable() { - return SERIALIZED_INSTANCE; + return this; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java index 51e46c000c..630dc3908e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java @@ -422,7 +422,7 @@ public class ShardTransactionTest extends AbstractActorTest { transaction.tell(new CloseTransaction().toSerializable(), getRef()); - expectMsgClass(duration("3 seconds"), CloseTransactionReply.SERIALIZABLE_CLASS); + expectMsgClass(duration("3 seconds"), CloseTransactionReply.class); expectTerminated(duration("3 seconds"), transaction); }}; } @@ -437,7 +437,7 @@ public class ShardTransactionTest extends AbstractActorTest { transaction.tell(new CloseTransaction().toSerializable(), getRef()); - expectMsgClass(duration("3 seconds"), CloseTransactionReply.SERIALIZABLE_CLASS); + expectMsgClass(duration("3 seconds"), CloseTransactionReply.class); expectTerminated(duration("3 seconds"), transaction); }}; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java index 2f5182e193..4be29beb51 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionProxyTest.java @@ -770,7 +770,7 @@ public class TransactionProxyTest extends AbstractTransactionProxyTest { transactionProxy.close(); verify(mockActorContext).sendOperationAsync( - eq(actorSelection(actorRef)), isA(CloseTransaction.SERIALIZABLE_CLASS)); + eq(actorSelection(actorRef)), isA(CloseTransaction.class)); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/compat/PreBoronTransactionProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/compat/PreBoronTransactionProxyTest.java new file mode 100644 index 0000000000..4189912d5b --- /dev/null +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/compat/PreBoronTransactionProxyTest.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2016 Brocade Communications Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * 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.compat; + +import static org.mockito.Matchers.eq; +import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.verify; +import static org.opendaylight.controller.cluster.datastore.TransactionType.READ_WRITE; +import akka.actor.ActorRef; +import org.junit.Test; +import org.opendaylight.controller.cluster.datastore.AbstractTransactionProxyTest; +import org.opendaylight.controller.cluster.datastore.DataStoreVersions; +import org.opendaylight.controller.cluster.datastore.TransactionProxy; +import org.opendaylight.controller.cluster.datastore.shardstrategy.DefaultShardStrategy; +import org.opendaylight.controller.md.cluster.datastore.model.TestModel; +import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; + +/** + * TransactionProxy unit tests for backwards compatibility with pre-Boron versions. + * + * @author Thomas Pantelis + */ +public class PreBoronTransactionProxyTest extends AbstractTransactionProxyTest { + + @Test + public void testClose() throws Exception{ + ActorRef actorRef = setupActorContextWithInitialCreateTransaction(getSystem(), READ_WRITE, + DataStoreVersions.LITHIUM_VERSION, DefaultShardStrategy.DEFAULT_SHARD); + + doReturn(readDataReply(null)).when(mockActorContext).executeOperationAsync( + eq(actorSelection(actorRef)), eqSerializedReadData()); + + TransactionProxy transactionProxy = new TransactionProxy(mockComponentFactory, READ_WRITE); + + transactionProxy.read(TestModel.TEST_PATH); + + transactionProxy.close(); + + verify(mockActorContext).sendOperationAsync( + eq(actorSelection(actorRef)), isA(ShardTransactionMessages.CloseTransaction.class)); + } +} diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionTest.java new file mode 100644 index 0000000000..d6cceff2d0 --- /dev/null +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionTest.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2016 Brocade Communications Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * 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; + +import static org.junit.Assert.assertEquals; +import java.io.Serializable; +import org.apache.commons.lang.SerializationUtils; +import org.junit.Test; +import org.opendaylight.controller.cluster.datastore.DataStoreVersions; + +/** + * Unit test for CloseTransaction and CloseTransactionReply. + * + * @author Thomas Pantelis + */ +public class CloseTransactionTest { + @Test + public void testCloseTransactionSerialization() { + CloseTransaction expected = new CloseTransaction(DataStoreVersions.CURRENT_VERSION); + + Object serialized = expected.toSerializable(); + assertEquals("Serialized type", CloseTransaction.class, serialized.getClass()); + + CloseTransaction actual = (CloseTransaction)SerializationUtils.clone((Serializable) serialized); + assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, actual.getVersion()); + } + + @Test + public void testCloseTransactionReplySerialization() { + CloseTransactionReply expected = new CloseTransactionReply(); + + Object serialized = expected.toSerializable(); + assertEquals("Serialized type", CloseTransactionReply.class, serialized.getClass()); + + CloseTransactionReply actual = (CloseTransactionReply)SerializationUtils.clone((Serializable) serialized); + assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, actual.getVersion()); + } +}