g3-icap-client: rename trait methods

bytedance · Nov 26, 2024 · 608e799 · 608e799
1 parent 1b94b96
commit 608e799
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/lib/g3-http/src/client/response.rs b/lib/g3-http/src/client/response.rs
@@ -65,7 +65,7 @@ impl HttpForwardRemoteResponse {
         }
     }
 
-    pub fn adapt_to_chunked(&self, adapted: HttpAdaptedResponse) -> Self {
+    pub fn adapt_to(&self, adapted: HttpAdaptedResponse) -> Self {
         let mut hop_by_hop_headers = self.hop_by_hop_headers.clone();
         match adapted.content_length {
             Some(content_length) => {

diff --git a/lib/g3-http/src/client/transparent.rs b/lib/g3-http/src/client/transparent.rs
@@ -69,7 +69,7 @@ impl HttpTransparentResponse {
         }
     }
 
-    pub fn adapt_to_chunked(&self, adapted: HttpAdaptedResponse) -> Self {
+    pub fn adapt_to(&self, adapted: HttpAdaptedResponse) -> Self {
         let mut hop_by_hop_headers = self.hop_by_hop_headers.clone();
         match adapted.content_length {
             Some(content_length) => {

diff --git a/lib/g3-http/src/server/request.rs b/lib/g3-http/src/server/request.rs
@@ -68,7 +68,7 @@ impl HttpProxyClientRequest {
         }
     }
 
-    pub fn adapt_to_chunked(&self, adapted: HttpAdaptedRequest) -> Self {
+    pub fn adapt_to(&self, adapted: HttpAdaptedRequest) -> Self {
         let mut hop_by_hop_headers = self.hop_by_hop_headers.clone();
         match adapted.content_length {
             Some(content_length) => {

diff --git a/lib/g3-http/src/server/transparent.rs b/lib/g3-http/src/server/transparent.rs
@@ -73,7 +73,7 @@ impl HttpTransparentRequest {
         }
     }
 
-    pub fn adapt_to_chunked(&self, adapted: HttpAdaptedRequest) -> Self {
+    pub fn adapt_to(&self, adapted: HttpAdaptedRequest) -> Self {
         let mut hop_by_hop_headers = self.hop_by_hop_headers.clone();
         match adapted.content_length {
             Some(content_length) => {

diff --git a/lib/g3-icap-client/src/reqmod/h1/bidirectional.rs b/lib/g3-icap-client/src/reqmod/h1/bidirectional.rs
@@ -150,7 +150,7 @@ impl<I: IdleCheck> BidirectionalRecvHttpRequest<'_, I> {
         .await?;
         let body_content_length = http_req.content_length;
 
-        let final_req = orig_http_request.adapt_to_chunked(http_req);
+        let final_req = orig_http_request.adapt_to(http_req);
         ups_writer
             .send_request_header(&final_req)
             .await

diff --git a/lib/g3-icap-client/src/reqmod/h1/impl_trait.rs b/lib/g3-icap-client/src/reqmod/h1/impl_trait.rs
@@ -43,8 +43,8 @@ impl HttpRequestForAdaptation for HttpProxyClientRequest {
         }
     }
 
-    fn adapt_to_chunked(&self, other: HttpAdaptedRequest) -> Self {
-        self.adapt_to_chunked(other)
+    fn adapt_to(&self, other: HttpAdaptedRequest) -> Self {
+        self.adapt_to(other)
     }
 }
 
@@ -69,7 +69,7 @@ impl HttpRequestForAdaptation for HttpTransparentRequest {
         }
     }
 
-    fn adapt_to_chunked(&self, other: HttpAdaptedRequest) -> Self {
-        self.adapt_to_chunked(other)
+    fn adapt_to(&self, other: HttpAdaptedRequest) -> Self {
+        self.adapt_to(other)
     }
 }
diff --git a/lib/g3-icap-client/src/reqmod/h1/mod.rs b/lib/g3-icap-client/src/reqmod/h1/mod.rs
@@ -54,7 +54,7 @@ pub trait HttpRequestForAdaptation {
     fn body_type(&self) -> Option<HttpBodyType>;
     fn serialize_for_adapter(&self) -> Vec<u8>;
     fn append_upgrade_header(&self, buf: &mut Vec<u8>);
-    fn adapt_to_chunked(&self, other: HttpAdaptedRequest) -> Self;
+    fn adapt_to(&self, other: HttpAdaptedRequest) -> Self;
 }
 
 #[allow(async_fn_in_trait)]

diff --git a/lib/g3-icap-client/src/reqmod/h1/recv_request.rs b/lib/g3-icap-client/src/reqmod/h1/recv_request.rs
@@ -145,7 +145,7 @@ impl<I: IdleCheck> HttpRequestAdapter<I> {
             self.http_req_add_no_via_header,
         )
         .await?;
-        let final_req = orig_http_request.adapt_to_chunked(http_req);
+        let final_req = orig_http_request.adapt_to(http_req);
 
         if icap_rsp.keep_alive {
             self.icap_client.save_connection(self.icap_connection).await;
@@ -172,7 +172,7 @@ impl<I: IdleCheck> HttpRequestAdapter<I> {
         )
         .await?;
 
-        let final_req = orig_http_request.adapt_to_chunked(http_req);
+        let final_req = orig_http_request.adapt_to(http_req);
         ups_writer
             .send_request_header(&final_req)
             .await
@@ -210,7 +210,7 @@ impl<I: IdleCheck> HttpRequestAdapter<I> {
         .await?;
         let body_content_length = http_req.content_length;
 
-        let final_req = orig_http_request.adapt_to_chunked(http_req);
+        let final_req = orig_http_request.adapt_to(http_req);
         ups_writer
             .send_request_header(&final_req)
             .await

diff --git a/lib/g3-icap-client/src/respmod/h1/bidirectional.rs b/lib/g3-icap-client/src/respmod/h1/bidirectional.rs
@@ -143,7 +143,7 @@ impl<I: IdleCheck> BidirectionalRecvHttpResponse<'_, I> {
         let http_rsp = HttpAdaptedResponse::parse(icap_reader, http_header_size).await?;
         let body_content_length = http_rsp.content_length;
 
-        let final_rsp = orig_http_response.adapt_to_chunked(http_rsp);
+        let final_rsp = orig_http_response.adapt_to(http_rsp);
         state.mark_clt_send_start();
         clt_writer
             .send_response_header(&final_rsp)

diff --git a/lib/g3-icap-client/src/respmod/h1/impl_trait.rs b/lib/g3-icap-client/src/respmod/h1/impl_trait.rs
@@ -35,8 +35,8 @@ impl HttpResponseForAdaptation for HttpForwardRemoteResponse {
         self.serialize_for_adapter()
     }
 
-    fn adapt_to_chunked(&self, other: HttpAdaptedResponse) -> Self {
-        self.adapt_to_chunked(other)
+    fn adapt_to(&self, other: HttpAdaptedResponse) -> Self {
+        self.adapt_to(other)
     }
 }
 
@@ -53,8 +53,8 @@ impl HttpResponseForAdaptation for HttpTransparentResponse {
         self.serialize_for_adapter()
     }
 
-    fn adapt_to_chunked(&self, other: HttpAdaptedResponse) -> Self {
-        self.adapt_to_chunked(other)
+    fn adapt_to(&self, other: HttpAdaptedResponse) -> Self {
+        self.adapt_to(other)
     }
 }
 

diff --git a/lib/g3-icap-client/src/respmod/h1/mod.rs b/lib/g3-icap-client/src/respmod/h1/mod.rs
@@ -50,7 +50,7 @@ pub trait HttpResponseForAdaptation {
     fn body_type(&self, method: &Method) -> Option<HttpBodyType>;
     fn serialize_for_client(&self) -> Vec<u8>;
     fn serialize_for_adapter(&self) -> Vec<u8>;
-    fn adapt_to_chunked(&self, other: HttpAdaptedResponse) -> Self;
+    fn adapt_to(&self, other: HttpAdaptedResponse) -> Self;
 }
 
 #[allow(async_fn_in_trait)]

diff --git a/lib/g3-icap-client/src/respmod/h1/recv_response.rs b/lib/g3-icap-client/src/respmod/h1/recv_response.rs
@@ -165,7 +165,7 @@ impl<I: IdleCheck> HttpResponseAdapter<I> {
         let http_rsp =
             HttpAdaptedResponse::parse(&mut self.icap_connection.1, http_header_size).await?;
 
-        let final_rsp = orig_http_response.adapt_to_chunked(http_rsp);
+        let final_rsp = orig_http_response.adapt_to(http_rsp);
         state.mark_clt_send_start();
         clt_writer
             .send_response_header(&final_rsp)
@@ -200,7 +200,7 @@ impl<I: IdleCheck> HttpResponseAdapter<I> {
             HttpAdaptedResponse::parse(&mut self.icap_connection.1, http_header_size).await?;
         let body_content_length = http_rsp.content_length;
 
-        let final_rsp = orig_http_response.adapt_to_chunked(http_rsp);
+        let final_rsp = orig_http_response.adapt_to(http_rsp);
         state.mark_clt_send_start();
         clt_writer
             .send_response_header(&final_rsp)