example: upgrade protobuf from 2.x to 3.x

Upgrade protobuf in example.

Signed-off-by: Tim Zhang <tim@hyper.sh>

Author: Tim-Zhang

example/Cargo.toml

@@ -11,7 +11,7 @@ homepage = "https://github.com/alipay/ttrpc-rust"
 description = "An example of ttrpc."
 
 [dev-dependencies]
-protobuf = "2.8.0"
+protobuf = "3.1.0"
 bytes = "0.4.11"
 libc = "0.2.79"
 byteorder = "1.3.2"

example/async-server.rs

@@ -66,17 +66,17 @@ impl agent_ttrpc::AgentService for AgentService {
         _ctx: &::ttrpc::r#async::TtrpcContext,
         _req: agent::ListInterfacesRequest,
     ) -> ::ttrpc::Result<agent::Interfaces> {
-        let mut rp = protobuf::RepeatedField::new();
+        let mut rp = Vec::new();
 
         let mut i = types::Interface::new();
-        i.set_name("first".to_string());
+        i.name = "first".to_string();
         rp.push(i);
         let mut i = types::Interface::new();
-        i.set_name("second".to_string());
+        i.name = "second".to_string();
         rp.push(i);
 
         let mut i = agent::Interfaces::new();
-        i.set_Interfaces(rp);
+        i.Interfaces = rp;
 
         Ok(i)
     }

example/build.rs

@@ -3,20 +3,24 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-use std::fs::File;
-use std::io::{Read, Write};
-use ttrpc_codegen::Codegen;
-use ttrpc_codegen::Customize;
+use std::{
+    fs::File,
+    io::{Read, Write},
+};
+use ttrpc_codegen::{Codegen, Customize, ProtobufCustomize};
 
 fn main() {
     let mut protos = vec![
+        "protocols/protos/github.com/gogo/protobuf/gogoproto/gogo.proto",
         "protocols/protos/github.com/kata-containers/agent/pkg/types/types.proto",
         "protocols/protos/agent.proto",
         "protocols/protos/health.proto",
         "protocols/protos/google/protobuf/empty.proto",
         "protocols/protos/oci.proto",
     ];
 
+    let protobuf_customized = ProtobufCustomize::default().gen_mod_rs(false);
+
     Codegen::new()
         .out_dir("protocols/sync")
         .inputs(&protos)
@@ -25,6 +29,7 @@ fn main() {
         .customize(Customize {
             ..Default::default()
         })
+        .rust_protobuf_customize(protobuf_customized.clone())
         .run()
         .expect("Gen sync code failed.");
 
@@ -40,6 +45,7 @@ fn main() {
             async_all: true,
             ..Default::default()
         })
+        .rust_protobuf_customize(protobuf_customized.clone())
         .run()
         .expect("Gen async code failed.");
 

example/protocols/asynchronous/mod.rs

@@ -6,9 +6,10 @@
 pub mod agent;
 pub mod agent_ttrpc;
 pub mod empty;
+mod gogo;
 pub mod health;
 pub mod health_ttrpc;
 mod oci;
-pub mod types;
 pub mod streaming;
 pub mod streaming_ttrpc;
+pub mod types;

example/protocols/protos/health.proto

@@ -17,6 +17,7 @@ option (gogoproto.benchgen_all) = true;
 
 message CheckRequest {
 	string service = 1;
+	optional string option_val = 2;
 }
 
 message HealthCheckResponse {

example/protocols/sync/mod.rs

@@ -6,6 +6,7 @@
 pub mod agent;
 pub mod agent_ttrpc;
 pub mod empty;
+mod gogo;
 pub mod health;
 pub mod health_ttrpc;
 mod oci;

example/server.rs

@@ -63,19 +63,19 @@ impl agent_ttrpc::AgentService for AgentService {
         _ctx: &::ttrpc::TtrpcContext,
         _req: agent::ListInterfacesRequest,
     ) -> ::ttrpc::Result<agent::Interfaces> {
-        let mut rp = protobuf::RepeatedField::new();
-
-        let mut i = types::Interface::new();
-        i.set_name("first".to_string());
-        rp.push(i);
-        let mut i = types::Interface::new();
-        i.set_name("second".to_string());
-        rp.push(i);
-
-        let mut i = agent::Interfaces::new();
-        i.set_Interfaces(rp);
-
-        Ok(i)
+        Ok(agent::Interfaces {
+            Interfaces: vec![
+                types::Interface {
+                    name: "first".to_string(),
+                    ..Default::default()
+                },
+                types::Interface {
+                    name: "second".to_string(),
+                    ..Default::default()
+                },
+            ],
+            ..Default::default()
+        })
     }
 }