chore: make Status::into_http() work for any defaultable response `…

…Body` (#1978)
hyperium · Oct 8, 2024 · c3c18a4 · c3c18a4
1 parent c5f2cc1
commit c3c18a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/tonic/src/service/interceptor.rs b/tonic/src/service/interceptor.rs
@@ -216,12 +216,7 @@ where
                 .poll(cx)
                 .map(|result| result.map(|res| res.map(boxed))),
             KindProj::Status(status) => {
-                let response = status
-                    .take()
-                    .unwrap()
-                    .into_http()
-                    .map(|_| B::default())
-                    .map(boxed);
+                let response = status.take().unwrap().into_http();
                 Poll::Ready(Ok(response))
             }
         }
@@ -287,7 +282,7 @@ mod tests {
     #[tokio::test]
     async fn handles_intercepted_status_as_response() {
         let message = "Blocked by the interceptor";
-        let expected = Status::permission_denied(message).into_http();
+        let expected = Status::permission_denied(message).into_http::<BoxBody>();
 
         let svc = tower::service_fn(|_: http::Request<TestBody>| async {
             Ok::<_, Status>(http::Response::new(TestBody))

diff --git a/tonic/src/status.rs b/tonic/src/status.rs
@@ -1,5 +1,5 @@
 use crate::metadata::MetadataMap;
-use crate::{body::BoxBody, metadata::GRPC_CONTENT_TYPE};
+use crate::metadata::GRPC_CONTENT_TYPE;
 use base64::Engine as _;
 use bytes::Bytes;
 use http::{
@@ -579,8 +579,8 @@ impl Status {
     }
 
     /// Build an `http::Response` from the given `Status`.
-    pub fn into_http(self) -> http::Response<BoxBody> {
-        let mut response = http::Response::new(BoxBody::default());
+    pub fn into_http<B: Default>(self) -> http::Response<B> {
+        let mut response = http::Response::new(B::default());
         response
             .headers_mut()
             .insert(http::header::CONTENT_TYPE, GRPC_CONTENT_TYPE);