Skip to content

Commit

Permalink
Generated changes (initialized extension)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ObsidianMinor
ObsidianMinor committed Sep 8, 2018
1 parent dc7fee4 commit 659c6db
Show file tree
Hide file tree
Showing 21 changed files with 145 additions and 1,255 deletions.
24 changes: 3 additions & 21 deletions csharp/src/AddressBook/Addressbook.cs
View file
Expand Up @@ -49,7 +49,7 @@ public static partial class AddressbookReflection {
/// <summary>
/// [START messages]
/// </summary>
public sealed partial class Person : pb::IMessage<Person>, pb::IMessage2 {
public sealed partial class Person : pb::IMessage<Person> {
private static readonly pb::MessageParser<Person> _parser = new pb::MessageParser<Person>(() => new Person());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -289,13 +289,6 @@ public sealed partial class Person : pb::IMessage<Person>, pb::IMessage2 {
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
if (!phones_.IsInitialized()) {
return false;
}
return true;
}
#region Nested types
/// <summary>Container for nested types declared in the Person message type.</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand All @@ -306,7 +299,7 @@ public enum PhoneType {
[pbr::OriginalName("WORK")] Work = 2,
}

public sealed partial class PhoneNumber : pb::IMessage<PhoneNumber>, pb::IMessage2 {
public sealed partial class PhoneNumber : pb::IMessage<PhoneNumber> {
private static readonly pb::MessageParser<PhoneNumber> _parser = new pb::MessageParser<PhoneNumber>(() => new PhoneNumber());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -461,10 +454,6 @@ public sealed partial class PhoneNumber : pb::IMessage<PhoneNumber>, pb::IMessag
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
return true;
}
}

}
Expand All @@ -475,7 +464,7 @@ public sealed partial class PhoneNumber : pb::IMessage<PhoneNumber>, pb::IMessag
/// <summary>
/// Our address book file is just one of these.
/// </summary>
public sealed partial class AddressBook : pb::IMessage<AddressBook>, pb::IMessage2 {
public sealed partial class AddressBook : pb::IMessage<AddressBook> {
private static readonly pb::MessageParser<AddressBook> _parser = new pb::MessageParser<AddressBook>(() => new AddressBook());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -594,13 +583,6 @@ public sealed partial class AddressBook : pb::IMessage<AddressBook>, pb::IMessag
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
if (!people_.IsInitialized()) {
return false;
}
return true;
}
}

#endregion
Expand Down
12 changes: 2 additions & 10 deletions csharp/src/Google.Protobuf.Conformance/Conformance.cs
View file
Expand Up @@ -86,7 +86,7 @@ public enum TestCategory {
/// 2. parse the protobuf or JSON payload in "payload" (which may fail)
/// 3. if the parse succeeded, serialize the message in the requested format.
/// </summary>
public sealed partial class ConformanceRequest : pb::IMessage<ConformanceRequest>, pb::IMessage2 {
public sealed partial class ConformanceRequest : pb::IMessage<ConformanceRequest> {
private static readonly pb::MessageParser<ConformanceRequest> _parser = new pb::MessageParser<ConformanceRequest>(() => new ConformanceRequest());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -369,16 +369,12 @@ public enum PayloadOneofCase {
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
return true;
}
}

/// <summary>
/// Represents a single test case's output.
/// </summary>
public sealed partial class ConformanceResponse : pb::IMessage<ConformanceResponse>, pb::IMessage2 {
public sealed partial class ConformanceResponse : pb::IMessage<ConformanceResponse> {
private static readonly pb::MessageParser<ConformanceResponse> _parser = new pb::MessageParser<ConformanceResponse>(() => new ConformanceResponse());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -717,10 +713,6 @@ public enum ResultOneofCase {
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
return true;
}
}

#endregion
Expand Down
153 changes: 7 additions & 146 deletions csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs
View file
Expand Up @@ -176,7 +176,7 @@ public enum MapEnum {
/// <summary>
/// Tests maps.
/// </summary>
public sealed partial class TestMap : pb::IMessage<TestMap>, pb::IMessage2 {
public sealed partial class TestMap : pb::IMessage<TestMap> {
private static readonly pb::MessageParser<TestMap> _parser = new pb::MessageParser<TestMap>(() => new TestMap());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -615,64 +615,9 @@ public sealed partial class TestMap : pb::IMessage<TestMap>, pb::IMessage2 {
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
if (!mapInt32Int32_.IsInitialized()) {
return false;
}
if (!mapInt64Int64_.IsInitialized()) {
return false;
}
if (!mapUint32Uint32_.IsInitialized()) {
return false;
}
if (!mapUint64Uint64_.IsInitialized()) {
return false;
}
if (!mapSint32Sint32_.IsInitialized()) {
return false;
}
if (!mapSint64Sint64_.IsInitialized()) {
return false;
}
if (!mapFixed32Fixed32_.IsInitialized()) {
return false;
}
if (!mapFixed64Fixed64_.IsInitialized()) {
return false;
}
if (!mapSfixed32Sfixed32_.IsInitialized()) {
return false;
}
if (!mapSfixed64Sfixed64_.IsInitialized()) {
return false;
}
if (!mapInt32Float_.IsInitialized()) {
return false;
}
if (!mapInt32Double_.IsInitialized()) {
return false;
}
if (!mapBoolBool_.IsInitialized()) {
return false;
}
if (!mapStringString_.IsInitialized()) {
return false;
}
if (!mapInt32Bytes_.IsInitialized()) {
return false;
}
if (!mapInt32Enum_.IsInitialized()) {
return false;
}
if (!mapInt32ForeignMessage_.IsInitialized()) {
return false;
}
return true;
}
}

public sealed partial class TestMapSubmessage : pb::IMessage<TestMapSubmessage>, pb::IMessage2 {
public sealed partial class TestMapSubmessage : pb::IMessage<TestMapSubmessage> {
private static readonly pb::MessageParser<TestMapSubmessage> _parser = new pb::MessageParser<TestMapSubmessage>(() => new TestMapSubmessage());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -805,13 +750,9 @@ public sealed partial class TestMapSubmessage : pb::IMessage<TestMapSubmessage>,
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
return true;
}
}

public sealed partial class TestMessageMap : pb::IMessage<TestMessageMap>, pb::IMessage2 {
public sealed partial class TestMessageMap : pb::IMessage<TestMessageMap> {
private static readonly pb::MessageParser<TestMessageMap> _parser = new pb::MessageParser<TestMessageMap>(() => new TestMessageMap());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -930,19 +871,12 @@ public sealed partial class TestMessageMap : pb::IMessage<TestMessageMap>, pb::I
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
if (!mapInt32Message_.IsInitialized()) {
return false;
}
return true;
}
}

/// <summary>
/// Two map fields share the same entry default instance.
/// </summary>
public sealed partial class TestSameTypeMap : pb::IMessage<TestSameTypeMap>, pb::IMessage2 {
public sealed partial class TestSameTypeMap : pb::IMessage<TestSameTypeMap> {
private static readonly pb::MessageParser<TestSameTypeMap> _parser = new pb::MessageParser<TestSameTypeMap>(() => new TestSameTypeMap());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -1081,19 +1015,9 @@ public sealed partial class TestSameTypeMap : pb::IMessage<TestSameTypeMap>, pb:
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
if (!map1_.IsInitialized()) {
return false;
}
if (!map2_.IsInitialized()) {
return false;
}
return true;
}
}

public sealed partial class TestArenaMap : pb::IMessage<TestArenaMap>, pb::IMessage2 {
public sealed partial class TestArenaMap : pb::IMessage<TestArenaMap> {
private static readonly pb::MessageParser<TestArenaMap> _parser = new pb::MessageParser<TestArenaMap>(() => new TestArenaMap());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -1492,62 +1416,13 @@ public sealed partial class TestArenaMap : pb::IMessage<TestArenaMap>, pb::IMess
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
if (!mapInt32Int32_.IsInitialized()) {
return false;
}
if (!mapInt64Int64_.IsInitialized()) {
return false;
}
if (!mapUint32Uint32_.IsInitialized()) {
return false;
}
if (!mapUint64Uint64_.IsInitialized()) {
return false;
}
if (!mapSint32Sint32_.IsInitialized()) {
return false;
}
if (!mapSint64Sint64_.IsInitialized()) {
return false;
}
if (!mapFixed32Fixed32_.IsInitialized()) {
return false;
}
if (!mapFixed64Fixed64_.IsInitialized()) {
return false;
}
if (!mapSfixed32Sfixed32_.IsInitialized()) {
return false;
}
if (!mapSfixed64Sfixed64_.IsInitialized()) {
return false;
}
if (!mapInt32Float_.IsInitialized()) {
return false;
}
if (!mapInt32Double_.IsInitialized()) {
return false;
}
if (!mapBoolBool_.IsInitialized()) {
return false;
}
if (!mapInt32Enum_.IsInitialized()) {
return false;
}
if (!mapInt32ForeignMessage_.IsInitialized()) {
return false;
}
return true;
}
}

/// <summary>
/// Previously, message containing enum called Type cannot be used as value of
/// map field.
/// </summary>
public sealed partial class MessageContainingEnumCalledType : pb::IMessage<MessageContainingEnumCalledType>, pb::IMessage2 {
public sealed partial class MessageContainingEnumCalledType : pb::IMessage<MessageContainingEnumCalledType> {
private static readonly pb::MessageParser<MessageContainingEnumCalledType> _parser = new pb::MessageParser<MessageContainingEnumCalledType>(() => new MessageContainingEnumCalledType());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -1666,13 +1541,6 @@ public sealed partial class MessageContainingEnumCalledType : pb::IMessage<Messa
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
if (!type_.IsInitialized()) {
return false;
}
return true;
}
#region Nested types
/// <summary>Container for nested types declared in the MessageContainingEnumCalledType message type.</summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand All @@ -1689,7 +1557,7 @@ public enum Type {
/// <summary>
/// Previously, message cannot contain map field called "entry".
/// </summary>
public sealed partial class MessageContainingMapCalledEntry : pb::IMessage<MessageContainingMapCalledEntry>, pb::IMessage2 {
public sealed partial class MessageContainingMapCalledEntry : pb::IMessage<MessageContainingMapCalledEntry> {
private static readonly pb::MessageParser<MessageContainingMapCalledEntry> _parser = new pb::MessageParser<MessageContainingMapCalledEntry>(() => new MessageContainingMapCalledEntry());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
Expand Down Expand Up @@ -1808,13 +1676,6 @@ public sealed partial class MessageContainingMapCalledEntry : pb::IMessage<Messa
}
}

[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public bool IsInitialized() {
if (!entry_.IsInitialized()) {
return false;
}
return true;
}
}

#endregion
Expand Down

0 comments on commit 659c6db

Please sign in to comment.