fix(codec): Remove custom content-type (#104)

This removes custom content-types in favor of just using `application/grpc`. There is some confusion around the specification but most grpc implementations ignore the `+` and anything after.
hyperium · Oct 29, 2019 · a17049f · a17049f
1 parent 4bb087b
commit a17049f
Show file tree

Hide file tree

Showing 16 changed files with 2,931 additions and 27 deletions.
diff --git a/tonic-build/src/client.rs b/tonic-build/src/client.rs
@@ -104,7 +104,7 @@ fn generate_unary(method: &Method, proto: &str, path: String) -> TokenStream {
             request: impl tonic::IntoRequest<#request>,
         ) -> Result<tonic::Response<#response>, tonic::Status> {
            self.ready().await?;
-           let codec = tonic::codec::ProstCodec::new();
+           let codec = tonic::codec::ProstCodec::default();
            let path = http::uri::PathAndQuery::from_static(#path);
            self.inner.unary(request.into_request(), path, codec).await
         }
@@ -122,7 +122,7 @@ fn generate_server_streaming(method: &Method, proto: &str, path: String) -> Toke
             request: impl tonic::IntoRequest<#request>,
         ) -> Result<tonic::Response<tonic::codec::Streaming<#response>>, tonic::Status> {
            self.ready().await?;
-           let codec = tonic::codec::ProstCodec::new();
+           let codec = tonic::codec::ProstCodec::default();
            let path = http::uri::PathAndQuery::from_static(#path);
            self.inner.server_streaming(request.into_request(), path, codec).await
         }
@@ -140,7 +140,7 @@ fn generate_client_streaming(method: &Method, proto: &str, path: String) -> Toke
             request: impl tonic::IntoStreamingRequest<Message = #request>
         ) -> Result<tonic::Response<#response>, tonic::Status> {
            self.ready().await?;
-           let codec = tonic::codec::ProstCodec::new();
+           let codec = tonic::codec::ProstCodec::default();
            let path = http::uri::PathAndQuery::from_static(#path);
            self.inner.client_streaming(request.into_streaming_request(), path, codec).await
         }
@@ -158,7 +158,7 @@ fn generate_streaming(method: &Method, proto: &str, path: String) -> TokenStream
             request: impl tonic::IntoStreamingRequest<Message = #request>
         ) -> Result<tonic::Response<tonic::codec::Streaming<#response>>, tonic::Status> {
            self.ready().await?;
-           let codec = tonic::codec::ProstCodec::new();
+           let codec = tonic::codec::ProstCodec::default();
            let path = http::uri::PathAndQuery::from_static(#path);
            self.inner.streaming(request.into_streaming_request(), path, codec).await
         }

diff --git a/tonic-build/src/server.rs b/tonic-build/src/server.rs
@@ -246,7 +246,7 @@ fn generate_unary(
         let inner = self.inner.clone();
         let fut = async move {
             let method = #service_ident(inner);
-            let codec = tonic::codec::ProstCodec::new();
+            let codec = tonic::codec::ProstCodec::default();
             let mut grpc = tonic::server::Grpc::new(codec);
             let res = grpc.unary(method, req).await;
             Ok(res)
@@ -289,7 +289,7 @@ fn generate_server_streaming(
         let inner = self.inner.clone();
         let fut = async move {
             let method = #service_ident(inner);
-            let codec = tonic::codec::ProstCodec::new();
+            let codec = tonic::codec::ProstCodec::default();
             let mut grpc = tonic::server::Grpc::new(codec);
             let res = grpc.server_streaming(method, req).await;
             Ok(res)
@@ -330,7 +330,7 @@ fn generate_client_streaming(
         let inner = self.inner.clone();
         let fut = async move {
             let method = #service_ident(inner);
-            let codec = tonic::codec::ProstCodec::new();
+            let codec = tonic::codec::ProstCodec::default();
             let mut grpc = tonic::server::Grpc::new(codec);
             let res = grpc.client_streaming(method, req).await;
             Ok(res)
@@ -373,7 +373,7 @@ fn generate_streaming(
         let inner = self.inner.clone();
         let fut = async move {
             let method = #service_ident(inner);
-            let codec = tonic::codec::ProstCodec::new();
+            let codec = tonic::codec::ProstCodec::default();
             let mut grpc = tonic::server::Grpc::new(codec);
             let res = grpc.streaming(method, req).await;
             Ok(res)

diff --git a/tonic-examples/Cargo.toml b/tonic-examples/Cargo.toml
@@ -52,6 +52,10 @@ path = "src/tls_client_auth/server.rs"
 name = "tls-client-auth-client"
 path = "src/tls_client_auth/client.rs"
 
+[[bin]]
+name = "gcp-client"
+path = "src/gcp/client.rs"
+
 [dependencies]
 tonic = { path = "../tonic", features = ["rustls"] }
 bytes = "0.4"
@@ -68,5 +72,8 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 rand = "0.7.2"
 
+# Required for wellknown types
+prost-types = "0.5"
+
 [build-dependencies]
 tonic-build = { path = "../tonic-build" }
diff --git a/tonic-examples/build.rs b/tonic-examples/build.rs
@@ -2,4 +2,5 @@ fn main() {
     tonic_build::compile_protos("proto/helloworld/helloworld.proto").unwrap();
     tonic_build::compile_protos("proto/routeguide/route_guide.proto").unwrap();
     tonic_build::compile_protos("proto/echo/echo.proto").unwrap();
+    tonic_build::compile_protos("proto/google/pubsub/pubsub.proto").unwrap();
 }