Commit 352690ef authored by Jan Tattermusch's avatar Jan Tattermusch

regenerate Addressbook.cs

parent 792ae21b
...@@ -26,27 +26,27 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -26,27 +26,27 @@ namespace Google.Protobuf.Examples.AddressBook {
static Addressbook() { static Addressbook() {
byte[] descriptorData = global::System.Convert.FromBase64String( byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat( string.Concat(
"ChFhZGRyZXNzYm9vay5wcm90bxIIdHV0b3JpYWwi1AEKBlBlcnNvbhIMCgRu", "ChFhZGRyZXNzYm9vay5wcm90bxIIdHV0b3JpYWwi1QEKBlBlcnNvbhIMCgRu",
"YW1lGAEgASgJEgoKAmlkGAIgASgFEg0KBWVtYWlsGAMgASgJEisKBXBob25l", "YW1lGAEgASgJEgoKAmlkGAIgASgFEg0KBWVtYWlsGAMgASgJEiwKBnBob25l",
"GAQgAygLMhwudHV0b3JpYWwuUGVyc29uLlBob25lTnVtYmVyGkcKC1Bob25l", "cxgEIAMoCzIcLnR1dG9yaWFsLlBlcnNvbi5QaG9uZU51bWJlchpHCgtQaG9u",
"TnVtYmVyEg4KBm51bWJlchgBIAEoCRIoCgR0eXBlGAIgASgOMhoudHV0b3Jp", "ZU51bWJlchIOCgZudW1iZXIYASABKAkSKAoEdHlwZRgCIAEoDjIaLnR1dG9y",
"YWwuUGVyc29uLlBob25lVHlwZSIrCglQaG9uZVR5cGUSCgoGTU9CSUxFEAAS", "aWFsLlBlcnNvbi5QaG9uZVR5cGUiKwoJUGhvbmVUeXBlEgoKBk1PQklMRRAA",
"CAoESE9NRRABEggKBFdPUksQAiIvCgtBZGRyZXNzQm9vaxIgCgZwZXJzb24Y", "EggKBEhPTUUQARIICgRXT1JLEAIiLwoLQWRkcmVzc0Jvb2sSIAoGcGVvcGxl",
"ASADKAsyEC50dXRvcmlhbC5QZXJzb25CUAoUY29tLmV4YW1wbGUudHV0b3Jp", "GAEgAygLMhAudHV0b3JpYWwuUGVyc29uQlAKFGNvbS5leGFtcGxlLnR1dG9y",
"YWxCEUFkZHJlc3NCb29rUHJvdG9zqgIkR29vZ2xlLlByb3RvYnVmLkV4YW1w", "aWFsQhFBZGRyZXNzQm9va1Byb3Rvc6oCJEdvb2dsZS5Qcm90b2J1Zi5FeGFt",
"bGVzLkFkZHJlc3NCb29rYgZwcm90bzM=")); "cGxlcy5BZGRyZXNzQm9va2IGcHJvdG8z"));
descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
new pbr::FileDescriptor[] { new pbr::FileDescriptor[] {
}); });
internal__static_tutorial_Person__FieldAccessorTable = internal__static_tutorial_Person__FieldAccessorTable =
new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Examples.AddressBook.Person), descriptor.MessageTypes[0], new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Examples.AddressBook.Person), descriptor.MessageTypes[0],
new string[] { "Name", "Id", "Email", "Phone", }, new string[] { }); new string[] { "Name", "Id", "Email", "Phones", }, new string[] { });
internal__static_tutorial_Person_PhoneNumber__FieldAccessorTable = internal__static_tutorial_Person_PhoneNumber__FieldAccessorTable =
new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber), descriptor.MessageTypes[0].NestedTypes[0], new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber), descriptor.MessageTypes[0].NestedTypes[0],
new string[] { "Number", "Type", }, new string[] { }); new string[] { "Number", "Type", }, new string[] { });
internal__static_tutorial_AddressBook__FieldAccessorTable = internal__static_tutorial_AddressBook__FieldAccessorTable =
new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Examples.AddressBook.AddressBook), descriptor.MessageTypes[1], new pbr::FieldAccessorTable(typeof(global::Google.Protobuf.Examples.AddressBook.AddressBook), descriptor.MessageTypes[1],
new string[] { "Person", }, new string[] { }); new string[] { "People", }, new string[] { });
} }
#endregion #endregion
...@@ -57,7 +57,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -57,7 +57,7 @@ namespace Google.Protobuf.Examples.AddressBook {
private static readonly pb::MessageParser<Person> _parser = new pb::MessageParser<Person>(() => new Person()); private static readonly pb::MessageParser<Person> _parser = new pb::MessageParser<Person>(() => new Person());
public static pb::MessageParser<Person> Parser { get { return _parser; } } public static pb::MessageParser<Person> Parser { get { return _parser; } }
private static readonly string[] _fieldNames = new string[] { "email", "id", "name", "phone" }; private static readonly string[] _fieldNames = new string[] { "email", "id", "name", "phones" };
private static readonly uint[] _fieldTags = new uint[] { 26, 16, 10, 34 }; private static readonly uint[] _fieldTags = new uint[] { 26, 16, 10, 34 };
public static pbr::MessageDescriptor Descriptor { public static pbr::MessageDescriptor Descriptor {
get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.Descriptor.MessageTypes[0]; } get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.Descriptor.MessageTypes[0]; }
...@@ -80,7 +80,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -80,7 +80,7 @@ namespace Google.Protobuf.Examples.AddressBook {
name_ = other.name_; name_ = other.name_;
id_ = other.id_; id_ = other.id_;
email_ = other.email_; email_ = other.email_;
phone_ = other.phone_.Clone(); phones_ = other.phones_.Clone();
} }
public Person Clone() { public Person Clone() {
...@@ -92,7 +92,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -92,7 +92,7 @@ namespace Google.Protobuf.Examples.AddressBook {
return; return;
} }
_frozen = true; _frozen = true;
phone_.Freeze(); phones_.Freeze();
} }
public const int NameFieldNumber = 1; public const int NameFieldNumber = 1;
...@@ -125,12 +125,12 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -125,12 +125,12 @@ namespace Google.Protobuf.Examples.AddressBook {
} }
} }
public const int PhoneFieldNumber = 4; public const int PhonesFieldNumber = 4;
private static readonly pb::FieldCodec<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> _repeated_phone_codec private static readonly pb::FieldCodec<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> _repeated_phones_codec
= pb::FieldCodec.ForMessage(34, global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber.Parser); = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber.Parser);
private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> phone_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber>(); private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> phones_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber>();
public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> Phone { public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> Phones {
get { return phone_; } get { return phones_; }
} }
public override bool Equals(object other) { public override bool Equals(object other) {
...@@ -147,7 +147,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -147,7 +147,7 @@ namespace Google.Protobuf.Examples.AddressBook {
if (Name != other.Name) return false; if (Name != other.Name) return false;
if (Id != other.Id) return false; if (Id != other.Id) return false;
if (Email != other.Email) return false; if (Email != other.Email) return false;
if(!phone_.Equals(other.phone_)) return false; if(!phones_.Equals(other.phones_)) return false;
return true; return true;
} }
...@@ -156,7 +156,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -156,7 +156,7 @@ namespace Google.Protobuf.Examples.AddressBook {
if (Name.Length != 0) hash ^= Name.GetHashCode(); if (Name.Length != 0) hash ^= Name.GetHashCode();
if (Id != 0) hash ^= Id.GetHashCode(); if (Id != 0) hash ^= Id.GetHashCode();
if (Email.Length != 0) hash ^= Email.GetHashCode(); if (Email.Length != 0) hash ^= Email.GetHashCode();
hash ^= phone_.GetHashCode(); hash ^= phones_.GetHashCode();
return hash; return hash;
} }
...@@ -177,7 +177,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -177,7 +177,7 @@ namespace Google.Protobuf.Examples.AddressBook {
output.WriteRawTag(26); output.WriteRawTag(26);
output.WriteString(Email); output.WriteString(Email);
} }
phone_.WriteTo(output, _repeated_phone_codec); phones_.WriteTo(output, _repeated_phones_codec);
} }
public int CalculateSize() { public int CalculateSize() {
...@@ -191,7 +191,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -191,7 +191,7 @@ namespace Google.Protobuf.Examples.AddressBook {
if (Email.Length != 0) { if (Email.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(Email); size += 1 + pb::CodedOutputStream.ComputeStringSize(Email);
} }
size += phone_.CalculateSize(_repeated_phone_codec); size += phones_.CalculateSize(_repeated_phones_codec);
return size; return size;
} }
...@@ -208,7 +208,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -208,7 +208,7 @@ namespace Google.Protobuf.Examples.AddressBook {
if (other.Email.Length != 0) { if (other.Email.Length != 0) {
Email = other.Email; Email = other.Email;
} }
phone_.Add(other.phone_); phones_.Add(other.phones_);
} }
public void MergeFrom(pb::CodedInputStream input) { public void MergeFrom(pb::CodedInputStream input) {
...@@ -235,7 +235,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -235,7 +235,7 @@ namespace Google.Protobuf.Examples.AddressBook {
break; break;
} }
case 34: { case 34: {
phone_.AddEntriesFrom(input, _repeated_phone_codec); phones_.AddEntriesFrom(input, _repeated_phones_codec);
break; break;
} }
} }
...@@ -407,7 +407,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -407,7 +407,7 @@ namespace Google.Protobuf.Examples.AddressBook {
private static readonly pb::MessageParser<AddressBook> _parser = new pb::MessageParser<AddressBook>(() => new AddressBook()); private static readonly pb::MessageParser<AddressBook> _parser = new pb::MessageParser<AddressBook>(() => new AddressBook());
public static pb::MessageParser<AddressBook> Parser { get { return _parser; } } public static pb::MessageParser<AddressBook> Parser { get { return _parser; } }
private static readonly string[] _fieldNames = new string[] { "person" }; private static readonly string[] _fieldNames = new string[] { "people" };
private static readonly uint[] _fieldTags = new uint[] { 10 }; private static readonly uint[] _fieldTags = new uint[] { 10 };
public static pbr::MessageDescriptor Descriptor { public static pbr::MessageDescriptor Descriptor {
get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.Descriptor.MessageTypes[1]; } get { return global::Google.Protobuf.Examples.AddressBook.Addressbook.Descriptor.MessageTypes[1]; }
...@@ -427,7 +427,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -427,7 +427,7 @@ namespace Google.Protobuf.Examples.AddressBook {
partial void OnConstruction(); partial void OnConstruction();
public AddressBook(AddressBook other) : this() { public AddressBook(AddressBook other) : this() {
person_ = other.person_.Clone(); people_ = other.people_.Clone();
} }
public AddressBook Clone() { public AddressBook Clone() {
...@@ -439,15 +439,15 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -439,15 +439,15 @@ namespace Google.Protobuf.Examples.AddressBook {
return; return;
} }
_frozen = true; _frozen = true;
person_.Freeze(); people_.Freeze();
} }
public const int PersonFieldNumber = 1; public const int PeopleFieldNumber = 1;
private static readonly pb::FieldCodec<global::Google.Protobuf.Examples.AddressBook.Person> _repeated_person_codec private static readonly pb::FieldCodec<global::Google.Protobuf.Examples.AddressBook.Person> _repeated_people_codec
= pb::FieldCodec.ForMessage(10, global::Google.Protobuf.Examples.AddressBook.Person.Parser); = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.Examples.AddressBook.Person.Parser);
private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> person_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person>(); private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> people_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person>();
public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> Person { public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> People {
get { return person_; } get { return people_; }
} }
public override bool Equals(object other) { public override bool Equals(object other) {
...@@ -461,13 +461,13 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -461,13 +461,13 @@ namespace Google.Protobuf.Examples.AddressBook {
if (ReferenceEquals(other, this)) { if (ReferenceEquals(other, this)) {
return true; return true;
} }
if(!person_.Equals(other.person_)) return false; if(!people_.Equals(other.people_)) return false;
return true; return true;
} }
public override int GetHashCode() { public override int GetHashCode() {
int hash = 1; int hash = 1;
hash ^= person_.GetHashCode(); hash ^= people_.GetHashCode();
return hash; return hash;
} }
...@@ -476,12 +476,12 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -476,12 +476,12 @@ namespace Google.Protobuf.Examples.AddressBook {
} }
public void WriteTo(pb::CodedOutputStream output) { public void WriteTo(pb::CodedOutputStream output) {
person_.WriteTo(output, _repeated_person_codec); people_.WriteTo(output, _repeated_people_codec);
} }
public int CalculateSize() { public int CalculateSize() {
int size = 0; int size = 0;
size += person_.CalculateSize(_repeated_person_codec); size += people_.CalculateSize(_repeated_people_codec);
return size; return size;
} }
...@@ -489,7 +489,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -489,7 +489,7 @@ namespace Google.Protobuf.Examples.AddressBook {
if (other == null) { if (other == null) {
return; return;
} }
person_.Add(other.person_); people_.Add(other.people_);
} }
public void MergeFrom(pb::CodedInputStream input) { public void MergeFrom(pb::CodedInputStream input) {
...@@ -504,7 +504,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -504,7 +504,7 @@ namespace Google.Protobuf.Examples.AddressBook {
} }
break; break;
case 10: { case 10: {
person_.AddEntriesFrom(input, _repeated_person_codec); people_.AddEntriesFrom(input, _repeated_people_codec);
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment