Forráskód Böngészése

update addressbook.proto to proto3

Jan Tattermusch 10 éve
szülő
commit
69c14071ad
1 módosított fájl, 8 hozzáadás és 8 törlés
  1. 8 8
      examples/addressbook.proto

+ 8 - 8
examples/addressbook.proto

@@ -1,6 +1,6 @@
 // See README.txt for information and build instructions.
 // See README.txt for information and build instructions.
 
 
-syntax = "proto2";
+syntax = "proto3";
 
 
 package tutorial;
 package tutorial;
 
 
@@ -9,9 +9,9 @@ option java_outer_classname = "AddressBookProtos";
 option csharp_namespace = "Google.ProtocolBuffers.Examples.AddressBook";
 option csharp_namespace = "Google.ProtocolBuffers.Examples.AddressBook";
 
 
 message Person {
 message Person {
-  required string name = 1;
-  required int32 id = 2;        // Unique ID number for this person.
-  optional string email = 3;
+  string name = 1;
+  int32 id = 2;        // Unique ID number for this person.
+  string email = 3;
 
 
   enum PhoneType {
   enum PhoneType {
     MOBILE = 0;
     MOBILE = 0;
@@ -20,14 +20,14 @@ message Person {
   }
   }
 
 
   message PhoneNumber {
   message PhoneNumber {
-    required string number = 1;
-    optional PhoneType type = 2 [default = HOME];
+    string number = 1;
+    PhoneType type = 2;
   }
   }
 
 
-  repeated PhoneNumber phone = 4;
+  repeated PhoneNumber phones = 4;
 }
 }
 
 
 // Our address book file is just one of these.
 // Our address book file is just one of these.
 message AddressBook {
 message AddressBook {
-  repeated Person person = 1;
+  repeated Person persons = 1;
 }
 }