Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Has/Clear members for C# message fields in proto2 #7429

Merged
merged 3 commits into from May 1, 2020
Merged

Remove Has/Clear members for C# message fields in proto2 #7429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39efb4b
Don't generate Has/Clear members for proto2 message fields.
jskeet Apr 27, 2020
fb70c01
Regenerate C# code based on the previous commit
jskeet Apr 27, 2020
b56a8de
Fix to C# support library code
jskeet Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
142 changes: 40 additions & 102 deletions csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs
View file
Open in desktop
Expand Up @@ -290,13 +290,13 @@ public sealed partial class TestAllTypesProto2 : pb::IExtendableMessage<TestAllT
optionalBool_ = other.optionalBool_;
optionalString_ = other.optionalString_;
optionalBytes_ = other.optionalBytes_;
optionalNestedMessage_ = other.HasOptionalNestedMessage ? other.optionalNestedMessage_.Clone() : null;
optionalForeignMessage_ = other.HasOptionalForeignMessage ? other.optionalForeignMessage_.Clone() : null;
optionalNestedMessage_ = other.optionalNestedMessage_ != null ? other.optionalNestedMessage_.Clone() : null;
optionalForeignMessage_ = other.optionalForeignMessage_ != null ? other.optionalForeignMessage_.Clone() : null;
optionalNestedEnum_ = other.optionalNestedEnum_;
optionalForeignEnum_ = other.optionalForeignEnum_;
optionalStringPiece_ = other.optionalStringPiece_;
optionalCord_ = other.optionalCord_;
recursiveMessage_ = other.HasRecursiveMessage ? other.recursiveMessage_.Clone() : null;
recursiveMessage_ = other.recursiveMessage_ != null ? other.recursiveMessage_.Clone() : null;
repeatedInt32_ = other.repeatedInt32_.Clone();
repeatedInt64_ = other.repeatedInt64_.Clone();
repeatedUint32_ = other.repeatedUint32_.Clone();
Expand Down Expand Up @@ -794,16 +794,6 @@ public sealed partial class TestAllTypesProto2 : pb::IExtendableMessage<TestAllT
optionalNestedMessage_ = value;
}
}
/// <summary>Gets whether the optional_nested_message field is set</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool HasOptionalNestedMessage {
get { return optionalNestedMessage_ != null; }
}
/// <summary>Clears the value of the optional_nested_message field</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public void ClearOptionalNestedMessage() {
optionalNestedMessage_ = null;
}

/// <summary>Field number for the "optional_foreign_message" field.</summary>
public const int OptionalForeignMessageFieldNumber = 19;
Expand All @@ -815,16 +805,6 @@ public sealed partial class TestAllTypesProto2 : pb::IExtendableMessage<TestAllT
optionalForeignMessage_ = value;
}
}
/// <summary>Gets whether the optional_foreign_message field is set</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool HasOptionalForeignMessage {
get { return optionalForeignMessage_ != null; }
}
/// <summary>Clears the value of the optional_foreign_message field</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public void ClearOptionalForeignMessage() {
optionalForeignMessage_ = null;
}

/// <summary>Field number for the "optional_nested_enum" field.</summary>
public const int OptionalNestedEnumFieldNumber = 21;
Expand Down Expand Up @@ -930,16 +910,6 @@ public sealed partial class TestAllTypesProto2 : pb::IExtendableMessage<TestAllT
recursiveMessage_ = value;
}
}
/// <summary>Gets whether the recursive_message field is set</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool HasRecursiveMessage {
get { return recursiveMessage_ != null; }
}
/// <summary>Clears the value of the recursive_message field</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public void ClearRecursiveMessage() {
recursiveMessage_ = null;
}

/// <summary>Field number for the "repeated_int32" field.</summary>
public const int RepeatedInt32FieldNumber = 31;
Expand Down Expand Up @@ -1660,24 +1630,12 @@ public sealed partial class TestAllTypesProto2 : pb::IExtendableMessage<TestAllT
public const int OneofNestedMessageFieldNumber = 112;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage OneofNestedMessage {
get { return HasOneofNestedMessage ? (global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage) oneofField_ : null; }
get { return oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage ? (global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage) oneofField_ : null; }
set {
oneofField_ = value;
oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.OneofNestedMessage;
}
}
/// <summary>Gets whether the "oneof_nested_message" field is set</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool HasOneofNestedMessage {
get { return oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage; }
}
/// <summary> Clears the value of the oneof if it's currently set to "oneof_nested_message" </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public void ClearOneofNestedMessage() {
if (HasOneofNestedMessage) {
ClearOneofField();
}
}

/// <summary>Field number for the "oneof_string" field.</summary>
public const int OneofStringFieldNumber = 113;
Expand Down Expand Up @@ -2479,13 +2437,13 @@ public enum OneofFieldOneofCase {
if (HasOptionalBool) hash ^= OptionalBool.GetHashCode();
if (HasOptionalString) hash ^= OptionalString.GetHashCode();
if (HasOptionalBytes) hash ^= OptionalBytes.GetHashCode();
if (HasOptionalNestedMessage) hash ^= OptionalNestedMessage.GetHashCode();
if (HasOptionalForeignMessage) hash ^= OptionalForeignMessage.GetHashCode();
if (optionalNestedMessage_ != null) hash ^= OptionalNestedMessage.GetHashCode();
if (optionalForeignMessage_ != null) hash ^= OptionalForeignMessage.GetHashCode();
if (HasOptionalNestedEnum) hash ^= OptionalNestedEnum.GetHashCode();
if (HasOptionalForeignEnum) hash ^= OptionalForeignEnum.GetHashCode();
if (HasOptionalStringPiece) hash ^= OptionalStringPiece.GetHashCode();
if (HasOptionalCord) hash ^= OptionalCord.GetHashCode();
if (HasRecursiveMessage) hash ^= RecursiveMessage.GetHashCode();
if (recursiveMessage_ != null) hash ^= RecursiveMessage.GetHashCode();
hash ^= repeatedInt32_.GetHashCode();
hash ^= repeatedInt64_.GetHashCode();
hash ^= repeatedUint32_.GetHashCode();
Expand Down Expand Up @@ -2555,7 +2513,7 @@ public enum OneofFieldOneofCase {
hash ^= MapStringNestedEnum.GetHashCode();
hash ^= MapStringForeignEnum.GetHashCode();
if (HasOneofUint32) hash ^= OneofUint32.GetHashCode();
if (HasOneofNestedMessage) hash ^= OneofNestedMessage.GetHashCode();
if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) hash ^= OneofNestedMessage.GetHashCode();
if (HasOneofString) hash ^= OneofString.GetHashCode();
if (HasOneofBytes) hash ^= OneofBytes.GetHashCode();
if (HasOneofBool) hash ^= OneofBool.GetHashCode();
Expand Down Expand Up @@ -2659,11 +2617,11 @@ public enum OneofFieldOneofCase {
output.WriteRawTag(122);
output.WriteBytes(OptionalBytes);
}
if (HasOptionalNestedMessage) {
if (optionalNestedMessage_ != null) {
output.WriteRawTag(146, 1);
output.WriteMessage(OptionalNestedMessage);
}
if (HasOptionalForeignMessage) {
if (optionalForeignMessage_ != null) {
output.WriteRawTag(154, 1);
output.WriteMessage(OptionalForeignMessage);
}
Expand All @@ -2683,7 +2641,7 @@ public enum OneofFieldOneofCase {
output.WriteRawTag(202, 1);
output.WriteString(OptionalCord);
}
if (HasRecursiveMessage) {
if (recursiveMessage_ != null) {
output.WriteRawTag(218, 1);
output.WriteMessage(RecursiveMessage);
}
Expand Down Expand Up @@ -2759,7 +2717,7 @@ public enum OneofFieldOneofCase {
output.WriteRawTag(248, 6);
output.WriteUInt32(OneofUint32);
}
if (HasOneofNestedMessage) {
if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
output.WriteRawTag(130, 7);
output.WriteMessage(OneofNestedMessage);
}
Expand Down Expand Up @@ -2924,10 +2882,10 @@ public enum OneofFieldOneofCase {
if (HasOptionalBytes) {
size += 1 + pb::CodedOutputStream.ComputeBytesSize(OptionalBytes);
}
if (HasOptionalNestedMessage) {
if (optionalNestedMessage_ != null) {
size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalNestedMessage);
}
if (HasOptionalForeignMessage) {
if (optionalForeignMessage_ != null) {
size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalForeignMessage);
}
if (HasOptionalNestedEnum) {
Expand All @@ -2942,7 +2900,7 @@ public enum OneofFieldOneofCase {
if (HasOptionalCord) {
size += 2 + pb::CodedOutputStream.ComputeStringSize(OptionalCord);
}
if (HasRecursiveMessage) {
if (recursiveMessage_ != null) {
size += 2 + pb::CodedOutputStream.ComputeMessageSize(RecursiveMessage);
}
size += repeatedInt32_.CalculateSize(_repeated_repeatedInt32_codec);
Expand Down Expand Up @@ -3016,7 +2974,7 @@ public enum OneofFieldOneofCase {
if (HasOneofUint32) {
size += 2 + pb::CodedOutputStream.ComputeUInt32Size(OneofUint32);
}
if (HasOneofNestedMessage) {
if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
size += 2 + pb::CodedOutputStream.ComputeMessageSize(OneofNestedMessage);
}
if (HasOneofString) {
Expand Down Expand Up @@ -3156,14 +3114,14 @@ public enum OneofFieldOneofCase {
if (other.HasOptionalBytes) {
OptionalBytes = other.OptionalBytes;
}
if (other.HasOptionalNestedMessage) {
if (!HasOptionalNestedMessage) {
if (other.optionalNestedMessage_ != null) {
if (optionalNestedMessage_ == null) {
OptionalNestedMessage = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage();
}
OptionalNestedMessage.MergeFrom(other.OptionalNestedMessage);
}
if (other.HasOptionalForeignMessage) {
if (!HasOptionalForeignMessage) {
if (other.optionalForeignMessage_ != null) {
if (optionalForeignMessage_ == null) {
OptionalForeignMessage = new global::ProtobufTestMessages.Proto2.ForeignMessageProto2();
}
OptionalForeignMessage.MergeFrom(other.OptionalForeignMessage);
Expand All @@ -3180,8 +3138,8 @@ public enum OneofFieldOneofCase {
if (other.HasOptionalCord) {
OptionalCord = other.OptionalCord;
}
if (other.HasRecursiveMessage) {
if (!HasRecursiveMessage) {
if (other.recursiveMessage_ != null) {
if (recursiveMessage_ == null) {
RecursiveMessage = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2();
}
RecursiveMessage.MergeFrom(other.RecursiveMessage);
Expand Down Expand Up @@ -3422,14 +3380,14 @@ public enum OneofFieldOneofCase {
break;
}
case 146: {
if (!HasOptionalNestedMessage) {
if (optionalNestedMessage_ == null) {
OptionalNestedMessage = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage();
}
input.ReadMessage(OptionalNestedMessage);
break;
}
case 154: {
if (!HasOptionalForeignMessage) {
if (optionalForeignMessage_ == null) {
OptionalForeignMessage = new global::ProtobufTestMessages.Proto2.ForeignMessageProto2();
}
input.ReadMessage(OptionalForeignMessage);
Expand All @@ -3452,7 +3410,7 @@ public enum OneofFieldOneofCase {
break;
}
case 218: {
if (!HasRecursiveMessage) {
if (recursiveMessage_ == null) {
RecursiveMessage = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2();
}
input.ReadMessage(RecursiveMessage);
Expand Down Expand Up @@ -3779,7 +3737,7 @@ public enum OneofFieldOneofCase {
}
case 898: {
global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage subBuilder = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage();
if (HasOneofNestedMessage) {
if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
subBuilder.MergeFrom(OneofNestedMessage);
}
input.ReadMessage(subBuilder);
Expand Down Expand Up @@ -3962,7 +3920,7 @@ public sealed partial class NestedMessage : pb::IMessage<NestedMessage> {
public NestedMessage(NestedMessage other) : this() {
_hasBits0 = other._hasBits0;
a_ = other.a_;
corecursive_ = other.HasCorecursive ? other.corecursive_.Clone() : null;
corecursive_ = other.corecursive_ != null ? other.corecursive_.Clone() : null;
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
}

Expand Down Expand Up @@ -4005,16 +3963,6 @@ public sealed partial class NestedMessage : pb::IMessage<NestedMessage> {
corecursive_ = value;
}
}
/// <summary>Gets whether the corecursive field is set</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool HasCorecursive {
get { return corecursive_ != null; }
}
/// <summary>Clears the value of the corecursive field</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public void ClearCorecursive() {
corecursive_ = null;
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
Expand All @@ -4038,7 +3986,7 @@ public sealed partial class NestedMessage : pb::IMessage<NestedMessage> {
public override int GetHashCode() {
int hash = 1;
if (HasA) hash ^= A.GetHashCode();
if (HasCorecursive) hash ^= Corecursive.GetHashCode();
if (corecursive_ != null) hash ^= Corecursive.GetHashCode();
if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode();
}
Expand All @@ -4056,7 +4004,7 @@ public sealed partial class NestedMessage : pb::IMessage<NestedMessage> {
output.WriteRawTag(8);
output.WriteInt32(A);
}
if (HasCorecursive) {
if (corecursive_ != null) {
output.WriteRawTag(18);
output.WriteMessage(Corecursive);
}
Expand All @@ -4071,7 +4019,7 @@ public sealed partial class NestedMessage : pb::IMessage<NestedMessage> {
if (HasA) {
size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
}
if (HasCorecursive) {
if (corecursive_ != null) {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(Corecursive);
}
if (_unknownFields != null) {
Expand All @@ -4088,8 +4036,8 @@ public sealed partial class NestedMessage : pb::IMessage<NestedMessage> {
if (other.HasA) {
A = other.A;
}
if (other.HasCorecursive) {
if (!HasCorecursive) {
if (other.corecursive_ != null) {
if (corecursive_ == null) {
Corecursive = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2();
}
Corecursive.MergeFrom(other.Corecursive);
Expand All @@ -4110,7 +4058,7 @@ public sealed partial class NestedMessage : pb::IMessage<NestedMessage> {
break;
}
case 18: {
if (!HasCorecursive) {
if (corecursive_ == null) {
Corecursive = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2();
}
input.ReadMessage(Corecursive);
Expand Down Expand Up @@ -4937,7 +4885,7 @@ public sealed partial class UnknownToTestAllTypes : pb::IMessage<UnknownToTestAl
_hasBits0 = other._hasBits0;
optionalInt32_ = other.optionalInt32_;
optionalString_ = other.optionalString_;
nestedMessage_ = other.HasNestedMessage ? other.nestedMessage_.Clone() : null;
nestedMessage_ = other.nestedMessage_ != null ? other.nestedMessage_.Clone() : null;
optionalGroup_ = other.HasOptionalGroup ? other.optionalGroup_.Clone() : null;
optionalBool_ = other.optionalBool_;
repeatedInt32_ = other.repeatedInt32_.Clone();
Expand Down Expand Up @@ -5006,16 +4954,6 @@ public sealed partial class UnknownToTestAllTypes : pb::IMessage<UnknownToTestAl
nestedMessage_ = value;
}
}
/// <summary>Gets whether the nested_message field is set</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool HasNestedMessage {
get { return nestedMessage_ != null; }
}
/// <summary>Clears the value of the nested_message field</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public void ClearNestedMessage() {
nestedMessage_ = null;
}

/// <summary>Field number for the "optionalgroup" field.</summary>
public const int OptionalGroupFieldNumber = 1004;
Expand Down Expand Up @@ -5099,7 +5037,7 @@ public sealed partial class UnknownToTestAllTypes : pb::IMessage<UnknownToTestAl
int hash = 1;
if (HasOptionalInt32) hash ^= OptionalInt32.GetHashCode();
if (HasOptionalString) hash ^= OptionalString.GetHashCode();
if (HasNestedMessage) hash ^= NestedMessage.GetHashCode();
if (nestedMessage_ != null) hash ^= NestedMessage.GetHashCode();
if (HasOptionalGroup) hash ^= OptionalGroup.GetHashCode();
if (HasOptionalBool) hash ^= OptionalBool.GetHashCode();
hash ^= repeatedInt32_.GetHashCode();
Expand All @@ -5124,7 +5062,7 @@ public sealed partial class UnknownToTestAllTypes : pb::IMessage<UnknownToTestAl
output.WriteRawTag(210, 62);
output.WriteString(OptionalString);
}
if (HasNestedMessage) {
if (nestedMessage_ != null) {
output.WriteRawTag(218, 62);
output.WriteMessage(NestedMessage);
}
Expand Down Expand Up @@ -5152,7 +5090,7 @@ public sealed partial class UnknownToTestAllTypes : pb::IMessage<UnknownToTestAl
if (HasOptionalString) {
size += 2 + pb::CodedOutputStream.ComputeStringSize(OptionalString);
}
if (HasNestedMessage) {
if (nestedMessage_ != null) {
size += 2 + pb::CodedOutputStream.ComputeMessageSize(NestedMessage);
}
if (HasOptionalGroup) {
Expand All @@ -5179,8 +5117,8 @@ public sealed partial class UnknownToTestAllTypes : pb::IMessage<UnknownToTestAl
if (other.HasOptionalString) {
OptionalString = other.OptionalString;
}
if (other.HasNestedMessage) {
if (!HasNestedMessage) {
if (other.nestedMessage_ != null) {
if (nestedMessage_ == null) {
NestedMessage = new global::ProtobufTestMessages.Proto2.ForeignMessageProto2();
}
NestedMessage.MergeFrom(other.NestedMessage);
Expand Down Expand Up @@ -5215,7 +5153,7 @@ public sealed partial class UnknownToTestAllTypes : pb::IMessage<UnknownToTestAl
break;
}
case 8026: {
if (!HasNestedMessage) {
if (nestedMessage_ == null) {
NestedMessage = new global::ProtobufTestMessages.Proto2.ForeignMessageProto2();
}
input.ReadMessage(NestedMessage);
Expand Down